fix: fixes in compiler

exl/00_variables.fzs

@@ -5,7 +5,7 @@ str someString = "world, hello!";
 // 2. Change variable value:
 someString = "hello, world!";
 
-// Variables helps you store values to use it later
+// Variables help you store values to use it later
 int a = 2;
 int b = a + a * a;
 int c = a * b;
@@ -13,7 +13,7 @@ int c = a * b;
 printline("Now we got 12:");
 printline(c);
 
-// Also, there is many different types to help your program
+// Also, there are many different variable types to help your program
 //  work with many things:
 int signedInteger;
 uint unsignedInteger;

exl/01_conditions.fzs

@@ -1,5 +1,5 @@
 // When you need to check some value
-//  a conditional statements might help you
+//  a conditional statement might help you
 
 int valueToCheck = 2 + 2;
 if (valueToCheck == 4)
@@ -7,7 +7,7 @@ if (valueToCheck == 4)
   printline("Yay! 2 + 2 = 4");
 }
 
-// Conditional statement uses condition in pairs
+// Conditional statement uses condition in parenthesis
 //  after `if` keyword and executes command(s) after
 //  if condition turns out to be true
 
@@ -21,7 +21,7 @@ if (age <= 20)
 else
 {
   age = 20;
-  printline("You looks too young!");
+  printline("You look too young!");
 }
 
 // NOTE: If you need to execute only one statement

exl/base_math.fzs

@@ -1,7 +0,0 @@
-printline(2 + 2 * 2);
-printline(-1 + 1);
-printline(2 ^ 2);
-printline(1 + 1 * 1 / 1);
-printline(4 % 2);
-printline(10 / 2);
-

exl/borrow.fzs

@@ -1,46 +0,0 @@
-class A
-{
-  uint some;
-}
-
-fn doSome(A a) A
-{
-  // NOTE: section below won't change `a.some` value
-
-  if (a.some < 1)
-  {
-    a.some = 1;
-    return a;
-  }
-
-  return a;
-}
-
-fn doSomeNew() A
-{
-  if (1 == 1)
-  {
-    return new A;
-  }
-}
-
-A a = new A;
-a.some = 0;
-if (a.some != 0)
-{
-  printline("Test failed (first a.some != 0)");
-  exit(1);
-}
-else printline(a);
-
-a = doSome(a);
-if (a.some != 1)
-{
-  printline("Test failed (2nd a.some != 1)");
-  exit(1);
-}
-else printline(a);
-
-A b = doSomeNew();
-printline(b);
-

exl/class.fzs

@@ -1,36 +0,0 @@
-class Point
-{
-  int x;
-  int y;
-
-  // Move point by [dx,dy]
-  fn move(int dx, int dy) {
-    this.x = this.x + dx;
-    this.y = this.y + dy;
-  }
-}
-
-Point obj = new Point;
-obj.x = 1;
-obj.y = 2;
-
-printline("Current X,Y:");
-printline(obj.x);
-printline(obj.y);
-
-// NOTE: WHY THE FUCK THIS FUCKING COMPILER REQUIRES ';' AFTER '='?!
-//      |
-//      v
-obj.move(9, 8);
-printline("X,Y after move:");
-printline(obj.x);
-printline(obj.y);
-
-if (obj.x == 10 && obj.y == 10)
-  printline("Test passed");
-else
-{
-  printline("Test failed");
-  exit(1);
-}
-

exl/comment.fzs

@@ -1,3 +0,0 @@
-// I'm a comment
-printline("Comment is skipped");;;;;
-

exl/conditions.fzs

@@ -1,20 +0,0 @@
-bool flag = true;
-
-if (!flag)
-{
-  printline("buhhh, flag is not true");
-  exit(1);
-}
-else if (2 + 2 >= 4)
-{
-  printline ("two plus two is four");
-}
-else {
-  printline("gotcha");
-  exit(1);
-}
-
-{
-  printline("block after");
-}
-

exl/fn.fzs

@@ -1,32 +0,0 @@
-fn fib(int n) int
-{
-  if (n <= 1)
-    return n;
-
-  return fib(n - 1) + fib(n - 2);
-}
-
-fn sum(uint a, uint b) uint
-{
-  return a + b;
-}
-
-printline("Test #1: fibonacci");
-int result = fib(7);
-if (result == 13)
-  printline("Recurse test passed");
-else
-{
-  printline("Recurse test failed");
-  exit(1);
-}
-
-printline("Test #2: sum");
-if (sum(2, 2) == 4)
-  printline("Sum test passed");
-else
-{
-  printline("Sum test failed");
-  exit(1);
-}
-

