Final: minor corrections

volgar1x · May 11, 2017 · c1faaac · c1faaac
1 parent 778677b
commit c1faaac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/TP05/essais.txt b/TP05/essais.txt
@@ -43,7 +43,7 @@ let c5 = lambda s : (Nat -> Nat). lambda z : Nat. s (s (s (s (s z)))) ;;
 realnat c5 ;;
 
 # encore un terme mal typé
-(lambda x : bool. x) succ 0 ;;
+(lambda x : bool. x) (succ 0) ;;
 
 # et un autre
 realnat 0 ;;

diff --git a/final/main.ml b/final/main.ml
@@ -16,7 +16,7 @@ else
 (* describe where in the code we are *)
 let code_loc buf =
   let loc = buf.Lexing.lex_curr_p in
-  Ansi.wrap [Underline] ("line " ^ (string_of_int loc.Lexing.pos_lnum))
+  Ansi.wrap [Underline] (loc.Lexing.pos_fname ^ ":" ^ (string_of_int loc.Lexing.pos_lnum))
 ;;
 
 (* main evaluation loop *)
@@ -42,7 +42,11 @@ let rec loop gamma delta buf =
 
 (* open file and evaluate it *)
 let ch = open_in Sys.argv.(1) in
-try loop [] [] (Lexing.from_channel ch)
+let buf = Lexing.from_channel ch in
+buf.Lexing.lex_curr_p <- { buf.Lexing.lex_curr_p with
+  Lexing.pos_fname = Sys.argv.(1);
+};
+try loop [] [] buf
 with err -> print_endline ("unexpected error: " ^ (Printexc.to_string err));
 close_in ch
 ;;
diff --git a/final/parser.mly b/final/parser.mly
@@ -129,12 +129,18 @@ variant :
 ;
 
 variantlist :
-            | variant variantlist2     { $1 :: $2 }
-            |                          { [] }
+            |                    { [] }
+            | Lbar variantlist1  { $2 }
+            | variantlist1       { $1 }
+;
+
+variantlist1 :
+             | variant variantlist2    { $1 :: $2 }
+             |                         { [] }
 ;
 
 variantlist2 :
-             | Lbar variantlist        { $2 }
+             | Lbar variantlist1       { $2 }
              |                         { [] }
 ;