diff options
| author |  Jim Fehrle <jfehrle@sbcglobal.net> | 2018-02-21 16:04:06 -0800 |
|---|---|---|
| committer | Jim Fehrle <jfehrle@sbcglobal.net> | 2018-02-22 09:41:51 -0800 |
| commit | 648483fe2ff3942b9f2f2cbbf7a0552b8e1997c4 (patch) | |
| tree | 6f1274519a1f285205da750bbf85b7ebc8eef9c7 /parsing | |
| parent | aec63ba9c8f6840d98ba731640a786138d836343 (diff) | |
Rename release_lexer_state to the more descriptive get_lexer_state.
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/cLexer.ml4 | 3 | ||||
| -rw-r--r-- | parsing/cLexer.mli | 2 | ||||
| -rw-r--r-- | parsing/pcoq.ml | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/parsing/cLexer.ml4 b/parsing/cLexer.ml4 index f26398fa9..52a6fe16c 100644 --- a/parsing/cLexer.ml4 +++ b/parsing/cLexer.ml4 @@ -404,8 +404,9 @@ let set_lexer_state (o,s,b,c,f) = between_commands := b; comments := c; current_file := f -let release_lexer_state () = +let get_lexer_state () = (!comment_begin, Buffer.contents current_comment, !between_commands, !comments, !current_file) +let release_lexer_state = get_lexer_state let drop_lexer_state () = set_lexer_state (init_lexer_state Loc.ToplevelInput) diff --git a/parsing/cLexer.mli b/parsing/cLexer.mli index d3ef19873..5f4e10f14 100644 --- a/parsing/cLexer.mli +++ b/parsing/cLexer.mli @@ -51,7 +51,9 @@ type lexer_state val init_lexer_state : Loc.source -> lexer_state val set_lexer_state : lexer_state -> unit +val get_lexer_state : unit -> lexer_state val release_lexer_state : unit -> lexer_state +[@@ocaml.deprecated "Use get_lexer_state"] val drop_lexer_state : unit -> unit (* Retrieve the comments lexed at a given location of the stream diff --git a/parsing/pcoq.ml b/parsing/pcoq.ml index 54e7949ae..73e103995 100644 --- a/parsing/pcoq.ml +++ b/parsing/pcoq.ml @@ -111,7 +111,7 @@ end with type 'a Entry.e = 'a Grammar.GMake(CLexer).Entry.e = struct let state = ref (CLexer.init_lexer_state file) in CLexer.set_lexer_state !state; let a = parsable c in - state := CLexer.release_lexer_state (); + state := CLexer.get_lexer_state (); (a,state) let action = Gramext.action @@ -121,7 +121,7 @@ end with type 'a Entry.e = 'a Grammar.GMake(CLexer).Entry.e = struct CLexer.set_lexer_state !state; try let c = Entry.parse e p in - state := CLexer.release_lexer_state (); + state := CLexer.get_lexer_state (); c with Ploc.Exc (loc,e) -> CLexer.drop_lexer_state (); @@ -133,7 +133,7 @@ end with type 'a Entry.e = 'a Grammar.GMake(CLexer).Entry.e = struct CLexer.set_lexer_state !state; try let a = f x in - state := CLexer.release_lexer_state (); + state := CLexer.get_lexer_state (); a with e -> CLexer.drop_lexer_state (); |