exl/hw.fzs

@@ -1,2 +0,0 @@
-printline('hello, world');
-

exl/print_empty.fzs

@@ -1 +0,0 @@
-printline("");

exl/problematic_hw.fzs

@@ -1 +0,0 @@
-printline("hello);

exl/raii.fzs

@@ -1,46 +0,0 @@
-class Animal
-{
-  str type;
-  str name;
-  int age;
-
-  fn copy() Animal
-  {
-    Animal cp = new Animal;
-    cp.type = this.type;
-    cp.name = this.name;
-    cp.age = this.age;
-
-    return cp;
-  }
-}
-
-Animal a = new Animal;
-a.type = "Cow";
-a.name = "Buryatka";
-a.age = 5;
-
-Animal b = a.copy();
-b.name = "Gavryusha";
-b.age = 10;
-
-printline(a);
-printline(b);
-
-printline("Types are same:");
-printline(a.type == b.type);
-
-printline("Names are NOT the same");
-printline(a.name != b.name);
-
-printline("1st age less than 2nd");
-printline(a.age < b.age);
-
-if (a.type == b.type && a.name != b.name && a.age < b.age)
-  printline("Test passed");
-else
-{
-  printline("Test failed");
-  exit(1);
-}
-

exl/variables.fzs

@@ -1,13 +0,0 @@
-uint work_it = 21 * 2 ^ 2;
-int  make_it = 10;
-
-u64  do_it;
-do_it = 15;
-
-printline(work_it);
-printline(make_it + do_it);
-
-char make_us;
-str floyd = "hello, Pink Floyd!";
-printline(floyd);
-

include/vm/fzl_vm.h

@@ -36,7 +36,7 @@ typedef struct
 fzl_vm_t *fzl_mkvm(const char *filepath);
 
 // Load and run code
-int fzl_vm_run(fzl_vm_t *vm);
+int fzl_vm_run(fzl_vm_t *vm, bool allow_infinite, uint64_t max_iter);
 
 // Get last VM error message
 char *fzl_vm_geterror();

src/compiler/checkers/fzl_loop_check.c

@@ -11,6 +11,8 @@
 ssize_t check_top;
 fzl_nodetype_t check_tree[256];
 
+// Ghost walk AST tree (w/o adding opcodes) to check if
+// variable used in condition is changed
 void ghost_walk_changed(fzl_node_t *node, bool *changed, fzl_sym_t *sym)
 {
   if (!node || !changed || *changed)

src/compiler/fzl_parser.c

@@ -158,7 +158,8 @@ fzl_node_t *parse_primary(fzl_parser_t *parser)
     if (!is(parser, FZL_TOKTYPE_RPAREN))
     {
       snprintf(plast_err, sizeof(plast_err), "'%s': expected ')' at %ld:%ld",
-               peek(parser)->filename, peek(parser)->ln, peek(parser)->cn);
+               last_known_tok->filename, last_known_tok->ln,
+               last_known_tok->cn);
       fzl_freeast(node);
       return NULL;
     }
@@ -181,11 +182,12 @@ fzl_node_t *parse_primary(fzl_parser_t *parser)
   {
     fzl_token_t *type = consume(parser);
     fzl_token_t *name = consume(parser);
-    if (name->type != FZL_TOKTYPE_NAME)
+    if (!name || name->type != FZL_TOKTYPE_NAME)
     {
       snprintf(plast_err, sizeof(plast_err),
-               "'%s': expected name after type at %ld:%ld", type->filename,
+               "'%s': expected name after type at %ld:%ld",
-               type->ln, type->cn);
+               last_known_tok->filename, last_known_tok->ln,
+               last_known_tok->cn);
       return NULL;
     }
 
@@ -197,8 +199,8 @@ fzl_node_t *parse_primary(fzl_parser_t *parser)
 
   if (!plast_err[0])
     snprintf(plast_err, sizeof(plast_err),
-             "'%s': failed to parse primary at %ld:%ld", peek(parser)->filename,
+             "'%s': expected expression at %ld:%ld", last_known_tok->filename,
-             peek(parser)->ln, peek(parser)->cn);
+             last_known_tok->ln, last_known_tok->cn);
   return NULL;
 }
 
