parser: hide NotInProlog exception

LPCIC · Jan 9, 2019 · f7705f1 · f7705f1
1 parent 9323cbd
commit f7705f1
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/elpi_parser.ml b/src/elpi_parser.ml
@@ -745,28 +745,30 @@ let init ?(silent=true) ~lp_syntax ~paths ~cwd () =
 
 let parse_program filenames : program =
  if !parser_initialized = false then U.anomaly "parsing before calling init";
- parse lp filenames
+ try parse lp filenames with NotInProlog s -> raise (Stream.Error ("NotInProlog: " ^ s))
 ;;
 
 let parse_program_from_stream strm : program =
   assert(!parser_initialized = true);
   if !parser_initialized = false then U.anomaly "parsing before calling init";
   try Grammar.Entry.parse lp strm
   with
-    Ploc.Exc(l,(Token.Error msg | Stream.Error msg)) -> raise(Stream.Error msg)
+  | Ploc.Exc(l,(Token.Error msg | Stream.Error msg)) -> raise(Stream.Error msg)
   | Ploc.Exc(_,e) -> raise e
+  | NotInProlog s -> raise (Stream.Error ("NotInProlog: " ^ s))
 ;;
 
 let parse_goal s : goal =
   if !parser_initialized = false then U.anomaly "parsing before calling init";
-  parse_string goal s
+  try parse_string goal s with NotInProlog s -> raise (Stream.Error ("NotInProlog: " ^ s))
 
 let parse_goal_from_stream strm =
   if !parser_initialized = false then U.anomaly "parsing before calling init";
   try Grammar.Entry.parse goal strm
   with
-    Ploc.Exc(l,(Token.Error msg | Stream.Error msg)) -> raise(Stream.Error msg)
+  | Ploc.Exc(l,(Token.Error msg | Stream.Error msg)) -> raise(Stream.Error msg)
   | Ploc.Exc(_,e) -> raise e
+  | NotInProlog s -> raise (Stream.Error ("NotInProlog: " ^ s))
 
 let lp_gramext = [
   { fix = Infixl;	sym = ":-";	prec = 0; };