diff --git a/lang/modules/main.txt b/lang/modules/main.txt index 44f26ae..aef89dc 100644 --- a/lang/modules/main.txt +++ b/lang/modules/main.txt @@ -8,12 +8,12 @@ Return A EndFunction Function GetHalfish Args Num -Set FinalNum To Num Minus 2 +Set FinalNum To Num Subtract 2 Return FinalNum EndFunction Function MakeNumber Set Halfish To Self GetHalfish 620 Set Double To Halfish Add Halfish -Set Final To Double Minus 2 +Set Final To Double Subtract 2 Return Final EndFunction diff --git a/lang/number.c b/lang/number.c index e0210a9..d9ca66e 100644 --- a/lang/number.c +++ b/lang/number.c @@ -29,7 +29,7 @@ } #define OP_ADD (void *)1 -#define OP_MINUS (void *)2 +#define OP_SUBTRACT (void *)2 static void number_math(VmState state, Object obj, void *priv) { int arg_count = vm_stack_depth(state); @@ -38,7 +38,7 @@ int result = 0; if (priv == OP_ADD) { result = number_value(obj) + number_value(arg1); - } else if (priv == OP_MINUS) { + } else if (priv == OP_SUBTRACT) { result = number_value(obj) - number_value(arg1); } else { abort_msg("number_math called with invalid priv"); @@ -50,7 +50,7 @@ static struct object_call calls[] = { {.name = "Add", .handler = number_math, .priv = OP_ADD}, - {.name = "Minus", .handler = number_math, .priv = OP_MINUS}, + {.name = "Subtract", .handler = number_math, .priv = OP_SUBTRACT}, {.name = NULL, /* end */}}; static struct object_class num_class = {