@@ -211,13 +213,7 @@ fzl_node_t *parse_postfix(fzl_parser_t *parser)
   fzl_node_t *left = parse_primary(parser);
 
   if (!left)
-  {
-    if (!plast_err[0])
-      snprintf(plast_err, sizeof(plast_err),
-               "'%s': failed to parse postfix at %ld:%ld",
-               peek(parser)->filename, peek(parser)->ln, peek(parser)->cn);
     return NULL;
-  }
 
   if (is(parser, FZL_TOKTYPE_LPAREN) || is(parser, FZL_TOKTYPE_DOT))
   {
@@ -260,7 +256,8 @@ fzl_node_t *parse_postfix(fzl_parser_t *parser)
           fzl_freeast(left);
           snprintf(plast_err, sizeof(plast_err),
                    "'%s': expected ')' after argument list at %ld:%ld",
-                   peek(parser)->filename, peek(parser)->ln, peek(parser)->cn);
+                   last_known_tok->filename, last_known_tok->ln,
+                   last_known_tok->cn);
           return NULL;
         }
 
@@ -327,13 +324,7 @@ fzl_node_t *parse_power(fzl_parser_t *parser)
   fzl_node_t *right = NULL;
 
   if (!left)
-  {
-    if (!plast_err[0])
-      snprintf(plast_err, sizeof(plast_err),
-               "'%s': failed to parse power at %ld:%ld", peek(parser)->filename,
-               peek(parser)->ln, peek(parser)->cn);
     return NULL;
-  }
 
   if (is(parser, FZL_TOKTYPE_CARET))
   {
@@ -345,8 +336,9 @@ fzl_node_t *parse_power(fzl_parser_t *parser)
       fzl_freeast(left);
       if (!plast_err[0])
         snprintf(plast_err, sizeof(plast_err),
-                 "'%s': failed to parse right side of power at %ld:%ld",
+                 "'%s': expected expression at %ld:%ld",
-                 peek(parser)->filename, peek(parser)->ln, peek(parser)->cn);
+                 last_known_tok->filename, last_known_tok->ln,
+                 last_known_tok->cn);
       return NULL;
     }
 
@@ -370,13 +362,7 @@ fzl_node_t *parse_factor(fzl_parser_t *parser)
   fzl_node_t *right = NULL;
 
   if (!left)
-  {
-    if (!plast_err[0])
-      snprintf(plast_err, sizeof(plast_err),
-               "'%s': invalid expression at %ld:%ld", peek(parser)->filename,
-               peek(parser)->ln, peek(parser)->cn);
     return NULL;
-  }
 
   while (is(parser, FZL_TOKTYPE_STAR) || is(parser, FZL_TOKTYPE_SLASH) ||
          is(parser, FZL_TOKTYPE_PERCENT))
@@ -389,8 +375,9 @@ fzl_node_t *parse_factor(fzl_parser_t *parser)
       fzl_freeast(left);
       if (!plast_err[0])
         snprintf(plast_err, sizeof(plast_err),
-                 "'%s': unfinished factor (mul/div) expression at %ld:%ld",
+                 "'%s': expected expression at %ld:%ld",
-                 left->token->filename, left->token->ln, left->token->cn);
+                 last_known_tok->filename, last_known_tok->ln,
+                 last_known_tok->cn);
       return NULL;
     }
 
@@ -413,13 +400,7 @@ fzl_node_t *parse_term(fzl_parser_t *parser)
   fzl_node_t *right = NULL;
 
   if (!left)
-  {
-    if (!plast_err[0])
-      snprintf(plast_err, sizeof(plast_err),
-               "'%s': invalid expression at %ld:%ld", peek(parser)->filename,
-               peek(parser)->ln, peek(parser)->cn);
     return NULL;
-  }
 
   while (is(parser, FZL_TOKTYPE_PLUS) || is(parser, FZL_TOKTYPE_MINUS))
   {
@@ -431,8 +412,9 @@ fzl_node_t *parse_term(fzl_parser_t *parser)
       fzl_freeast(left);
       if (!plast_err[0])
         snprintf(plast_err, sizeof(plast_err),
-                 "'%s': unfinished term (add/sub) expression at %ld:%ld",
+                 "'%s': expected expression at %ld:%ld",
-                 left->token->filename, left->token->ln, left->token->cn);
+                 last_known_tok->filename, last_known_tok->ln,
+                 last_known_tok->cn);
       return NULL;
     }
 
