make push

Author: gek

astexec.c

@@ -2728,9 +2728,10 @@ void ast_execute_function(symdecl* s){
                     ast_vm_stack_pop();
                 }
                 for(i = 0; i < cur_stmt->goto_scopediff; i++ ){
-                    //debug_print("goto popping stacks...",0,0);
                     scope_executing_stack_pop();
                 }
+                scope_positions[n_scopes_executings-1].is_in_loop = 0; //breaks out of the loop, is_in_loop is undone.
+
                 //find our new position...
                 stmt_list = scope_executing_stack_gettop()->stmts;
                 which_stmt = cur_stmt->goto_where_in_scope;
@@ -2747,6 +2748,7 @@ void ast_execute_function(symdecl* s){
                     //debug_print("goto popping stacks...",0,0);
                     scope_executing_stack_pop();
                 }
+
                 //TODO- make a symbol linkage.
                 i = cur_stmt->symid;
                 /*for(i = 0; i < (int64_t)nsymbols; i++)
@@ -2768,6 +2770,7 @@ void ast_execute_function(symdecl* s){
                     //debug_print("goto popping stacks...",0,0);
                     scope_executing_stack_pop();
                 }
+
                 //find our new position...
                 stmt_list = scope_executing_stack_gettop()->stmts;
                 uint64_t pp1;

ctok.c

@@ -1939,6 +1939,7 @@ int main(int argc, char** argv){
     {
         {
             t = DUP_PATH_STRING(infilename, NULL);
+            free(infilename);
         } 
         if(!t) {
             puts("\r\nCannot find file realpath!\n");

featuretest.cbas

@@ -1,3 +1,94 @@
 
-//TEST 1: Can the metaprogramming library even compile?
-#include <meta>
+
+
+//TEST 2: compiletime math
+codegen int have_failed = 0;
+
+fn codegen testmath:
+    int a = 7
+    int b = 23
+    int c = a + b
+    if(c != a + b)
+        __builtin_puts("Failed integer addition test 1");
+        have_failed = 1
+    end
+    
+    double q = 23
+    double q2 = 23
+    double q3 = q + q2
+    if(q3 != q + q2)
+        __builtin_puts("Failed double math test 1");
+        have_failed = 1
+    end
+    
+    a = -23;
+    b = 23;
+    if(a + b != 0)
+        __builtin_puts("Failed addition test 2- should be zero");
+        have_failed = 1
+    end
+    byte* p = __builtin_malloc(512);
+    if(p == 0)
+        __builtin_puts("Failed malloc");
+        have_failed = 1
+    end
+    __builtin_free(p);
+    
+    
+    a = 27 % 3;
+    if(a != 0)
+        __builtin_puts("Failed modulo 1");
+        have_failed = 1
+    end
+    a = 27 % 2;
+    if(a != 1)
+        __builtin_puts("Failed modulo 2");
+        have_failed = 1
+    end
+end
+
+fn codegen test_loops:
+    for(0,0,0)
+        __builtin_puts("Failed for(0,0,0)");
+        have_failed = 1
+    end
+    for(1,1,1)
+        goto after_for_111
+    end
+    __builtin_puts("Failed for(1,1,1)");
+    have_failed = 1;
+    :after_for_111
+    i64 i
+    //if(1)
+    for(i = 0, i < 20; i++)
+    ;
+        __builtin_puts("You should see this print!");
+        if(i == 3)
+            break
+        end
+    end
+    if(i != 3)
+        __builtin_puts("Failed Loop Test 1");
+        char[50] buf
+        __builtin_utoa(buf, i);
+        __builtin_puts(buf);
+        have_failed = 1
+    end
+    //end
+
+
+
+
+end
+
+
+fn codegen codegen_main:
+    __builtin_puts("TESTING BASIC ARITHMETIC");
+    testmath();
+    test_loops();
+    if(!have_failed)
+        __builtin_puts("Success!!!!");
+    else
+        __builtin_puts("------------FAILED--------------------");
+    end
+end

tests/vm_test.cbas

@@ -661,7 +661,9 @@ fn codegen switch_test(int a):
 				int j
 				//break
 				for(j = 0, j < 2, j++)
-					__builtin_puts("I should print twice six times! Unless you put a break here:");continue break
+					__builtin_puts("I should print twice six times! Unless you put a break here:"); 
+					continue 
+					break
 				end
 			end
 			:getout