* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*)
-open Lexer
open Lexing
-
open Printf
-let print_position fp lexbuf =
+open Utils
+open Lexer
+
+let string_position () 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)
+ sprintf "%s:%d:%d" pos.pos_fname pos.pos_lnum (pos.pos_cnum - pos.pos_bol)
-let parse_file lexbuf =
- 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;
- exit 1
+ failwithf "%a: %s" string_position lexbuf msg
| Parser.Error ->
- eprintf "%a: parse error\n" print_position lexbuf;
- exit 1
+ failwithf "%a: parse error" string_position lexbuf
let parse_expr lexbuf =
- try Parser.expr Lexer.read lexbuf
+ try Parser.expr_only Lexer.read lexbuf
with
| SyntaxError msg ->
- eprintf "%a: %s\n" print_position lexbuf msg;
- exit 1
+ failwithf "%a: %s" string_position lexbuf msg
| Parser.Error ->
- eprintf "%a: parse error\n" print_position lexbuf;
- exit 1
+ failwithf "%a: parse error" string_position lexbuf
(* This is used to parse the Goalfile. *)
-let parse_goalfile filename =
+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 env : Ast.env = parse_file 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;
- env
+ env'
-(* This is used to parse dependency expressions on the command line. *)
-let parse_cli_expr 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