@@ -466,10 +448,6 @@ fzl_node_t *parse_cond(fzl_parser_t *parser)
     if (!right)
     {
       fzl_freeast(left);
-      if (!plast_err[0])
-        snprintf(plast_err, sizeof(plast_err),
-                 "'%s': unfinished expression at %ld:%ld", op->filename, op->ln,
-                 op->cn);
       return NULL;
     }
 
@@ -525,10 +503,6 @@ fzl_node_t *parse_and(fzl_parser_t *parser)
     if (!right)
     {
       fzl_freeast(left);
-      if (!plast_err[0])
-        snprintf(plast_err, sizeof(plast_err),
-                 "'%s': unfinished expression at %ld:%ld", or->filename, or->ln,
-                 or->cn);
       return NULL;
     }
 
@@ -560,10 +534,6 @@ fzl_node_t *parse_or(fzl_parser_t *parser)
     if (!right)
     {
       fzl_freeast(left);
-      if (!plast_err[0])
-        snprintf(plast_err, sizeof(plast_err),
-                 "'%s': unfinished expression at %ld:%ld", or->filename, or->ln,
-                 or->cn);
       return NULL;
     }
 
@@ -589,7 +559,7 @@ fzl_node_t *parse_new(fzl_parser_t *parser)
   {
     fzl_freeast(objname);
     snprintf(plast_err, sizeof(plast_err),
-             "'%s': expect class name after 'new' keyword at %ld:%ld",
+             "'%s': expected class name after 'new' keyword at %ld:%ld",
              last_known_tok->filename, last_known_tok->ln, last_known_tok->cn);
     return NULL;
   }
@@ -610,14 +580,15 @@ fzl_node_t *parse_assignment(fzl_parser_t *parser)
   if (is(parser, FZL_TOKTYPE_EQ))
   {
     fzl_token_t *asn = consume(parser);
-    if (left->type != FZL_NODETYPE_IDENTIFIER &&
+    if (!left || (left->type != FZL_NODETYPE_IDENTIFIER &&
                   left->type != FZL_NODETYPE_DECLARATION &&
-        left->type != FZL_NODETYPE_FIELD)
+                  left->type != FZL_NODETYPE_FIELD))
     {
       fzl_freeast(left);
       snprintf(plast_err, sizeof(plast_err),
-               "'%s': cannot assign to '%s' at %ld:%ld", left->token->filename,
+               "'%s': cannot assign to '%s' at %ld:%ld",
-               (char *)left->token->value, asn->ln, asn->cn);
+               last_known_tok->filename, (char *)left->token->value,
+               last_known_tok->ln, last_known_tok->cn);
       return NULL;
     }
 
@@ -654,20 +625,20 @@ fzl_node_t *parse_class(fzl_parser_t *parser)
 
   fzl_token_t *class = consume(parser);
   fzl_token_t *name  = consume(parser);
-  if (name->type != FZL_TOKTYPE_NAME)
+  if (!name || name->type != FZL_TOKTYPE_NAME)
   {
     snprintf(plast_err, sizeof(plast_err),
-             "'%s': expected class name at %ld:%ld", name->filename, name->ln,
+             "'%s': expected class name at %ld:%ld", last_known_tok->filename,
-             name->cn);
+             last_known_tok->ln, last_known_tok->cn);
     return NULL;
   }
 
   fzl_token_t *lbrace = consume(parser);
-  if (lbrace->type != FZL_TOKTYPE_LBRACE)
+  if (!lbrace || lbrace->type != FZL_TOKTYPE_LBRACE)
   {
     snprintf(plast_err, sizeof(plast_err),
-             "'%s': expected '{' after class name at %ld:%ld", lbrace->filename,
+             "'%s': expected '{' after class name at %ld:%ld",
-             lbrace->ln, lbrace->cn);
+             last_known_tok->filename, last_known_tok->ln, last_known_tok->cn);
     return NULL;
   }
 
@@ -706,9 +677,9 @@ fzl_node_t *parse_class(fzl_parser_t *parser)
         fields = realloc(fields, fremainder * sizeof(fzl_node_t *));
         if (!fields)
         {
-          fzl_freeast(node);
           snprintf(plast_err, sizeof(plast_err),
                    "failed to resize fields array");
+          fzl_freeast(node);
           free(methods);
           return NULL;
         }
