diff options
| author | ppedrot | 2012-06-22 16:03:45 +0000 |
|---|---|---|
| committer | ppedrot | 2012-06-22 16:03:45 +0000 |
| commit | a71ef213674180c17bc707e4eff174c16ebec756 (patch) | |
| tree | 866ade5f3744c88ef887fb4e564792151f817701 | |
| parent | 39836aec4cab3acbb80f0201958d9554b1760f64 (diff) | |
Fixing camlp4 compilation w.r.t previous commit
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15481 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | checker/checker.ml | 2 | ||||
| -rw-r--r-- | toplevel/cerrors.ml | 2 | ||||
| -rw-r--r-- | toplevel/toplevel.ml | 2 | ||||
| -rw-r--r-- | toplevel/vernac.ml | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/checker/checker.ml b/checker/checker.ml index 15c27ffa5d..b4309549b5 100644 --- a/checker/checker.ml +++ b/checker/checker.ml @@ -229,7 +229,7 @@ let rec explain_exn = function hov 0 (anomaly_string () ++ str "uncaught Stream.Failure.") | Stream.Error txt -> hov 0 (str "Syntax error: " ++ str txt) - | Token.Error txt -> + | Compat.Token.Error txt -> hov 0 (str "Syntax error: " ++ str txt) | Sys_error msg -> hov 0 (anomaly_string () ++ str "uncaught exception Sys_error " ++ str (guill msg) ++ report() ) diff --git a/toplevel/cerrors.ml b/toplevel/cerrors.ml index 849bd7ce26..e113559880 100644 --- a/toplevel/cerrors.ml +++ b/toplevel/cerrors.ml @@ -33,7 +33,7 @@ exception EvaluatedError of std_ppcmds * exn option let explain_exn_default = function (* Basic interaction exceptions *) | Stream.Error txt -> hov 0 (str ("Syntax error: " ^ txt ^ ".")) - | Token.Error txt -> hov 0 (str ("Syntax error: " ^ txt ^ ".")) + | Compat.Token.Error txt -> hov 0 (str ("Syntax error: " ^ txt ^ ".")) | Lexer.Error.E err -> hov 0 (str (Lexer.Error.to_string err)) | Sys_error msg -> hov 0 (str ("System error: " ^ guill msg)) | Out_of_memory -> hov 0 (str "Out of memory.") diff --git a/toplevel/toplevel.ml b/toplevel/toplevel.ml index feaa8c9700..ad7ad014a9 100644 --- a/toplevel/toplevel.ml +++ b/toplevel/toplevel.ml @@ -322,7 +322,7 @@ let parse_to_dot = let rec discard_to_dot () = try Gram.entry_parse parse_to_dot top_buffer.tokens - with Loc.Exc_located(_,(Token.Error _|Lexer.Error.E _)) -> + with Loc.Exc_located(_,(Compat.Token.Error _|Lexer.Error.E _)) -> discard_to_dot() diff --git a/toplevel/vernac.ml b/toplevel/vernac.ml index a1015d15eb..c2446032dc 100644 --- a/toplevel/vernac.ml +++ b/toplevel/vernac.ml @@ -9,7 +9,6 @@ (* Parsing of vernacular. *) open Pp -open Lexer open Errors open Util open Flags |