From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 31 Dec 2019 09:08:35 +0000 (+0000)
Subject: Fix ‘goal’ when it appears as a target (meaning ‘goal()’).
X-Git-Tag: v'0.2'~115
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=7b7cd85810f18286a36215cc164b659bf7db142c;p=goals.git

Fix ‘goal’ when it appears as a target (meaning ‘goal()’).
---

diff --git a/src/eval.ml b/src/eval.ml
index 66b0164..1688b5f 100644
--- a/src/eval.ml
+++ b/src/eval.ml
@@ -40,10 +40,20 @@ and evaluate_target env = function
      let args = List.map (Ast.to_constant env) args in
      run_tactic env loc name args
 
-  (* Look up the variable and substitute it. *)
+  (* If this is a goal then it's the same as calling goal().  If not
+   * then look up the variable and substitute it.
+   *)
   | Ast.EVar (loc, name) ->
      let expr = Ast.getvar env loc name in
-     evaluate_target env expr
+     (match expr with
+      | EGoal (loc, ([], _, _, _)) ->
+         evaluate_target env (Ast.ECallGoal (loc, name, []))
+      | EGoal _ ->
+         failwithf "%a: cannot call %s() since this goal has parameters"
+           Ast.string_loc loc name
+      | _ ->
+         evaluate_target env expr
+     )
 
   (* Lists are inlined when found as a target. *)
   | Ast.EList (loc, exprs) ->