diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2003-10-07 21:15:59 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2003-10-07 21:15:59 +0000 |
| commit | 1e4001ca49c3902c54a98d7efea87c7b12d909fb (patch) | |
| tree | 09409776560420134a8bbf846435f7a6eb679feb | |
| parent | 2425dd9e258fe67e01bc63b0c2e82db0ecc3cdd6 (diff) | |
Essai de traduction du contraire de 'tacledit bin/coqtop.byte' en 'tac...'
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4537 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | parsing/g_vernacnew.ml4 | 14 | ||||
| -rw-r--r-- | translate/ppvernacnew.ml | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/parsing/g_vernacnew.ml4 b/parsing/g_vernacnew.ml4 index 3e382e5fd..d86952e25 100644 --- a/parsing/g_vernacnew.ml4 +++ b/parsing/g_vernacnew.ml4 @@ -28,7 +28,7 @@ open Vernac_ open Module -let vernac_kw = [ ";"; ","; ">->"; ":<"; "<:" ] +let vernac_kw = [ ";"; ","; ">->"; ":<"; "<:"; "..." ] let _ = if not !Options.v7 then List.iter (fun s -> Lexer.add_token ("",s)) vernac_kw @@ -59,22 +59,18 @@ GEXTEND Gram ; vernac: LAST [ [ gln = OPT[n=natural; ":" -> n]; - tac = subgoal_command; "." -> tac gln ] ] + tac = subgoal_command -> tac gln ] ] ; subgoal_command: - [ [ c = check_command -> c - | d = use_default_tac; tac = Tactic.tactic -> + [ [ c = check_command; "." -> c + | tac = Tactic.tactic; use_dft_tac = [ "." -> false | "..." -> true ] -> (fun g -> let g = match g with Some gl -> gl | _ -> 1 in - VernacSolve(g,tac,d)) ] ] + VernacSolve(g,tac,use_dft_tac)) ] ] ; located_vernac: [ [ v = vernac -> loc, v ] ] ; - use_default_tac: - [ [ "!!" -> false - | -> true ] ] - ; END diff --git a/translate/ppvernacnew.ml b/translate/ppvernacnew.ml index 50de4ec32..e4fa125e1 100644 --- a/translate/ppvernacnew.ml +++ b/translate/ppvernacnew.ml @@ -898,8 +898,9 @@ pr_vbinders bl ++ spc()) | VernacSolve (i,tac,deftac) -> (if i = 1 then mt() else int i ++ str ": ") ++ (* str "By " ++*) - (if deftac then mt() else str "!! ") ++ Options.with_option Options.translate_syntax (pr_raw_tactic_goal i) tac + ++ (if deftac & Pfedit.get_end_tac() <> None then str ".." else mt ()) + | VernacSolveExistential (i,c) -> str"Existential " ++ int i ++ pr_lconstrarg c |