diff options
| author |  filliatr <filliatr@85f007b7-540e-0410-9357-904b9bb8a0f7> | 1999-12-10 16:26:19 +0000 |
|---|---|---|
| committer | filliatr <filliatr@85f007b7-540e-0410-9357-904b9bb8a0f7> | 1999-12-10 16:26:19 +0000 |
| commit | af3d481838fdcd27434d2e712a5efc8070dd7ecc (patch) | |
| tree | 5370bc559242ed1c099742a7999f4044a18e8a36 | |
| parent | 44e644894fef453775bdca2492939f1986e8c5b4 (diff) | |
bug: enregistrement de vartab au lieu de csttab
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@232 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | library/declare.ml | 6 | ||||
| -rw-r--r-- | parsing/astterm.ml | 4 |
3 files changed, 10 insertions, 10 deletions
@@ -113,15 +113,15 @@ CMO=$(CONFIG) $(LIB) $(KERNEL) $(LIBRARY) $(PRETYPING) $(PARSING) \ CMX=$(CMO:.cmo=.cmx) $(ARITHSYNTAX:.cmo=.cmx) ########################################################################### -# Main targets (coqmktop, coqtop, coqtop.byte) +# Main targets (coqmktop, coqtop.opt, coqtop.byte) ########################################################################### COQMKTOP=scripts/coqmktop -world: $(COQMKTOP) coqtop.byte coqtop states tools +world: $(COQMKTOP) coqtop.byte coqtop.opt states tools -coqtop: $(COQMKTOP) $(CMX) - $(COQMKTOP) -opt -notactics $(OPTFLAGS) -o coqtop +coqtop.opt: $(COQMKTOP) $(CMX) + $(COQMKTOP) -opt -notactics $(OPTFLAGS) -o coqtop.opt coqtop.byte: $(COQMKTOP) $(CMO) Makefile $(COQMKTOP) -top $(BYTEFLAGS) -o coqtop.byte @@ -329,7 +329,7 @@ archclean:: rm -f parsing/*.cmx parsing/*.[so] rm -f pretyping/*.cmx pretyping/*.[so] rm -f toplevel/*.cmx toplevel/*.[so] - rm -f coqtop coqtop.byte minicoq + rm -f coqtop.opt coqtop.byte minicoq cleanall:: archclean rm -f *~ diff --git a/library/declare.ml b/library/declare.ml index 3063d801c..11923a3e2 100644 --- a/library/declare.ml +++ b/library/declare.ml @@ -106,9 +106,9 @@ type constant_declaration = constant_entry * strength let csttab = ref (Spmap.empty : constant_declaration Spmap.t) let _ = Summary.declare_summary "CONSTANT" - { Summary.freeze_function = (fun () -> !vartab); - Summary.unfreeze_function = (fun ft -> vartab := ft); - Summary.init_function = (fun () -> vartab := Spmap.empty) } + { Summary.freeze_function = (fun () -> !csttab); + Summary.unfreeze_function = (fun ft -> csttab := ft); + Summary.init_function = (fun () -> csttab := Spmap.empty) } let cache_constant (sp,((ce,_) as cd)) = Global.add_constant sp ce; diff --git a/parsing/astterm.ml b/parsing/astterm.ml index dc64fa98b..1e7b897ad 100644 --- a/parsing/astterm.ml +++ b/parsing/astterm.ml @@ -45,8 +45,8 @@ let warning_uppercase loc uplid = (* Comment afficher loc ?? *) let vars = prlist_with_sep pr_spc (fun v -> [< 'sTR (string_of_id v) >]) uplid in let (s1,s2) = if List.length uplid = 1 then (" ","s ") else ("s "," ") in - wARN [<'sTR ("Warning: the variable"^s1); vars; - 'sTR (" start"^s2^" with upper case in pattern"); 'cUT >] + wARN [<'sTR ("the variable"^s1); vars; + 'sTR (" start"^s2^"with an upper case letter in pattern"); 'cUT >] let is_uppercase_var v = match (string_of_id v).[0] with |