From 310837ab58af9348d9b3970424291c1ccaaa499c Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sat, 20 Apr 2024 15:36:56 +0200
Subject: [PATCH] forge.exec: fix action selection using symbolp, lookup in
 scopes/forge package

---
 forge/forge.lisp     | 6 +++---
 test/test-forge.lisp | 6 +++---
 testing.lisp         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/forge/forge.lisp b/forge/forge.lisp
index 55e0a31..7412df6 100644
--- a/forge/forge.lisp
+++ b/forge/forge.lisp
@@ -14,9 +14,9 @@
 
 (defun exec (fe code)
   (dolist (x code)
-	(if (numberp x)
-	  (pushd fe x)
-	  (funcall x fe))))
+	(if (symbolp x)
+      (funcall (find-symbol (symbol-name x) :scopes/forge) fe)
+	  (pushd fe x))))
 
 (defmacro data-stack (fe)
   `(elt ,fe 0))
diff --git a/test/test-forge.lisp b/test/test-forge.lisp
index b8244a6..38c3496 100644
--- a/test/test-forge.lisp
+++ b/test/test-forge.lisp
@@ -13,8 +13,8 @@
 (defun run ()
   (let ((fe (scf:new-forge-env))
 		(tst (sct:test-suite)))
-   (scf:exec fe '(4 2 scf:add))
-   (sct:assert-eql tst (car (scf:data-stack fe)) 6)
-   ;;(format t "~%fe ~a" fe)
+   (scf:exec fe '(4 2 add))
+   (sct:assert-eq tst (car (scf:data-stack fe)) 6)
+   ;(format t "~%fe ~a" fe)
    (sct:result tst)
   ))
diff --git a/testing.lisp b/testing.lisp
index 21d8480..a3e7104 100644
--- a/testing.lisp
+++ b/testing.lisp
@@ -4,15 +4,15 @@
 
 (defpackage :scopes/testing
   (:use :common-lisp)
-  (:export #:test-suite #:assert-eql #:result))
+  (:export #:test-suite #:assert-eq #:result))
 
 (in-package :scopes/testing)
 
 (defun test-suite ()
   (vector nil))
 
-(defun assert-eql (tst have wanted)
-  (push (eql have wanted) (result tst)))
+(defun assert-eq (tst have wanted)
+  (push (equalp have wanted) (result tst)))
 
 (defmacro result (tst) 
   `(elt ,tst 0))