diff options
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/compat.ml4 | 2 | ||||
| -rw-r--r-- | parsing/egramcoq.ml | 6 | ||||
| -rw-r--r-- | parsing/g_constr.ml4 | 2 | ||||
| -rw-r--r-- | parsing/g_prim.ml4 | 2 | ||||
| -rw-r--r-- | parsing/g_tactic.ml4 | 2 | ||||
| -rw-r--r-- | parsing/g_vernac.ml4 | 2 | ||||
| -rw-r--r-- | parsing/lexer.ml4 (renamed from parsing/cLexer.ml4) | 0 | ||||
| -rw-r--r-- | parsing/lexer.mli (renamed from parsing/cLexer.mli) | 0 | ||||
| -rw-r--r-- | parsing/parsing.mllib | 2 | ||||
| -rw-r--r-- | parsing/pcoq.ml4 | 4 |
10 files changed, 11 insertions, 11 deletions
diff --git a/parsing/compat.ml4 b/parsing/compat.ml4 index 1481c31f4..17038ab5f 100644 --- a/parsing/compat.ml4 +++ b/parsing/compat.ml4 @@ -135,7 +135,7 @@ let to_coq_position = function END -(** Signature of CLexer *) +(** Signature of Lexer *) IFDEF CAMLP5 THEN diff --git a/parsing/egramcoq.ml b/parsing/egramcoq.ml index 4c7743303..b0bbdd813 100644 --- a/parsing/egramcoq.ml +++ b/parsing/egramcoq.ml @@ -317,9 +317,9 @@ let recover_constr_grammar ntn prec = (* Summary functions: the state of the lexer is included in that of the parser. Because the grammar affects the set of keywords when adding or removing grammar rules. *) -type frozen_t = (int * all_grammar_command) list * CLexer.frozen_t +type frozen_t = (int * all_grammar_command) list * Lexer.frozen_t -let freeze _ : frozen_t = (!grammar_state, CLexer.freeze ()) +let freeze _ : frozen_t = (!grammar_state, Lexer.freeze ()) (* We compare the current state of the grammar and the state to unfreeze, by computing the longest common suffixes *) @@ -335,7 +335,7 @@ let unfreeze (grams, lex) = remove_grammars n; remove_levels n; grammar_state := common; - CLexer.unfreeze lex; + Lexer.unfreeze lex; List.iter extend_grammar (List.rev_map snd redo) (** No need to provide an init function : the grammar state is diff --git a/parsing/g_constr.ml4 b/parsing/g_constr.ml4 index 73b088b46..5edb7b808 100644 --- a/parsing/g_constr.ml4 +++ b/parsing/g_constr.ml4 @@ -29,7 +29,7 @@ let constr_kw = "Prop"; "Set"; "Type"; ".("; "_"; ".."; "`{"; "`("; "{|"; "|}" ] -let _ = List.iter CLexer.add_keyword constr_kw +let _ = List.iter Lexer.add_keyword constr_kw let mk_cast = function (c,(_,None)) -> c diff --git a/parsing/g_prim.ml4 b/parsing/g_prim.ml4 index 20fbccb2d..5297c163b 100644 --- a/parsing/g_prim.ml4 +++ b/parsing/g_prim.ml4 @@ -15,7 +15,7 @@ open Pcoq open Pcoq.Prim let prim_kw = ["{"; "}"; "["; "]"; "("; ")"; "'"] -let _ = List.iter CLexer.add_keyword prim_kw +let _ = List.iter Lexer.add_keyword prim_kw let local_make_qualid l id = make_qualid (DirPath.make l) id diff --git a/parsing/g_tactic.ml4 b/parsing/g_tactic.ml4 index 8f3d04eeb..2a00a1764 100644 --- a/parsing/g_tactic.ml4 +++ b/parsing/g_tactic.ml4 @@ -25,7 +25,7 @@ open Pcoq let all_with delta = Redops.make_red_flag [FBeta;FIota;FZeta;delta] let tactic_kw = [ "->"; "<-" ; "by" ] -let _ = List.iter CLexer.add_keyword tactic_kw +let _ = List.iter Lexer.add_keyword tactic_kw let err () = raise Stream.Failure diff --git a/parsing/g_vernac.ml4 b/parsing/g_vernac.ml4 index b19ad8807..f3766a7d7 100644 --- a/parsing/g_vernac.ml4 +++ b/parsing/g_vernac.ml4 @@ -27,7 +27,7 @@ open Pcoq.Vernac_ open Pcoq.Module let vernac_kw = [ ";"; ","; ">->"; ":<"; "<:"; "where"; "at" ] -let _ = List.iter CLexer.add_keyword vernac_kw +let _ = List.iter Lexer.add_keyword vernac_kw (* Rem: do not join the different GEXTEND into one, it breaks native *) (* compilation on PowerPC and Sun architectures *) diff --git a/parsing/cLexer.ml4 b/parsing/lexer.ml4 index 5d96873f3..5d96873f3 100644 --- a/parsing/cLexer.ml4 +++ b/parsing/lexer.ml4 diff --git a/parsing/cLexer.mli b/parsing/lexer.mli index 24b0ec847..24b0ec847 100644 --- a/parsing/cLexer.mli +++ b/parsing/lexer.mli diff --git a/parsing/parsing.mllib b/parsing/parsing.mllib index 0e1c79c91..a0cb83193 100644 --- a/parsing/parsing.mllib +++ b/parsing/parsing.mllib @@ -1,6 +1,6 @@ Tok Compat -CLexer +Lexer Pcoq Egramml Egramcoq diff --git a/parsing/pcoq.ml4 b/parsing/pcoq.ml4 index f01e25c61..28dc74e81 100644 --- a/parsing/pcoq.ml4 +++ b/parsing/pcoq.ml4 @@ -18,7 +18,7 @@ open Tok (* necessary for camlp4 *) (** The parser of Coq *) -module G = GrammarMake (CLexer) +module G = GrammarMake (Lexer) (* TODO: this is a workaround, since there isn't such [warning_verbose] in new camlp4. In camlp5, this ref @@ -51,7 +51,7 @@ ELSE | tok -> Stoken ((=) tok, to_string tok) END -let gram_token_of_string s = gram_token_of_token (CLexer.terminal s) +let gram_token_of_string s = gram_token_of_token (Lexer.terminal s) let camlp4_verbosity silent f x = let a = !warning_verbose in |