diff options
| author | Kathy Gray | 2013-07-26 13:00:56 +0100 |
|---|---|---|
| committer | Kathy Gray | 2013-07-26 13:00:56 +0100 |
| commit | 37a4c2ebcfab7834c17fe44703a71da277cb285e (patch) | |
| tree | 366ec0c11ec8a86009aff7986862df046ca0f202 /language | |
| parent | f79e3c770ab7b772edf0cd54993c059c4d7b969a (diff) | |
Remove white space/terminal tracking
Diffstat (limited to 'language')
| -rw-r--r-- | language/Makefile | 4 | ||||
| -rw-r--r-- | language/l2.ott | 32 | ||||
| -rw-r--r-- | language/l2_parse.ott | 32 |
3 files changed, 34 insertions, 34 deletions
diff --git a/language/Makefile b/language/Makefile index f8d4d05d..4ec85aa1 100644 --- a/language/Makefile +++ b/language/Makefile @@ -13,11 +13,11 @@ l2Theory.uo: l2Script.sml l2.tex ../src/ast.ml l2Script.sml: l2.ott ott -sort false -generate_aux_rules false -o l2.tex -picky_multiple_parses true l2.ott - ott -sort false -generate_aux_rules true -ocaml_include_terminals true -o ../src/ast.ml -o l2Script.sml -picky_multiple_parses true l2.ott + ott -sort false -generate_aux_rules true -o ../src/ast.ml -o l2Script.sml -picky_multiple_parses true l2.ott l2_parse.tex parse_ast.ml ../src/parse_ast.ml: l2_parse.ott ott -sort false -generate_aux_rules false -o l2_parse.tex -picky_multiple_parses true l2_parse.ott - ott -sort false -generate_aux_rules true -ocaml_include_terminals true -o ../src/parse_ast.ml -picky_multiple_parses true l2_parse.ott + ott -sort false -generate_aux_rules true -o ../src/parse_ast.ml -picky_multiple_parses true l2_parse.ott # rm -f ../src/ast.ml diff --git a/language/l2.ott b/language/l2.ott index 63634d67..9df7c682 100644 --- a/language/l2.ott +++ b/language/l2.ott @@ -5,9 +5,9 @@ indexvar n , i , j , k ::= metavar num ::= {{ phantom }} {{ lex numeric }} - {{ ocaml (terminal * int) }} + {{ ocaml int }} {{ hol num }} - {{ lem (terminal * num) }} + {{ lem num }} {{ com Numeric literals }} % metavar nat ::= @@ -21,28 +21,28 @@ metavar num ::= metavar hex ::= {{ phantom }} {{ lex numeric }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ com Bit vector literal, specified by C-style hex number }} metavar bin ::= {{ phantom }} {{ lex numeric }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ com Bit vector literal, specified by C-style binary number }} metavar string ::= {{ phantom }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ hol string }} {{ com String literals }} metavar regexp ::= {{ phantom }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ hol string }} {{ com Regular expresions, as a string literal }} @@ -137,8 +137,8 @@ val subst : forall 'a. list 'a -> list 'a -> bool }} metavar x , y , z ::= - {{ ocaml terminal * text }} - {{ lem terminal * string }} + {{ ocaml text }} + {{ lem string }} {{ hol string }} {{ com identifier }} {{ ocamlvar "[[x]]" }} @@ -146,8 +146,8 @@ metavar x , y , z ::= metavar ix ::= {{ lex alphanum }} - {{ ocaml terminal * text }} - {{ lem terminal * string }} + {{ ocaml text }} + {{ lem string }} {{ hol string }} {{ com infix identifier }} {{ ocamlvar "[[ix]]" }} @@ -554,8 +554,8 @@ lit :: 'L_' ::= | string :: :: string {{ com string constant }} semi_opt {{ tex \ottnt{;}^{?} }} :: 'semi_' ::= {{ phantom }} - {{ ocaml terminal * bool }} - {{ lem (terminal * bool) }} + {{ ocaml bool }} + {{ lem bool }} {{ hol bool }} {{ com Optional semi-colon }} | :: :: no diff --git a/language/l2_parse.ott b/language/l2_parse.ott index fed3c93d..74c154ba 100644 --- a/language/l2_parse.ott +++ b/language/l2_parse.ott @@ -5,36 +5,36 @@ indexvar n , i , j , k ::= metavar num ::= {{ phantom }} {{ lex numeric }} - {{ ocaml (terminal * int) }} + {{ ocaml int }} {{ hol num }} - {{ lem (terminal * num) }} + {{ lem num }} {{ com Numeric literals }} metavar hex ::= {{ phantom }} {{ lex numeric }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ com Bit vector literal, specified by C-style hex number }} metavar bin ::= {{ phantom }} {{ lex numeric }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ com Bit vector literal, specified by C-style binary number }} metavar string ::= {{ phantom }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ hol string }} {{ com String literals }} metavar regexp ::= {{ phantom }} - {{ ocaml terminal * string }} - {{ lem (terminal * string) }} + {{ ocaml string }} + {{ lem string }} {{ hol string }} {{ com Regular expresions, as a string literal }} @@ -129,8 +129,8 @@ val subst : forall 'a. list 'a -> list 'a -> bool }} metavar x , y , z ::= - {{ ocaml terminal * text }} - {{ lem terminal * string }} + {{ ocaml text }} + {{ lem string }} {{ hol string }} {{ com identifier }} {{ ocamlvar "[[x]]" }} @@ -138,8 +138,8 @@ metavar x , y , z ::= metavar ix ::= {{ lex alphanum }} - {{ ocaml terminal * text }} - {{ lem terminal * string }} + {{ ocaml text }} + {{ lem string }} {{ hol string }} {{ com infix identifier }} {{ ocamlvar "[[ix]]" }} @@ -527,8 +527,8 @@ lit :: 'L_' ::= | string :: :: string {{ com string constant }} semi_opt {{ tex \ottnt{;}^{?} }} :: 'semi_' ::= {{ phantom }} - {{ ocaml terminal * bool }} - {{ lem (terminal * bool) }} + {{ ocaml bool }} + {{ lem bool }} {{ hol bool }} {{ com Optional semi-colon }} | :: :: no |