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 d9210ff..19c57ac 100644 (file)
--- a/src/parse.ml
+++ b/src/parse.ml
@@ -22,9 +22,6 @@ open Lexing
 
 open Printf
 
-let () =
-  Parser.lexer_read := Some Lexer.read
-
 let print_position fp lexbuf =
   let pos = lexbuf.lex_curr_p in
   fprintf fp "%s:%d:%d"
@@ -56,15 +53,19 @@ let parse_expr lexbuf =
 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 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;
   env'
 
-(* This is used to parse dependency expressions on the command line. *)
-let parse_cli_expr str =
-  Cmdline.debug "parsing from command line: %S" str;
-  let lexbuf = Lexing.from_string str in
-  lexbuf.lex_curr_p <- { lexbuf.lex_curr_p with pos_fname = "<command line>" };
+(* 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