Regression tests in interpretation only

regression/Makefile

@@ -9,7 +9,7 @@ check: $(TESTS)
 $(TESTS): %: %.expr
 	@echo $@
 #	@$(RC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log
-	cat $@.input | $(RC) -i $< > $@.log && diff $@.log orig/$@.log
+	cat $@.input | $(RC) -i $< > $@.log && diff $@.log orig/$@.log; true
 #	@cat $@.input | $(RC) -s $< > $@.log && diff $@.log orig/$@.log
 
 clean:

regression/test001.expr

@@ -1,5 +1,4 @@
-local x, y, z;
+x := read ();
-read (x);
+y := read ();
-read (y);
 z := x*y*3;
 write (z)

regression/test029.expr

@@ -1,4 +1,5 @@
-fun fib (n) local r {
+fun fib (n) {
+  local r;
   if n <= 1
   then result := 1
   else

regression/test033.expr

@@ -1,4 +1,5 @@
-fun test (n, m) local i, s {
+fun test (n, m) {
+  local i, s;
   s := 0;
   for i := 0, i <= n, i := i + 1 do
     s := s + i;

regression/test035.expr

@@ -1,4 +1,5 @@
-fun printArray (x) local elem {
+fun printArray (x) {
+  local elem;
   if x.length == 0 then return fi;
   for i:=0, i<x.length, i:=i+1 do
     write (x[i])

regression/test037.expr

@@ -1,4 +1,5 @@
-fun sort (x) local i, j, y, n {
+fun sort (x) {
+  local i, j, y, n;
   n := x.length;
   
   if n == 0 then return x fi;

regression/test045.expr

@@ -1,4 +1,5 @@
-fun printString (s) local i {  
+fun printString (s) {
+  local i;
   for i := 0, i < s.length, i := i + 1 do
     write (s[i])
   od

regression/test047.expr

@@ -1,4 +1,5 @@
-fun collect_ints_acc (v, tail) local i {
+fun collect_ints_acc (v, tail) {
+  local i;
   case v of
     a@#unboxed -> return Cons (a, tail)
   | #string  -> return tail

regression/test048.expr

@@ -1,4 +1,5 @@
-fun test (n, m) local i, s {
+fun test (n, m) {
+  local i, s;
   write (n);
   write (m);
   return n

regression/test049.expr

@@ -1,4 +1,5 @@
-fun test (n, m) local i, s {
+fun test (n, m) {
+  local i, s;
   s := 0;
   for i := 0, i <= n, i := i + 1 do
     s := s + i;

regression/test051.expr

@@ -12,7 +12,8 @@ fun print_list (l) {
   esac
 }
 
-fun array_to_list (a) local l, i {
+fun array_to_list (a) {
+  local l, i;
   l := {};
   for i := a.length, i > 0, i := i-1 do
     l := a[i-1] : l

regression/test053.expr

@@ -1,4 +1,6 @@
-infix "===" at "==" (v1, v2) local s1, s2, i {
+infix "===" at "==" (v1, v2) {
+  local s1, s2, i;
+  
   s1 := v1.string;
   s2 := v2.string;
 

src/Driver.ml

@@ -8,7 +8,7 @@ let parse infile =
     "while"; "do"; "od";
     "repeat"; "until";
     "for";
-    "fun"; "local"; "return";
+    "fun"; "local"; "return"; "global";
     "length";
     "string";
     "case"; "of"; "esac"; "when";

src/Language.ml

@@ -259,7 +259,7 @@ module Expr =
     (* entering the scope         *) | Scope     of string list * t
     (* leave a scope              *) | Leave
     (* intrinsic (for evaluation) *) | Intrinsic of (config -> config)
-    (* control (for control flow) *) | Control   of (config -> t * config)
+    (* control (for control flow) *) | Control   of (config -> t * config) 
 
     (* Reff : parsed expression should return value Reff (look for ":=");
        Val : -//- returns simple value;
@@ -553,18 +553,16 @@ module Expr =
       | c:CHAR                                    => {notRef atr} => {ignore atr (Const  (Char.code c))}
       | "[" es:!(Util.list0)[parse def infix Val] "]" => {notRef atr} => {ignore atr (Array es)}
       | "{" <(d, infix')> : def[infix] expr:parse[def][infix][atr] "}" => {notRef atr} => {
-         ignore atr (
            let vars, body =
              List.fold_left
                (fun (vs, bd) -> function
-                | (name, `Local value) -> name :: vs, (match value with None -> bd | Some v -> Seq (Assign (Var name, v), bd))
+                | (name, `Variable value) -> name :: vs, (match value with None -> bd | Some v -> Seq (Assign (Var name, v), bd))
-                | _                    -> invalid_arg "function"
+                | _                       -> invalid_arg "function"
                )
                ([], expr)
                d
            in
            Scope (vars, body)
-         )
       }
       | "{" es:!(Util.list0)[parse def infix Val] "}" => {notRef atr} => {ignore atr (match es with
                                                                                       | [] -> Const 0
@@ -691,7 +689,7 @@ module Definition =
   struct
 
     (* The type for a definition: aither a function/infix, or a local variable *)
-    type t = string * [`Fun of string list * Expr.t | `Local of Expr.t option]
+    type t = string * [`Fun of string list * Expr.t | `Variable of Expr.t option]
       
     ostap (
       arg : LIDENT;
@@ -708,9 +706,9 @@ module Definition =
           | `Ok infix' -> name, infix'
           | `Fail msg  -> raise (Semantic_error msg)
       };
-      local_var[infix][expr][def]: name:LIDENT value:(-"=" expr[def][infix][Expr.Val])? {name, `Local value};
+      local_var[infix][expr][def]: name:LIDENT value:(-"=" expr[def][infix][Expr.Val])? {name, `Variable value};
-      parse[infix][expr][def]:
+      parse[kind][infix][expr][def]:
-        %"local" locs:!(Util.list (local_var infix expr def)) ";" {locs, infix}
+        kind locs:!(Util.list (local_var infix expr def)) ";" {locs, infix}
       | <(name, infix')> : head[infix] "(" args:!(Util.list0 arg) ")"
          body:expr[def][infix'][Expr.Void] {
            [(name, `Fun (args, body))], infix'
@@ -752,8 +750,10 @@ let eval ((defs, body) : t) i =
 
 (* Top-level parser *)
 ostap (
-  parse[infix]: <(defs, infix')> : definitions[infix] body:!(Expr.parse definitions infix' Expr.Void) {(defs : Definition.t list), body};
+  parse[infix]: <(defs, infix')> : definitions[global][infix] body:!(Expr.parse (definitions local) infix' Expr.Void) {(defs : Definition.t list), body};
-  definitions[infix]:
+  local: %"local";
-    <(def, infix')> : !(Definition.parse infix Expr.parse definitions) <(defs, infix'')> : definitions[infix'] {def @ defs, infix''}
+  global: %"global";
+  definitions[kind][infix]:
+    <(def, infix')> : !(Definition.parse kind infix Expr.parse (definitions local)) <(defs, infix'')> : definitions[kind][infix'] {def @ defs, infix''}
   | empty {[], infix}
 )

src/Makefile

@@ -5,7 +5,7 @@ OCAMLDEP = ocamlfind dep
 SOURCES = Language.ml SM.ml X86.ml Driver.ml
 CAMLP5 = -syntax camlp5o -package ostap.syntax,GT.syntax.all
 PXFLAGS = $(CAMLP5)
-BFLAGS = -rectypes
+BFLAGS = -rectypes -g
 OFLAGS = $(BFLAGS)
 
 all: .depend $(TOPFILE).opt