From b93b176383d5a55c41ada83cdcca053c238ace4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20G=C3=A9rard?= Date: Wed, 30 Jun 2010 18:46:21 +0200 Subject: [PATCH] Mls parsing error handling adapted to menhir --- compiler/minils/main/mlsc.ml | 2 +- compiler/minils/parsing/mls_parser.mly | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/compiler/minils/main/mlsc.ml b/compiler/minils/main/mlsc.ml index 95dc69c..c8f9782 100644 --- a/compiler/minils/main/mlsc.ml +++ b/compiler/minils/main/mlsc.ml @@ -22,7 +22,7 @@ let parse parsing_fun lexing_fun lexbuf = with | Mls_lexer.Lexical_error(err, pos1, pos2) -> lexical_error err (Loc(pos1, pos2)) - | Parsing.Parse_error -> + | Mls_Parser.Error -> let pos1 = Lexing.lexeme_start lexbuf and pos2 = Lexing.lexeme_end lexbuf in let l = Loc(pos1,pos2) in diff --git a/compiler/minils/parsing/mls_parser.mly b/compiler/minils/parsing/mls_parser.mly index fa7508d..c7d8fe3 100644 --- a/compiler/minils/parsing/mls_parser.mly +++ b/compiler/minils/parsing/mls_parser.mly @@ -1,6 +1,5 @@ %{ -open Misc open Signature open Names open Ident @@ -71,7 +70,6 @@ let mk_var name ty = mk_var_dec name ty %type program %% -/*TODO add arrow (init) ?*/ /** Tools **/ %inline slist(S, x) : l=separated_list(S, x) {l}