diff options
| author | glondu | 2010-12-27 23:12:39 +0000 |
|---|---|---|
| committer | glondu | 2010-12-27 23:12:39 +0000 |
| commit | 05662999c9ab0183c0f97fc18579379142ac7b38 (patch) | |
| tree | 884febe28a7728f526583423130d31f3f77b9615 | |
| parent | ae9b8392410ceb09e30c90c8863fc24a4c67b376 (diff) | |
Rename the "raw" argument extension into "glob"
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13761 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | tactics/extraargs.ml4 | 19 | ||||
| -rw-r--r-- | tactics/extraargs.mli | 7 | ||||
| -rw-r--r-- | tactics/extratactics.ml4 | 2 |
3 files changed, 13 insertions, 15 deletions
diff --git a/tactics/extraargs.ml4 b/tactics/extraargs.ml4 index 76376cd033..6a13ac2a97 100644 --- a/tactics/extraargs.ml4 +++ b/tactics/extraargs.ml4 @@ -101,21 +101,20 @@ let pr_occurrences = pr_occurrences () () () let pr_gen prc _prlc _prtac c = prc c -let pr_rawc _prc _prlc _prtac (_,raw) = Printer.pr_glob_constr raw -let pr_raw = pr_rawc () () () +let pr_globc _prc _prlc _prtac (_,glob) = Printer.pr_glob_constr glob -let interp_raw ist gl (t,_) = (ist,t) +let interp_glob ist gl (t,_) = (ist,t) -let glob_raw = Tacinterp.intern_constr +let glob_glob = Tacinterp.intern_constr -let subst_raw = Tacinterp.subst_glob_constr_and_expr +let subst_glob = Tacinterp.subst_glob_constr_and_expr -ARGUMENT EXTEND raw - PRINTED BY pr_rawc +ARGUMENT EXTEND glob + PRINTED BY pr_globc - INTERPRETED BY interp_raw - GLOBALIZED BY glob_raw - SUBSTITUTED BY subst_raw + INTERPRETED BY interp_glob + GLOBALIZED BY glob_glob + SUBSTITUTED BY subst_glob RAW_TYPED AS constr_expr RAW_PRINTED BY pr_gen diff --git a/tactics/extraargs.mli b/tactics/extraargs.mli index 5f3a8e2604..2abca40ebc 100644 --- a/tactics/extraargs.mli +++ b/tactics/extraargs.mli @@ -24,10 +24,9 @@ val rawwit_occurrences : (int list or_var) raw_abstract_argument_type val wit_occurrences : (int list) typed_abstract_argument_type val pr_occurrences : int list Glob_term.or_var -> Pp.std_ppcmds -val rawwit_raw : constr_expr raw_abstract_argument_type -val wit_raw : (Tacinterp.interp_sign * glob_constr) typed_abstract_argument_type -val raw : constr_expr Pcoq.Gram.entry -val pr_raw : (Tacinterp.interp_sign * Glob_term.glob_constr) -> Pp.std_ppcmds +val rawwit_glob : constr_expr raw_abstract_argument_type +val wit_glob : (Tacinterp.interp_sign * glob_constr) typed_abstract_argument_type +val glob : constr_expr Pcoq.Gram.entry type 'id gen_place= ('id * hyp_location_flag,unit) location diff --git a/tactics/extratactics.ml4 b/tactics/extratactics.ml4 index f774df5dee..7b2bf08cb7 100644 --- a/tactics/extratactics.ml4 +++ b/tactics/extratactics.ml4 @@ -383,7 +383,7 @@ open Tacexpr open Tacticals TACTIC EXTEND instantiate - [ "instantiate" "(" integer(i) ":=" raw(c) ")" hloc(hl) ] -> + [ "instantiate" "(" integer(i) ":=" glob(c) ")" hloc(hl) ] -> [instantiate i c hl ] | [ "instantiate" ] -> [ tclNORMEVAR ] END |