@@ -724,9 +695,9 @@ fzl_node_t *parse_class(fzl_parser_t *parser)
         methods = realloc(methods, mremainder * sizeof(fzl_node_t *));
         if (!methods)
         {
-          fzl_freeast(node);
           snprintf(plast_err, sizeof(plast_err),
                    "failed to resize methods array");
+          fzl_freeast(node);
           free(fields);
           return NULL;
         }
@@ -761,7 +732,8 @@ fzl_node_t *parse_class(fzl_parser_t *parser)
       fzl_freeast(node);
       snprintf(plast_err, sizeof(plast_err),
                "'%s': unknown type of class member at %ld:%ld",
-               node->token->filename, node->token->ln, node->token->cn);
+               last_known_tok->filename, last_known_tok->ln,
+               last_known_tok->cn);
       free(fields);
       free(methods);
       return NULL;
@@ -795,7 +767,7 @@ fzl_node_t *parse_function(fzl_parser_t *parser)
     return NULL;
 
   fzl_token_t *fn = consume(parser);
-  if (fn->type != FZL_TOKTYPE_FUNCTION)
+  if (!fn || fn->type != FZL_TOKTYPE_FUNCTION)
   {
     snprintf(plast_err, sizeof(plast_err),
              "'%s': expected keyword 'fn' at %ld:%ld", last_known_tok->filename,
@@ -1003,8 +975,8 @@ fzl_node_t *parse_block(fzl_parser_t *parser)
     free(stmts);
 
     snprintf(plast_err, sizeof(plast_err),
-             "'%s': missing '}' after block at %ld:%ld", rbrace->filename,
+             "'%s': missing '}' after block at %ld:%ld",
-             rbrace->ln, rbrace->cn);
+             last_known_tok->filename, last_known_tok->ln, last_known_tok->cn);
     return NULL;
   }
 
