diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-04-24 15:33:09 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-04-24 15:45:23 +0200 |
| commit | 65578a55b81252e2c4b006728522839a9e37cd5c (patch) | |
| tree | 3483e373cb116211e00ee664dea78efe874d39ec /parsing | |
| parent | fd13e21ccb89e2fa3a80074f9d7afd8b0638fdcb (diff) | |
| parent | 96bb190caa138c91b4d5e5f96d6f179811a177c8 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/compat.ml4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/parsing/compat.ml4 b/parsing/compat.ml4 index c482c694e..a165e32bb 100644 --- a/parsing/compat.ml4 +++ b/parsing/compat.ml4 @@ -193,7 +193,11 @@ module GrammarMake (L:LexerSig) : GrammarSig = struct let entry_create = Entry.create let entry_parse e p = try Entry.parse e p - with Exc_located (loc,e) -> Loc.raise (to_coqloc loc) e + with Exc_located (loc,e) -> + let loc' = Loc.get_loc (Exninfo.info e) in + let loc = match loc' with None -> to_coqloc loc | Some loc -> loc in + Loc.raise loc e + IFDEF CAMLP5_6_02_1 THEN let entry_print ft x = Entry.print ft x ELSE |