In debug mode (-d) print all shell scripts executed.

[goals.git] / src / parse.ml

diff --git a/src/parse.ml b/src/parse.ml
index 6b7c03d..19c57ac 100644 (file)
--- a/src/parse.ml
+++ b/src/parse.ml
@@ -22,14 +22,15 @@ open Lexing
 
 open Printf
 
-let parse lexbuf =
-  let print_position fp lexbuf =
-    let pos = lexbuf.lex_curr_p in
-    fprintf fp "%s:%d:%d"
-      pos.pos_fname pos.pos_lnum (pos.pos_cnum - pos.pos_bol)
-  in
+let print_position fp lexbuf =
+  let pos = lexbuf.lex_curr_p in
+  fprintf fp "%s:%d:%d"
+    pos.pos_fname pos.pos_lnum (pos.pos_cnum - pos.pos_bol)
 
-  try Parser.file Lexer.read lexbuf
+let parse_file env lexbuf =
+  try
+    let env' = Parser.file Lexer.read lexbuf in
+    Ast.Env.merge env env'
   with
   | SyntaxError msg ->
      eprintf "%a: %s\n" print_position lexbuf msg;
@@ -38,10 +39,33 @@ let parse lexbuf =
      eprintf "%a: parse error\n" print_position lexbuf;
      exit 1
 
-let parse_from_file filename =
+let parse_expr lexbuf =
+  try Parser.expr Lexer.read lexbuf
+  with
+  | SyntaxError msg ->
+     eprintf "%a: %s\n" print_position lexbuf msg;
+     exit 1
+  | Parser.Error ->
+     eprintf "%a: parse error\n" print_position lexbuf;
+     exit 1
+
+(* This is used to parse the Goalfile. *)
+let parse_goalfile env filename =
+  Cmdline.debug "parse file: %s" filename;
   let fp = open_in filename in
-  let lexbuf = Lexing.from_channel fp in
-  lexbuf.lex_curr_p <- { lexbuf.lex_curr_p with pos_fname = filename };
-  let file : Ast.file = parse lexbuf in
+  let lexbuf = Lexing.from_channel ~with_positions:true fp in
+  let pos = lexbuf.lex_curr_p in
+  lexbuf.lex_curr_p <- { pos with pos_fname = filename };
+  let env' = parse_file env lexbuf in
   close_in fp;
-  file
+  env'
+
+(* This is used to parse expressions on the command line and
+ * the output from functions.
+ *)
+let parse_expr source str =
+  Cmdline.debug "parse expression: %S" str;
+  let lexbuf = Lexing.from_string ~with_positions:true str in
+  let pos = lexbuf.lex_curr_p in
+  lexbuf.lex_curr_p <- { pos with pos_fname = source };
+  parse_expr lexbuf