@@ -1019,7 +991,7 @@ fzl_node_t *parse_for(fzl_parser_t *parser)
 {
   fzl_token_t *tok  = consume(parser);
   fzl_token_t *lpar = consume(parser);
-  if (lpar->type != FZL_TOKTYPE_LPAREN)
+  if (!lpar || lpar->type != FZL_TOKTYPE_LPAREN)
   {
     snprintf(plast_err, sizeof(plast_err),
              "'%s': expected '(' after for keyword at %ld:%ld",
@@ -1202,6 +1174,13 @@ fzl_node_t *parse_loop(fzl_parser_t *parser)
 fzl_node_t *parse_break(fzl_parser_t *parser)
 {
   fzl_token_t *tok = consume(parser);
+  if (!tok)
+  {
+    snprintf(plast_err, sizeof(plast_err), "'%s': EOF",
+             last_known_tok->filename);
+    return NULL;
+  }
+
   return fzl_mknode(FZL_NODETYPE_BREAK, tok);
 }
 
@@ -1231,8 +1210,15 @@ fzl_node_t *parse_statement(fzl_parser_t *parser)
   if (!res)
     res = parse_expression(parser);
 
+  if (!res)
+  {
+    fzl_freeast(res);
+    return NULL;
+  }
+
   if (!is(parser, FZL_TOKTYPE_SEMICOLON))
   {
+    fzl_freeast(res);
     snprintf(plast_err, sizeof(plast_err), "'%s': missing ';' at %ld:%ld",
              last_known_tok->filename, last_known_tok->ln, last_known_tok->cn);
     return NULL;

src/vm/fzl_vm.c

@@ -15,9 +15,6 @@
 
 char last_err[256];
 size_t last_jmp_ip       = 0;
-
-// NOTE: add `--max-iter` option for limit
-size_t max_iter_limit    = 100000;
 size_t total_jmp_on_same = 0;
 
 static char *expect_hdr = "FZL\0\1";
@@ -279,7 +276,7 @@ void print_err_data(fzl_vm_t *vm)
     printf("\t> [%zd] %lu\n", i, vm->cstack[i]);
 }
 
-int fzl_vm_run(fzl_vm_t *vm)
+int fzl_vm_run(fzl_vm_t *vm, bool allow_infinite, uint64_t max_iter)
 {
   if (!vm)
   {
@@ -673,20 +670,25 @@ int fzl_vm_run(fzl_vm_t *vm)
                    "runtime error - expected JMP addr");
           return -1;
         }
+
         uint64_t jmp_ip = vm->ops[++vm->ip];
+        if (!allow_infinite)
+        {
           if (jmp_ip == last_jmp_ip)
             total_jmp_on_same++;
           else
             total_jmp_on_same = 0;
 
-        if (total_jmp_on_same > max_iter_limit)
+          if (total_jmp_on_same > max_iter)
           {
-          snprintf(last_err, sizeof(last_err),
+            snprintf(
+                last_err, sizeof(last_err),
                 "runtime error - exceeded max loop jumps (infinite loop?)\n"
                 "If you thinks there's mistake, change jumps limit with "
                 "--max-iter=N");
             return -1;
           }
+        }
 
         vm->ip      = jmp_ip - 1;
         last_jmp_ip = jmp_ip;

src/vm/main.c

@@ -1,5 +1,7 @@
+#include <common/fzl_colors.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -10,14 +12,18 @@ typedef struct
   char *filepath;
   bool help;
   bool debug;
+  bool allow_infinite;
+  uint64_t max_iter;
 } run_args_t;
 
 void print_hint()
 {
   printf("Usage: fz [flags] <file path>\n");
   printf("Flags:\n");
-  printf("\t-h\t--help\tprint usage information\n");
+  printf("\t-h\t--help\t\t\tprint usage information\n");
-  printf("\t-d\t--debug\tdisplay program opcodes\n");
+  printf("\t-d\t--debug\t\t\tdisplay program opcodes\n");
+  printf("\t\t--allow-infinite\tallow infinite loops\n");
+  printf("\t\t--max-iter N\t\trestrict loops to maximum N iterations\n");
 }
 
 // Parse passed arguments and build args setup structure
@@ -33,6 +39,8 @@ run_args_t *parse_args(int argc, char **argv)
   args->filepath       = NULL;
   args->help           = false;
   args->debug          = false;
+  args->allow_infinite = false;
+  args->max_iter       = 100000;
 
   for (int i = 0; i < argc; i++)
   {
@@ -46,9 +54,33 @@ run_args_t *parse_args(int argc, char **argv)
     }
     else if (strcmp(argv[i], "-d") == 0 || strcmp(argv[i], "--debug") == 0)
       args->debug = true;
+    else if (strcmp(argv[i], "--allow-infinite") == 0)
+      args->allow_infinite = true;
+    else if (strcmp(argv[i], "--max-iter") == 0)
+    {
+      char *n = argv[++i];
+      if (!n || argc <= i || !(n[0] >= '0' && n[0] <= '9'))
+      {
+        printf("%sError%s: --max-iter options requires number after it\n",
+               FZL_CERROR, FZL_CRST);
+        free(args);
+        return NULL;
+      }
+
+      uint64_t iters = strtol(n, NULL, 10);
+      if (iters < 1)
+      {
+        printf("%sError%s: '--max-iter 0' is not allowed\n", FZL_CERROR,
+               FZL_CRST);
+        free(args);
+        return NULL;
+      }
+
+      args->max_iter = iters;
+    }
     else
     {
-      printf("Error: unknown flag '%s'.\n", argv[i]);
+      printf("%sError%s: unknown flag '%s'.\n", FZL_CERROR, FZL_CRST, argv[i]);
       printf("Use 'fz --help' to read the usage\n");
       free(args);
       return NULL;
@@ -57,7 +89,8 @@ run_args_t *parse_args(int argc, char **argv)
 
   if (argv[argc - 1][0] == '-')
   {
-    printf("Error: last argument MUST be a file path\n");
+    printf("%sError%s: last argument MUST be a file path\n", FZL_CERROR,
+           FZL_CRST);
     printf("Use 'fz --help' for help\n");
     free(args);
     return NULL;
@@ -83,7 +116,7 @@ int main(int argc, char **argv)
   fzl_vm_t *vm = fzl_mkvm(args->filepath);
   if (!vm)
   {
-    printf("Error: %s\n", fzl_vm_geterror());
+    printf("%sError%s: %s\n", FZL_CERROR, FZL_CRST, fzl_vm_geterror());
     free(args);
     return -1;
   }
@@ -92,12 +125,12 @@ int main(int argc, char **argv)
     fzl_vm_print_ops(vm);
   else
   {
-    int result = fzl_vm_run(vm);
+    int result = fzl_vm_run(vm, args->allow_infinite, args->max_iter);
     if (result != 0)
     {
       char *err = fzl_vm_geterror();
       if (err && err[0])
-        printf("Error: %s\n", err);
+        printf("%sError%s: %s\n", FZL_CERROR, FZL_CRST, err);
 
       free(args);
       fzl_freevm(vm);