aboutsummaryrefslogtreecommitdiff
path: root/parsing/esyntax.ml
diff options
context:
space:
mode:
authorsacerdot2004-11-16 12:37:40 +0000
committersacerdot2004-11-16 12:37:40 +0000
commitd6c204c70c3b89b5bda4e7779cc4a20b5fa3f63f (patch)
treeed4d954a685588ee55f4d8902eba8a1afc864472 /parsing/esyntax.ml
parent08cb37edb71af0301a72acc834d50f24b0733db5 (diff)
IMPORTANT COMMIT: constant is now an ADT (it used to be equal to kernel_name).
MOVITATION: in a forthcoming commit the application of a substitution to a constant will return a constr and not a constant. The application of a substitution to a kernel_name will return a kernel_name. Thus "constant" should be use as a kernel name for references that can be delta-expanded. KNOWN PROBLEMS: the only problem faced is in pretyping/recordops.ml (the code that implements "Canonical Structure"s). The ADT is violated once in this ocaml module. My feeling is that the implementation of "Canonical Structure"s should be rewritten to avoid this situation. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@6303 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'parsing/esyntax.ml')
-rw-r--r--parsing/esyntax.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/parsing/esyntax.ml b/parsing/esyntax.ml
index 77e5a75263..464c1fffd9 100644
--- a/parsing/esyntax.ml
+++ b/parsing/esyntax.ml
@@ -41,7 +41,7 @@ type key =
let warning_verbose = ref true
let ast_keys = function
- | Node(_,"APPLIST", Node(_,"CONST", [Path (_,sl)]) ::_) ->
+ | Node(_,"APPLIST", Node(_,"CONST", [ConPath (_,sl)]) ::_) ->
[Cst sl; Nod "APPLIST"; All]
| Node(_,"APPLIST", Node(_,"SECVAR", [Nvar (_,s)]) ::_) ->
[SecVar s; Nod "APPLIST"; All]
@@ -57,7 +57,7 @@ let spat_key astp =
match astp with
| Pnode("APPLIST",
Pcons(Pnode("CONST",
- Pcons(Pquote(Path (_,sl)),_)), _))
+ Pcons(Pquote(ConPath (_,sl)),_)), _))
-> Cst sl
| Pnode("APPLIST",
Pcons(Pnode("SECVAR",
@@ -165,7 +165,7 @@ let _ = declare_primitive_printer "token" token_printer
(* A printer for the tokens. *)
let token_printer stdpr = function
- | (Id _ | Num _ | Str _ | Path _ as ast) -> print_ast ast
+ | (Id _ | Num _ | Str _ | Path _ | ConPath _ as ast) -> print_ast ast
| a -> stdpr a
(* Unused ??