From d6fc7837e2624a0683b1db821b7e47380db0778e Mon Sep 17 00:00:00 2001
From: Davide Bettio <davide@uninstall.it>
Date: Thu, 28 Nov 2024 00:48:01 +0100
Subject: [PATCH] alisp: fix: allow variables with any kind of value

There was an issue while making use of lambdas as variable value, the
problem was likely with anything else than binaries and integers.

Signed-off-by: Davide Bettio <davide@uninstall.it>
---
 CHANGELOG.md                    | 1 +
 libs/alisp/src/alisp.erl        | 8 +++-----
 tests/libs/alisp/test_alisp.erl | 9 +++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02b588dda..9ceeb0cd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ might lead to a crash in certain situations.
 - Fixed several bugs in `http_server` (#1366)
 - Fixed generic\_unix `socket_driver` to return `{gen_tcp, closed}` when socket is closed on Linux instead of `{gen_tcp, {recv, 104}}`
 - Fixed a memory leak where modules were not properly destroyed when the global context is destroyd
+- alisp: fix support to variables that are not binaries or integers.
 
 ## [0.6.5] - 2024-10-15
 
diff --git a/libs/alisp/src/alisp.erl b/libs/alisp/src/alisp.erl
index d20e6c285..307cce9db 100644
--- a/libs/alisp/src/alisp.erl
+++ b/libs/alisp/src/alisp.erl
@@ -34,10 +34,6 @@ eval(S) when is_atom(S) ->
         undefined -> throw({unbound, S});
         Val -> Val
     end;
-eval(I) when is_integer(I) ->
-    I;
-eval(B) when is_binary(B) ->
-    B;
 eval(['do', Vars, [_TestExpr, _ReturnExpr] | _Exprs] = Do) ->
     Restore = put_do_vars(Vars),
     execute_do(Do, Restore);
@@ -68,7 +64,9 @@ eval([[symbol_pair, Module, Fn] | Args]) when is_atom(Module) andalso is_atom(Fn
     fapply(Module, Fn, EvaluatedArgs);
 eval([Fn | Args]) when is_atom(Fn) ->
     EvaluatedArgs = eval_args(Args),
-    func_eval(Fn, EvaluatedArgs).
+    func_eval(Fn, EvaluatedArgs);
+eval(NotList) when not is_list(NotList) ->
+    NotList.
 
 func_eval('funcall', [Lambda | Args]) ->
     fapply(Lambda, Args);
diff --git a/tests/libs/alisp/test_alisp.erl b/tests/libs/alisp/test_alisp.erl
index 02d90e060..a241bdbf1 100644
--- a/tests/libs/alisp/test_alisp.erl
+++ b/tests/libs/alisp/test_alisp.erl
@@ -30,6 +30,7 @@ test() ->
 
 test_snippet0() ->
     ?ASSERT_MATCH(alisp:run(snippet0()), 25),
+    ?ASSERT_MATCH(alisp:run(snippet1()), 1),
     ok.
 
 snippet0() ->
@@ -57,3 +58,11 @@ snippet0() ->
     "            \n"
     "        (length (primes 100))\n"
     "    )\n".
+
+snippet1() ->
+    "\n"
+    "      (progn\n"
+    "          (setq mylambda (lambda (a b) (- a b)))\n"
+    "          (funcall mylambda 1 2)\n"
+    "          (funcall (lambda ()\n"
+    "                       (funcall mylambda 4 3))))\n".