more tests for the runtime

TODO

@@ -0,0 +1,2 @@
+- talk about how functions are variables in the docs
+- tests for MUL and DIV bytecodes

misc/bugs/bug.noja

@@ -0,0 +1 @@
+1 + 2 , 3 * 4 * 5;

src/lib/assembler/assemble.c

@@ -189,7 +189,16 @@ static bool parseIntegerOperand(Context *ctx, Error *error, Operand *op)
     // pointing to a sequence of one or more digits
     // NOT followed by a dot and a digit after that
     // (so this is an integer for sure, not a float).
-    assert(ctx->cur < ctx->len && isdigit(ctx->str[ctx->cur]));
+    // Also, the sequence may be preceded by a '+' or
+    // '-'.
+
+    int sign = 1;
+    if (ctx->str[ctx->cur] == '+')
+        ctx->cur++;
+    else if (ctx->str[ctx->cur] == '-') {
+        sign = -1;
+        ctx->cur++;
+    }
 
     long long int buffer = 0;
     do {
@@ -209,9 +218,9 @@ static bool parseIntegerOperand(Context *ctx, Error *error, Operand *op)
     } while(ctx->cur < ctx->len && isdigit(ctx->str[ctx->cur]));
 
     // Not a float!
-
+    
     op->type = OPTP_INT;
-    op->as_int = buffer;
+    op->as_int = sign * buffer;
     return true;
 }
 
@@ -224,7 +233,16 @@ static bool parseFloatingOperand(Context *ctx, Error *error, Operand *op)
     // It's ensured by the caller that the cursor is
     // pointing to a sequence of one or more digits
     // followed by a dot and a digit after that.
-    assert(ctx->cur < ctx->len && isdigit(ctx->str[ctx->cur]));
+    // Also, the sequence may be preceded by a '+' or
+    // '-'.
+    
+    int sign = 1;
+    if (ctx->str[ctx->cur] == '+')
+        ctx->cur++;
+    else if (ctx->str[ctx->cur] == '-') {
+        sign = -1;
+        ctx->cur++;
+    }
 
     double buffer = 0;
     do {
@@ -256,7 +274,7 @@ static bool parseFloatingOperand(Context *ctx, Error *error, Operand *op)
     } while(ctx->cur < ctx->len && isdigit(ctx->str[ctx->cur]));
     
     op->type = OPTP_FLOAT;
-    op->as_float = buffer;
+    op->as_float = sign * buffer;
     return true;
 }
 
@@ -277,11 +295,21 @@ static bool parseOperands(Context *ctx, BPAlloc *alloc, Error *error,
                 if(!parseStringOperand(ctx, error, alloc, &op))
                     return false;
             
-            } else if(isdigit(c)) {
+            } else if(isdigit(c) || c == '-' || c == '+') {
-            
+                
                 /* Integer or float operand */
 
                 size_t k = ctx->cur;
+                
+                if (c == '-' || c == '+') {
+                    k++;
+                    if (k == ctx->len || !isdigit(ctx->str[k])) {
+                        *ctx->error_offset = k;
+                        Error_Report(error, ErrorType_SYNTAX, "Invalid character '%c' not followed by a digit", c);
+                        return false;
+                    }
+                }
+
                 while(k < ctx->len && isdigit(ctx->str[k]))
                     k += 1;
                 

src/lib/compiler/parse.c

@@ -1758,7 +1758,8 @@ static Node *parse_expression_2(Context *ctx, Node *left_expr, int min_prec, _Bo
 
 		while(isbinop(ctx->token) && (precedenceof(ctx->token) > precedenceof(op) || (precedenceof(ctx->token) == precedenceof(op) && isrightassoc(ctx->token))))
 		{
-			right_expr = parse_expression_2(ctx, right_expr, precedenceof(op) + 1, allow_toplev_tuples, allow_assignments);
+			int new_prec = precedenceof(op) + (precedenceof(op) < precedenceof(ctx->token));
+			right_expr = parse_expression_2(ctx, right_expr, new_prec, allow_toplev_tuples, allow_assignments);
 			
 			if(right_expr == NULL)
 				return NULL;				

src/lib/run.c

@@ -884,7 +884,7 @@ static _Bool runInstruction(Runtime *runtime, Error *error)
 
 			return Runtime_Push(runtime, error, obj);
 		}
-
+		
 		case OPCODE_PUSHFLT:
 		{
 			ASSERT(opc == 1);

src/test/field.c

@@ -114,10 +114,6 @@ ErrorID findField(NojaTestScanner *scanner)
 	return ErrorID_VOID;
 }
 
-// Returns: 
-//    0  if there are no more fields
-//   -1  on error
-//    1  if a field was parsed
 ErrorID parseField(NojaTestScanner *scanner, NojaTestField *field)
 {
 	ErrorID error;

tests/compiler/func/Testcase_012_000.noja-test

@@ -1,5 +1,5 @@
-
 @type [compiler]
+
 @source
     
     fun nop(a = 1)

tests/compiler/ifelse/Testcase_008_001.noja-test

@@ -1,5 +1,6 @@
 
 @type [compiler]
+
 @source
 
     if true:

tests/runtime/add/float_plus_float.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.22;
+	PUSHFLT 700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790.61]

tests/runtime/add/float_plus_float_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.22;
+	PUSHFLT 700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [610.17]

tests/runtime/add/float_plus_float_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.22;
+	PUSHFLT -700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-610.17]

tests/runtime/add/float_plus_float_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.22;
+	PUSHFLT -700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790.61]

