aboutsummaryrefslogtreecommitdiffhomepage
path: root/grammar/argextend.ml4
diff options
context:
space:
mode:
authorGravatar ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>2013-06-19 14:14:23 +0000
committerGravatar ppedrot <ppedrot@85f007b7-540e-0410-9357-904b9bb8a0f7>2013-06-19 14:14:23 +0000
commitf68ff500a9090da58f573ce68e4b8b080e871e28 (patch)
treeec03d0e6f33a6ce499d20b56f559e65f59975b4c /grammar/argextend.ml4
parentd3762a646a1ed6cb4ddef47453944ba7e9caa8bd (diff)
Fixing argument extension. Instead of qualified names, string
representing qualified names where interpreted as a whole lowercase ident. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16593 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'grammar/argextend.ml4')
-rw-r--r--grammar/argextend.ml414
1 files changed, 8 insertions, 6 deletions
diff --git a/grammar/argextend.ml4 b/grammar/argextend.ml4
index 4ea5f35c1..6fde4fafe 100644
--- a/grammar/argextend.ml4
+++ b/grammar/argextend.ml4
@@ -16,19 +16,21 @@ open Compat
let loc = CompatLoc.ghost
let default_loc = <:expr< Loc.ghost >>
+let qualified_name s =
+ let path = CString.split '.' s in
+ let (name, path) = CList.sep_last path in
+ let fold dir accu = <:expr< $uid:dir$.$accu$ >> in
+ List.fold_right fold path <:expr< $lid:name$ >>
+
let mk_extraarg s =
if Extrawit.tactic_genarg_level s = None then
try
let name = Genarg.get_name0 s in
- <:expr< $lid:name$ >>
+ qualified_name name
with Not_found ->
<:expr< $lid:"wit_"^s$ >>
else
- <:expr<
- let module WIT = struct
- open Extrawit;
- value wit = $lid:"wit_"^s$;
- end in WIT.wit >>
+ qualified_name ("Extrawit.wit_" ^ s)
let rec make_wit loc = function
| IntOrVarArgType -> <:expr< Genarg.wit_int_or_var >>