diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2000-06-02 12:37:11 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2000-06-02 12:37:11 +0000 |
| commit | 8fe189045ece6f26cd3aa5399ed405e71b1de781 (patch) | |
| tree | 4d23712bfcbaaebb0970a49edd541ad3620848f4 /toplevel | |
| parent | 8096b8167d02566658929217f4627142d98dc835 (diff) | |
Bugs/Messages d'erreurs
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@489 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/himsg.ml | 10 | ||||
| -rw-r--r-- | toplevel/vernacentries.ml | 6 | ||||
| -rw-r--r-- | toplevel/vernacinterp.ml | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/toplevel/himsg.ml b/toplevel/himsg.ml index 28df858fd..a5a754fc6 100644 --- a/toplevel/himsg.ml +++ b/toplevel/himsg.ml @@ -126,14 +126,14 @@ let explain_cant_apply_bad_type k ctx (n,exptyp,actualtyp) rator randl = let pc,pct = prjudge_env ctx c in hOV 2 [< pc; 'sPC; 'sTR": " ; pct >]) randl in - [< 'sTR"Illegal application (Type Error): "; pe; 'fNL; + [< 'sTR"Illegal application (Type Error): "; (* pe; *) 'fNL; 'sTR"The term"; 'bRK(1,1); pr; 'sPC; 'sTR"of type"; 'bRK(1,1); prt; 'sPC ; 'sTR("cannot be applied to the "^term_string); 'fNL; 'sTR" "; v 0 appl; 'fNL; - 'sTR"The ";'iNT n; 'sTR (many^" term of type "); - prterm_env ctx actualtyp; - 'sTR" should be coercible to type "; prterm_env ctx exptyp >] + 'sTR"The ";'iNT n; 'sTR (many^" term of type"); 'bRK(1,1); + prterm_env ctx actualtyp; 'sPC; + 'sTR"should be coercible to"; 'bRK(1,1); prterm_env ctx exptyp >] let explain_cant_apply_not_functional k ctx rator randl = let ctx = make_all_name_different ctx in @@ -147,7 +147,7 @@ let explain_cant_apply_not_functional k ctx rator randl = let pct = prterm_env ctx (body_of_type c.uj_type) in hOV 2 [< pc; 'sPC; 'sTR": " ; pct >]) randl in - [< 'sTR"Illegal application (Non-functional construction): "; pe; 'fNL; + [< 'sTR"Illegal application (Non-functional construction): "; (* pe; *) 'fNL; 'sTR"The term"; 'bRK(1,1); pr; 'sPC; 'sTR"of type"; 'bRK(1,1); prt; 'sPC ; 'sTR("cannot be applied to the "^term_string); 'fNL; diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml index 74c6440d8..638185682 100644 --- a/toplevel/vernacentries.ml +++ b/toplevel/vernacentries.ml @@ -120,7 +120,7 @@ let print_loadpath () = mSGNL [< 'sTR"Load Path:"; 'fNL; 'sTR" "; hV 0 (prlist_with_sep pr_fnl (fun s -> [< 'sTR s >]) l) >] -let get_goal_context_of_args = function +let get_current_context_of_args = function | [VARG_NUMBER n] -> get_goal_context n | [] -> get_current_context () | _ -> bad_vernac_args "goal_of_args" @@ -814,7 +814,7 @@ let _ = add "Eval" (function | VARG_TACTIC_ARG (Redexp redexp) :: VARG_CONSTR c :: g -> - let (evmap,sign) = get_goal_context_of_args g in + let (evmap,sign) = get_current_context_of_args g in let redfun = print_eval (reduction_of_redexp redexp) sign in fun () -> mSG (redfun (judgment_of_com evmap sign c)) | _ -> bad_vernac_args "Eval") @@ -823,7 +823,7 @@ let _ = add "Check" (function | VARG_STRING kind :: VARG_CONSTR c :: g -> - let (evmap, sign) = get_goal_context_of_args g in + let (evmap, sign) = get_current_context_of_args g in let prfun = match kind with | "CHECK" -> print_val | "PRINTTYPE" -> print_type diff --git a/toplevel/vernacinterp.ml b/toplevel/vernacinterp.ml index 1f55e4a3e..5308efba1 100644 --- a/toplevel/vernacinterp.ml +++ b/toplevel/vernacinterp.ml @@ -96,7 +96,7 @@ let rec cvt_varg ast = | Node(_,"AST",[a]) -> VARG_AST a | Node(_,"ASTLIST",al) -> VARG_ASTLIST al | Node(_,"TACTIC_ARG",[targ]) -> - let (evc,env)= Pfedit.get_current_goal_context () in + let (evc,env)= Command.get_current_context () in VARG_TACTIC_ARG (interp_tacarg (evc,env,[],[],None) targ) | Node(_,"VERNACDYN",[Dynamic (_,d)]) -> VARG_DYN d | _ -> anomaly_loc (Ast.loc ast, "Vernacinterp.cvt_varg", |