From be252b50a8f1f4f0fafa871c737f5a91d8c3131a Mon Sep 17 00:00:00 2001 From: Gabriel Kerneis Date: Thu, 3 Jul 2014 21:57:24 +0100 Subject: Parse list of expressions in Sail_lib --- src/parser.mly | 3 ++- src/sail_lib.ml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/parser.mly b/src/parser.mly index 2ab911ee..416d4d92 100644 --- a/src/parser.mly +++ b/src/parser.mly @@ -163,11 +163,12 @@ let make_vector_sugar typ typ1 = %token LtEqUnderUiI LtUnderSI LtUnderSiI LtUnderUI LtUnderUiI StarStarUnderSI StarStarUnderSiI StarUnderSI %token StarUnderSiI StarUnderUI StarUnderUiI TwoCarrotI -%start file exp +%start file exp semi_exps %type defs %type typ %type pat %type exp +%type semi_exps %type file diff --git a/src/sail_lib.ml b/src/sail_lib.ml index a0ef6a06..fca6e412 100644 --- a/src/sail_lib.ml +++ b/src/sail_lib.ml @@ -8,11 +8,11 @@ module Pretty = Pretty_print -let parse_exp s = +let parse_exps s = let lexbuf = Lexing.from_string s in try - let pre_exp = Parser.exp Lexer.token lexbuf in - Initial_check.to_ast_exp Type_internal.initial_kind_env pre_exp + let pre_exps = Parser.semi_exps Lexer.token lexbuf in + List.map (Initial_check.to_ast_exp Type_internal.initial_kind_env) pre_exps with | Parsing.Parse_error -> let pos = Lexing.lexeme_start_p lexbuf in -- cgit v1.2.3