6502/acme
1
0
Fork 0
mirror of https://github.com/uffejakobsen/acme.git synced 2025-02-19 09:31:42 +00:00
Code Issues Projects Releases Wiki Activity

more renaming

Browse Source 
git-svn-id: https://svn.code.sf.net/p/acme-crossass/code-0/trunk@149 4df02467-bbd4-4a76-a152-e7ce94205b78
This commit is contained in:
marcobaye 2020-05-09 23:16:27 +00:00
parent 440dc697ad
commit 75bd395f2f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/alu.c
View File

@ -996,13 +996,13 @@ static void ensure_int_from_fp(struct number *self, struct number *other)
// prototype needed because int and float handlers reference each other. // prototype needed because int and float handlers reference each other.
// remove when handlers are put as pointers into proper "object" structures. // remove when handlers are put as pointers into proper "object" structures.
static void float_do_monadic_operator(struct number *self, enum op_handle op); static void float_handle_monadic_operator(struct number *self, enum op_handle op);
// int type: // int type:
// handle monadic operator (includes functions) // handle monadic operator (includes functions)
static void int_do_monadic_operator(struct number *self, enum op_handle op) static void int_handle_monadic_operator(struct number *self, enum op_handle op)
{ {
switch (op) { switch (op) {
case OPHANDLE_ADDR: case OPHANDLE_ADDR:
@ -1023,7 +1023,7 @@ static void int_do_monadic_operator(struct number *self, enum op_handle op)
case OPHANDLE_ARCTAN: case OPHANDLE_ARCTAN:
// convert int to fp and ask fp handler to do the work // convert int to fp and ask fp handler to do the work
int_to_float(self); int_to_float(self);
float_do_monadic_operator(self, op); // maybe put recursion check around this :) float_handle_monadic_operator(self, op); // maybe put recursion check around this :)
break; break;
case OPHANDLE_NOT: case OPHANDLE_NOT:
self->val.intval = ~(self->val.intval); self->val.intval = ~(self->val.intval);
@ -1078,7 +1078,7 @@ static void float_ranged_fn(double (*fn)(double), struct number *self)
} }
// handle monadic operator (includes functions) // handle monadic operator (includes functions)
static void float_do_monadic_operator(struct number *self, enum op_handle op) static void float_handle_monadic_operator(struct number *self, enum op_handle op)
{ {
switch (op) { switch (op) {
case OPHANDLE_ADDR: case OPHANDLE_ADDR:
@ -1126,7 +1126,7 @@ static void float_do_monadic_operator(struct number *self, enum op_handle op)
case OPHANDLE_BANKBYTEOF: case OPHANDLE_BANKBYTEOF:
// convert fp to int and ask int handler to do the work // convert fp to int and ask int handler to do the work
float_to_int(self); float_to_int(self);
int_do_monadic_operator(self, op); // maybe put recursion check around this :) int_handle_monadic_operator(self, op); // maybe put recursion check around this :)
break; break;
// add new monadic operators here // add new monadic operators here
// case OPHANDLE_: // case OPHANDLE_:
@ -1140,7 +1140,7 @@ static void float_do_monadic_operator(struct number *self, enum op_handle op)
// dyadic operators // dyadic operators
// FIXME - split into separate functions for ints and floats // FIXME - split into separate functions for ints and floats
static void number_do_dyadic_operator(struct number *self, enum op_handle op, struct number *other) static void number_handle_dyadic_operator(struct number *self, enum op_handle op, struct number *other)
{ {
switch (op) { switch (op) {
case OPHANDLE_POWEROF: case OPHANDLE_POWEROF:
@ -1387,7 +1387,7 @@ static void number_do_dyadic_operator(struct number *self, enum op_handle op, st
// handler for special operators like parentheses and start/end of expression: // handler for special operators like parentheses and start/end of expression:
// returns whether caller should just return without fixing stack (because this fn has fixed it) // returns whether caller should just return without fixing stack (because this fn has fixed it)
static boolean do_special_operator(struct expression *expression, enum op_handle previous, enum op_handle current) static boolean handle_special_operator(struct expression *expression, enum op_handle previous, enum op_handle current)
{ {
switch (previous) { switch (previous) {
case OPHANDLE_START_OF_EXPR: case OPHANDLE_START_OF_EXPR:
@ -1465,16 +1465,16 @@ static void try_to_reduce_stacks(struct expression *expression)
switch (previous_op->group) { switch (previous_op->group) {
case OPGROUP_MONADIC: // monadic operators case OPGROUP_MONADIC: // monadic operators
if (ARG_NOW.flags & NUMBER_IS_FLOAT) { if (ARG_NOW.flags & NUMBER_IS_FLOAT) {
float_do_monadic_operator(&ARG_NOW, previous_op->handle); float_handle_monadic_operator(&ARG_NOW, previous_op->handle);
} else { } else {
int_do_monadic_operator(&ARG_NOW, previous_op->handle); int_handle_monadic_operator(&ARG_NOW, previous_op->handle);
} }
// operation was something other than parentheses // operation was something other than parentheses
expression->is_parenthesized = FALSE; expression->is_parenthesized = FALSE;
break; break;
case OPGROUP_DYADIC: // dyadic operators case OPGROUP_DYADIC: // dyadic operators
// TODO - call different functions for ints and floats! // TODO - call different functions for ints and floats!
number_do_dyadic_operator(&ARG_PREV, previous_op->handle, &ARG_NOW); number_handle_dyadic_operator(&ARG_PREV, previous_op->handle, &ARG_NOW);
// TODO - move this into fn above { // TODO - move this into fn above {
// Handle flags and decrement value stack pointer // Handle flags and decrement value stack pointer
// "OR" EVER_UNDEFINED and FORCEBIT flags // "OR" EVER_UNDEFINED and FORCEBIT flags
@ -1488,7 +1488,7 @@ static void try_to_reduce_stacks(struct expression *expression)
expression->is_parenthesized = FALSE; expression->is_parenthesized = FALSE;
break; break;
case OPGROUP_SPECIAL: // special (pseudo) operators case OPGROUP_SPECIAL: // special (pseudo) operators
if (do_special_operator(expression, previous_op->handle, current_op->handle)) if (handle_special_operator(expression, previous_op->handle, current_op->handle))
return; // called fn has fixed the stack, so we return and don't touch it return; // called fn has fixed the stack, so we return and don't touch it
// both monadics and dyadics clear "is_parenthesized", but here we don't touch it! // both monadics and dyadics clear "is_parenthesized", but here we don't touch it!