From f9b88a27b855207af5909be58502931e629c6b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=CC=81onard=20Ge=CC=81rard?= Date: Tue, 27 Jul 2010 13:31:13 +0200 Subject: [PATCH] Small fixes to the compilation processes. *Locations should be pretty damn good now. *Mlsc is close to be up-to-date, still need a scoping pass etc (to be posted soon) --- compiler/minils/main/mls_compiler.ml | 15 +++++++++++++++ compiler/minils/main/mlsc.ml | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/compiler/minils/main/mls_compiler.ml b/compiler/minils/main/mls_compiler.ml index 1f4489b..33b1563 100644 --- a/compiler/minils/main/mls_compiler.ml +++ b/compiler/minils/main/mls_compiler.ml @@ -12,6 +12,21 @@ open Compiler_utils let pp p = if !verbose then Mls_printer.print stdout p +let parse parsing_fun lexing_fun lexbuf = + try + parsing_fun lexing_fun lexbuf + with + | Mls_lexer.Lexical_error(err, loc) -> + lexical_error err loc + | Mls_parser.Error -> + let pos1 = Lexing.lexeme_start_p lexbuf + and pos2 = Lexing.lexeme_end_p lexbuf in + let l = Loc(pos1,pos2) in + syntax_error l + +let parse_implementation lexbuf = + parse Mls_parser.program Mls_lexer.token lexbuf + let compile pp p = (* Clocking *) let p = do_pass Clocking.program "Clocking" p pp true in diff --git a/compiler/minils/main/mlsc.ml b/compiler/minils/main/mlsc.ml index 9d3802b..8c3bd47 100644 --- a/compiler/minils/main/mlsc.ml +++ b/compiler/minils/main/mlsc.ml @@ -12,20 +12,6 @@ open Location open Compiler_utils open Mls2seq -let parse parsing_fun lexing_fun lexbuf = - try - parsing_fun lexing_fun lexbuf - with - | Mls_lexer.Lexical_error(err, loc) -> - lexical_error err loc - | Mls_parser.Error -> - let pos1 = Lexing.lexeme_start_p lexbuf - and pos2 = Lexing.lexeme_end_p lexbuf in - let l = Loc(pos1,pos2) in - syntax_error l - -let parse_implementation lexbuf = - parse Mls_parser.program Mls_lexer.token lexbuf let compile_impl modname filename = (* input and output files *)