tests/runtime/add/float_plus_int.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.39;
+	PUSHINT 700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790.39]

tests/runtime/add/float_plus_int_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.39;
+	PUSHINT 700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [609.61]

tests/runtime/add/float_plus_int_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.39;
+	PUSHINT -700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-609.61]

tests/runtime/add/float_plus_int_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.39;
+	PUSHINT -700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790.39]

tests/runtime/add/int_plus_float.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHFLT 700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790.39]

tests/runtime/add/int_plus_float_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHFLT -700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-610.39]

tests/runtime/add/int_plus_float_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHFLT 700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [610.39]

tests/runtime/add/int_plus_float_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHFLT -700.39;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790.39]

tests/runtime/add/int_plus_int.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHINT 700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790]

tests/runtime/add/int_plus_int_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHINT 700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [610]

tests/runtime/add/int_plus_int_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHINT -700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-610]

tests/runtime/add/int_plus_int_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHINT -700;
+	ADD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790]

tests/runtime/mod/big_mod_small.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 100;
+	PUSHINT 8;
+	MOD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [4]

tests/runtime/mod/small_mod_big.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 8;
+	PUSHINT 100;
+	MOD;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [8]

tests/runtime/sub/float_minus_float.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.22;
+	PUSHFLT 700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-610.17]

tests/runtime/sub/float_minus_float_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.22;
+	PUSHFLT 700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790.61]

tests/runtime/sub/float_minus_float_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.22;
+	PUSHFLT -700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790.61]

tests/runtime/sub/float_minus_float_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.22;
+	PUSHFLT -700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [610.17]

tests/runtime/sub/float_minus_int.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.39;
+	PUSHINT 700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-609.61]

tests/runtime/sub/float_minus_int_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.39;
+	PUSHINT 700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790.39]

tests/runtime/sub/float_minus_int_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 90.39;
+	PUSHINT -700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790.39]

tests/runtime/sub/float_minus_int_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -90.39;
+	PUSHINT -700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [609.61]

tests/runtime/sub/int_minus_float.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHFLT 700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-610.39]

tests/runtime/sub/int_minus_float_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHFLT -700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790.39]

tests/runtime/sub/int_minus_float_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHFLT 700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790.39]

tests/runtime/sub/int_minus_float_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHFLT -700.39;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [610.39]

tests/runtime/sub/int_minus_int.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHINT 700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-610]

tests/runtime/sub/int_minus_int_2.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHINT 700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-790]

tests/runtime/sub/int_minus_int_3.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 90;
+	PUSHINT -700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [790]

tests/runtime/sub/int_minus_int_4.noja-test

@@ -0,0 +1,14 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT -90;
+	PUSHINT -700;
+	SUB;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [610]

tests/runtime/tcase_013.noja-test

@@ -0,0 +1,13 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHINT 23;
+	NEG;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-23]

tests/runtime/tcase_014.noja-test

@@ -0,0 +1,13 @@
+@type [runtime]
+
+@bytecode
+
+	PUSHINT -23;
+	NEG;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [23]

tests/runtime/tcase_015.noja-test

@@ -0,0 +1,13 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT 2.3;
+	NEG;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [-2.30]

tests/runtime/tcase_016.noja-test

@@ -0,0 +1,13 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLT -2.3;
+	NEG;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [2.30]

tests/runtime/tcase_017.noja-test

@@ -0,0 +1,13 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHTRU;
+	NOT;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [false]

tests/runtime/tcase_018.noja-test

@@ -0,0 +1,13 @@
+@type [runtime]
+
+@bytecode
+	
+	PUSHFLS;
+	NOT;
+
+	PUSHVAR "print";
+	CALL 1, 1;
+	POP 1;
+	EXIT;
+
+@output [true]