From 551a50ece9486c8f1eff4328703581e795f729f8 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@sbcglobal.net>
Date: Thu, 25 Jul 2024 08:07:47 -0700
Subject: [PATCH] Fix FUNARG assoc_list swapping

---
 images/apple/DRAWL.po | Bin 143360 -> 143360 bytes
 src/lisp/lores.lisp   |   2 +-
 src/lisp/s-expr.pla   |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/images/apple/DRAWL.po b/images/apple/DRAWL.po
index 851e31f0c2605681da9a14778eb233a6fa2302d6..f5a1d79591dc15853c4ef6a26225e06dd61bb951 100644
GIT binary patch
delta 946
zcmZp8z|ru4V}mmb?@t4E4hDw93<@B|<Ny{a6PO4Ch{435=IrZYXk@_v18l|&Tnvr^
zU|EnxFk|vOB#mIBm>4tye8PP75L*Ac05#4PglhyVoBRe-<K^JUV3=(nnm?3*k%55;
zt`W?bY{e=CcRW~Rb0X{RB`jcXD6CROm75%}3e97o3~FwkKCYhraGU;>F|ad;aiLi=
z4^yLvV~~5WH(VdXzeb?@jza<h5h8CeHL800g%}$lX>4I&Vff36W~0?=G>=VAT#ey)
zZMOh3Qv)MCXMY!0kb!KI7=#!Yl;B1wfWu)ul18vdD1(x#i=!X1<F_(MGThLIYXmbk
z|6MKr4jh!z6=pG_h2`{sS&V4zIm@8x666@}gXFajz`(TOMm2W&JS;jTeLRCh^ngSF
zL^sP%U}!F6MAP{Oi%to5XBQ-m3@pEaI;Wt;!*r|JjA-FGJrO8`n#|8KX#0Bl`8r0x
z&13n`z|0_mmguIh$D&ip$3Mt57_O0lg^7`o;UJm^w*Q^Ym?g-Ur7RGVDrAtx6k;x0
x#<RV2E#rOx&NP08#!Mj2-)_5)@xB|EhFhqgbBL$EpTcxmRwkM47OYJBv;b`J-Bkbp

delta 951
zcmZp8z|ru4V}mmb?+*iQ5eA0C3<@B|<Ny{a6PO4Ch{435=IrZYXk@_v18l|&Tnvr^
zU|EnxFk|vOB#mIBm>4tye8PP75L*Ac05#4PglhyVoBRe-<K^JUV3=(nnm?3*k%55;
zt`W?bY{e=CcRW~Rb0X{RB`jcXD6CROm75%}3e97o3~FwkKCYhraGU;>F|ad;aiLi=
z4^yLvV~~5WH(VdXzeb?@jza<h5h8CeHL800g%}$lX>4I&Vff36W~0?=G>=VAT#ey)
zZMOh3Qv)MCXMY!0kb!KI7=#!Yl;B1wfWu)ul18vdD1(x#i=!X1<F_(MGThLIYXmbk
z|6MKr4jh!z6=pG_h2`{sS&V4zIm@8x666@}gXFajz`(TOMm2W&JS;jTeLRCh^ngSF
zL^sP%U}!F6MAP{Oi%to5XBQ-m3@pEaI;Wt;!*r|JjA-FGJrO8`n#|8KX#0Bl`8r0x
z&13n`z{~(l{wTR&`g$xnrF{H@T!Y~n8CaMY85y>td0_kB*^F6&d}&M}=CWlxS;_(-
zsX_+ZOV={)7vRj`XK2g?;)3nA`xx)LP0wXz;^PkX^i$B#QV3QE@Z4_C%5+d`vH%ko
E00d3yMgRZ+

diff --git a/src/lisp/lores.lisp b/src/lisp/lores.lisp
index 8bf04d5..69fbb8a 100644
--- a/src/lisp/lores.lisp
+++ b/src/lisp/lores.lisp
@@ -11,7 +11,7 @@
     )
   ))
   (PLOTSIN (LAMBDA ()
-    (PLOTFUNC '(LAMBDA (S) (SIN (* S PI))))
+    (PLOTFUNC (FUNCTION (LAMBDA (S) (SIN (* S PI)))))
   ))
   (PLOTCOS (LAMBDA ()
     (PLOTFUNC '(LAMBDA (S) (COS (* S PI))))
diff --git a/src/lisp/s-expr.pla b/src/lisp/s-expr.pla
index 6245d42..5c53c80 100644
--- a/src/lisp/s-expr.pla
+++ b/src/lisp/s-expr.pla
@@ -825,10 +825,10 @@ def eval_funarg(funarg, argvals)
   // Build arg list before prepending to new assoc_list
   //
   arglist = NULL
-  argbase = eval_args(argvals)
   push_sweep_stack(assoc_list) // Save current association list
+  argbase    = eval_args(argvals)
   assoc_list = funarg=>cdr=>cdr=>car // Swap associcate list pointer
-  argsyms = funexpr=>cdr=>car
+  argsyms    = funexpr=>cdr=>car
   build_args(funexpr=>cdr=>car, argbase)
   if trace
     puts("\nFUNARG:"); print_expr(funarg)