Commit 226360c5 authored by POTTIER Francois's avatar POTTIER Francois

Moved [excvaldef] before [grammar.preludes] in the code and table back-ends.

This should fix an old bug where the user prelude could hide [Error].
parent 7aa07aea
......@@ -82,11 +82,6 @@
utiliser un type abstrait d'intervalles, avec un traitement particulier
de l'intervalle vide. (Voir mon message du 15/09/2011.)
* BUG: le prologue fourni par le programmeur peut cacher notre exception
Error; il suffirait de bouger la ligne "let _eRR = Error" avant le prologue
modifier les deux back-ends si besoin
ajouter un nouveau champ nonrecvaldefs_to_be_printed_before_prologue...
* BUG: message de Valentin Gatien-Baron du 09/01/2010: le bug de --explain
est-il bien le bug connu? peut-on le corriger? ne suffirait-il pas de
passer sous silence les conflits qui ont lieu dans une partie inaccessible
......
......@@ -1623,6 +1623,8 @@ let program =
SIExcDefs [ excdef ] ::
SIValDefs (false, [ excvaldef ]) ::
interface_to_structure (
tokentypedef grammar
) @
......@@ -1631,8 +1633,6 @@ let program =
SIStretch grammar.preludes ::
SIValDefs (false, [ excvaldef ]) ::
SIValDefs (true,
ProductionMap.fold (fun _ s defs ->
entrydef s :: defs
......
......@@ -910,14 +910,16 @@ let program =
SIInclude (MVar basics) ::
SIValDefs (false, [ excvaldef ]) ::
(* In order to avoid hiding user-defined identifiers, only the
exception [Error] and the type [token] should be defined (at
top level, with non-mangled names) above this line. *)
top level, with non-mangled names) above this line. We also
define the value [_eRR] above this line so that we do not
have a problem if a user prelude hides the name [Error]. *)
SIStretch grammar.preludes ::
SIValDefs (false, [ excvaldef ]) ::
SIModuleDef (interpreter, application) ::
SIValDefs (false, monolithic_api) ::
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment