aboutsummaryrefslogtreecommitdiff
path: root/tactics
diff options
context:
space:
mode:
authorherbelin2000-11-07 10:47:25 +0000
committerherbelin2000-11-07 10:47:25 +0000
commitc803556c297d40d96e6730ab334b5b7e826f4d77 (patch)
treeaa118c4bca829b630aef51796fbbc9cf40003c2d /tactics
parent30de194fa897bb44858c92dd458041bb2d2df9fe (diff)
Changement/extension dans les noms de parseurs de Grammar
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@814 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tactics')
-rw-r--r--tactics/EAuto.v2
-rw-r--r--tactics/Equality.v26
-rw-r--r--tactics/Inv.v6
-rw-r--r--tactics/Refine.v2
-rw-r--r--tactics/Tauto.v2
5 files changed, 19 insertions, 19 deletions
diff --git a/tactics/EAuto.v b/tactics/EAuto.v
index 5c1994c5b1..ba5403de4b 100644
--- a/tactics/EAuto.v
+++ b/tactics/EAuto.v
@@ -13,7 +13,7 @@
(* Prolog.v *)
(****************************************************************************)
-Grammar tactic simple_tactic: Ast :=
+Grammar tactic simple_tactic: ast :=
eapply [ "EApply" constrarg_binding_list($cl) ]
-> [(EApplyWithBindings ($LIST $cl))]
| eexact [ "EExact" constrarg($c) ] -> [(EExact $c)]
diff --git a/tactics/Equality.v b/tactics/Equality.v
index 66193ca212..971d1e72c4 100644
--- a/tactics/Equality.v
+++ b/tactics/Equality.v
@@ -3,41 +3,41 @@
Declare ML Module "equality".
-Grammar vernac orient_rule: Ast :=
+Grammar vernac orient_rule: ast :=
lr ["LR"] -> [ "LR" ]
|rl ["RL"] -> [ "RL" ]
-with rule_list: AstList :=
+with rule_list: ast list :=
single_rlt [ constrarg($com) orient_rule($ort) ] ->
[ (VERNACARGLIST $com $ort) ]
|recursive_rlt [ constrarg($com) orient_rule($ort) rule_list($tail)] ->
[ (VERNACARGLIST $com $ort) ($LIST $tail) ]
-with base_list: AstList :=
+with base_list: ast list :=
single_blt [identarg($rbase) "[" rule_list($rlt) "]"] ->
[ (VERNACARGLIST $rbase ($LIST $rlt)) ]
|recursive_blt [identarg($rbase) "[" rule_list($rlt) "]"
base_list($blt)] ->
[ (VERNACARGLIST $rbase ($LIST $rlt)) ($LIST $blt) ]
-with vernac: Ast :=
+with vernac: ast :=
addrule ["HintRewrite" base_list($blt) "."] ->
[ (HintRewrite ($LIST $blt)) ].
-Grammar tactic list_tactics: AstList :=
+Grammar tactic list_tactics: ast list :=
single_lt [tactic($tac)] -> [$tac]
|recursive_lt [tactic($tac) "|" list_tactics($tail)] ->
[ $tac ($LIST $tail) ]
-with step_largs: AstList :=
+with step_largs: ast list :=
nil_step [] -> []
|solve_step ["with" "Solve"] -> [(REDEXP (SolveStep))]
|use_step ["with" "Use"] -> [(REDEXP (Use))]
|all_step ["with" "All"] -> [(REDEXP (All))]
-with rest_largs: AstList :=
+with rest_largs: ast list :=
nil_rest [] -> []
|solve_rest ["with" "Solve"] -> [(REDEXP (SolveRest))]
|cond_rest ["with" "Cond"] -> [(REDEXP (Cond))]
-with autorew_largs: AstList :=
+with autorew_largs: ast list :=
step_arg ["Step" "=" "[" list_tactics($ltac) "]" step_largs($slargs)] ->
[(REDEXP (Step ($LIST $ltac))) ($LIST $slargs)]
|rest_arg ["Rest" "=" "[" list_tactics($ltac) "]" rest_largs($llargs)] ->
@@ -45,30 +45,30 @@ with autorew_largs: AstList :=
|depth_arg ["Depth" "=" numarg($dth)] ->
[(REDEXP (Depth $dth))]
-with list_args_autorew: AstList :=
+with list_args_autorew: ast list :=
nil_laa [] -> []
|recursive_laa [autorew_largs($largs) list_args_autorew($laa)] ->
[($LIST $largs) ($LIST $laa)]
-with hintbase_list: AstList :=
+with hintbase_list: ast list :=
nil_hintbase [] -> []
| base_by_name [identarg($id) hintbase_list($tail)] ->
[ (REDEXP (ByName $id)) ($LIST $tail)]
| explicit_base ["[" hintbase($b) "]" hintbase_list($tail)] ->
[(REDEXP (Explicit ($LIST $b))) ($LIST $tail) ]
-with hintbase: AstList :=
+with hintbase: ast list :=
onehint_lr [ constrarg($c) "LR" ] -> [(REDEXP (LR $c))]
| onehint_rl [ constrarg($c) "RL" ] -> [(REDEXP (RL $c))]
| conshint_lr [ constrarg($c) "LR" hintbase($tail)] -> [(REDEXP (LR $c)) ($LIST $tail)]
| conshint_rl [ constrarg($c) "RL" hintbase($tail)] -> [(REDEXP (RL $c)) ($LIST $tail)]
-with simple_tactic: Ast :=
+with simple_tactic: ast :=
AutoRewrite [ "AutoRewrite" "[" hintbase_list($lbase) "]"
list_args_autorew($laa)] ->
[(AutoRewrite (REDEXP (BaseList ($LIST $lbase))) ($LIST $laa))].
-Grammar tactic simple_tactic: Ast :=
+Grammar tactic simple_tactic: ast :=
replace [ "Replace" constrarg($c1) "with" constrarg($c2) ] -> [(Replace $c1 $c2)]
| deqhyp [ "Simplify_eq" identarg($id) ] -> [(DEqHyp $id)]
diff --git a/tactics/Inv.v b/tactics/Inv.v
index 2bde23bf72..1abcdd824f 100644
--- a/tactics/Inv.v
+++ b/tactics/Inv.v
@@ -26,7 +26,7 @@ Syntax tactic level 0:
| inversion_clear [<<(INVCOM InversionClear)>>] -> [ "Inversion_clear" ].
-Grammar tactic simple_tactic: Ast :=
+Grammar tactic simple_tactic: ast :=
inversion [ inversion_com($ic) identarg($id) ] -> [(Inv $ic $id)]
| inversion_in [ inversion_com($ic) identarg($id) "in" ne_identarg_list($l) ]
-> [(InvIn $ic $id ($LIST $l))]
@@ -48,13 +48,13 @@ Grammar tactic simple_tactic: Ast :=
Inversion -> [(UseInversionLemmaIn $id $c ($LIST $l))]
esac
-with inversion_com: Ast :=
+with inversion_com: ast :=
simple_inv [ "Simple" "Inversion" ] -> [ HalfInversion ]
| inversion_com [ "Inversion" ] -> [ Inversion ]
| inv_clear [ "Inversion_clear" ] -> [ InversionClear ].
-Grammar vernac vernac: Ast :=
+Grammar vernac vernac: ast :=
der_inv_clr [ "Derive" "Inversion_clear" identarg($na) identarg($id) "." ]
-> [(MakeInversionLemmaFromHyp 1 $na $id)]
diff --git a/tactics/Refine.v b/tactics/Refine.v
index b4e023cde4..33d6d9cab1 100644
--- a/tactics/Refine.v
+++ b/tactics/Refine.v
@@ -3,7 +3,7 @@
Declare ML Module "refine".
-Grammar tactic simple_tactic: Ast :=
+Grammar tactic simple_tactic: ast :=
tcc [ "Refine" castedopenconstrarg($c) ] -> [(Tcc $c)].
Syntax tactic level 0:
diff --git a/tactics/Tauto.v b/tactics/Tauto.v
index 2f4475057b..c6283109c1 100644
--- a/tactics/Tauto.v
+++ b/tactics/Tauto.v
@@ -3,7 +3,7 @@
Declare ML Module "tauto".
-Grammar tactic simple_tactic: Ast :=
+Grammar tactic simple_tactic: ast :=
tauto [ "Tauto" ] -> [(Tauto)]
| intuition [ "Intuition" ] -> [(Intuition)].