X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Frun.ml;h=7d48a7eb26ae4b0a06101735d11f2f4401370b76;hb=2d5b3813df7f7db3abf3bcbfe2c6a657f463c5ee;hp=a0bb5927a49ca2cf09c8c90f57832e2be05825a0;hpb=f36210fd16a8e4e4d6ecdd8825bf8b8307943472;p=goals.git diff --git a/src/run.ml b/src/run.ml index a0bb592..7d48a7e 100644 --- a/src/run.ml +++ b/src/run.ml @@ -33,7 +33,7 @@ and run_target env = function run_goal env loc name args goal (* Call a tactic. *) - | Ast.ETacticConstructor (loc, name, args) -> + | Ast.ETacticCtor (loc, name, args) -> (* All parameters of tactics must be simple constant expressions * (strings, in future booleans, numbers, etc). *) @@ -108,7 +108,7 @@ and run_goal env loc name args (params, patterns, deps, code) = let expr_of_substs s = Ast.ESubsts (Ast.noloc, s) in let expr_of_pattern = function | Ast.PTactic (loc, tactic, targs) -> - Ast.ETacticConstructor (loc, tactic, List.map expr_of_substs targs) + Ast.ETacticCtor (loc, tactic, List.map expr_of_substs targs) in let pexprs = List.map expr_of_pattern patterns in let env = Ast.Env.add "@" (Ast.EList (Ast.noloc, pexprs)) env in @@ -227,7 +227,7 @@ and run_tactic env loc tactic cargs = let targs = List.map (function Ast.CString s -> [Ast.SString s]) cargs in let p = Ast.PTactic (loc, tactic, targs) in if needs_rebuild env loc [] p then ( - let t = Ast.ETacticConstructor (loc, tactic, + let t = Ast.ETacticCtor (loc, tactic, List.map (fun c -> Ast.EConstant (loc, c)) cargs) in failwithf "%a: don't know how to build %a"