From 0fd3afdd7a08f39b47a906270df587e3ef8aad10 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Mon, 22 Jul 2024 19:14:14 -0700 Subject: [PATCH] Fix NUMBERP --- images/apple/DRAWL.po | Bin 143360 -> 143360 bytes src/lisp/s-expr.pla | 6 ++++++ src/lisp/s-math.pla | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/apple/DRAWL.po b/images/apple/DRAWL.po index c84c703789f9fe249db9a1fc952cb128ffb17246..ea26d53bdfdde3de9ff595d138bd8fa203b939f8 100644 GIT binary patch delta 4243 zcmZXX33OD|8OQH?^JWsVn2=T>LDkcb6w!B|OU5hUjn7jPvmz)>lPDQ*?<7)y~BD=pezCT{|yob#Li_y2$Q zd-uH;<_3QKY5cE0jo<1s5|h(~cuf?Xo{*g0-e}~N4S3P-buqHKp{BHKvWWe0l#2x6 zO^tT@$D&31V}oPS%jjZsWBug~=DES2Y8YETd~htfti5mO*ayvXnqxclYf6jIg)j!k zqDA`@d!BXEQNMkz{iTgMH(#)+UGrtM@fDo7KS@Uvw|WW-(ldg28Q~%eJ5G8gU@$yq|2#c1{0_w(~CS;xb-c zN5NLDAhoY}a41@IG;YErReESd|tcMnRkOe*)}gcCjS@upOOSd zzs7Ux*a_3asfAY<-4ox^YIN;T$Fd$RA9=J#E7g{DzuTkj)wHtihu_h*>J!HmFPNA* z*|vCOQn6{P_J+bK&VHBI?`mRhU6E;22LsJkv!`R(K5gvy@**=X(9%%l3pHAeX@#aO z5DZ%`RAkz`ff~y#?bx$V%Z*%CY{u8N1ggXSV8H4`icLq2uht*%S;5{C)9ww0ymKty zIg;(0eX;9)JJPiG+a{}BHp;X$hWwUWIm)y*hGzI?TmIRo=SvawrHe!1gciiMsB zCzQYx@PZ%a!7rf=?uXrQEJG;a%vL{h8nVPG)M%$o{>CXHa*b2SPS^<_!g0vR6sjWA zkkx2yrcEx%EFx_uvEg7(Roq;RKw9|AIYN z$V70##V`iOgBzy73<$t%xEgMNTVM&?2`k}&T#+MJQ#=YAVH50tKf~+Y;X~SdJ@J*4 z{v&66>Nt_nop?lBtaYsYSew7*sFv5+tLfc&N3|OgBev$2hOiL*2gkDErgn){SEQNR zrB=O;daPBSr5s=<#Ke+uanqhD3WJU7@z4_Zw|=q#}*87S6&o=|bNPMuyODgjXTYDfBxt zh2EPb^fOT65_&bvg$S&NUGNcn56*0%mqQaQf(M}sdf+SIi>~vf*5|;A9FeJaQS1f2 zXnGYyptfUupLTUbuGECwt_ihID^LfuB6UP7lz%5XMRrlJ1e!b{u)utD!<@8rDdoR8Fm{IVEUMV-?|H#bqI%noi zhTdW5fIdbYWT=;+FBm$`qHh@Z4t`+BZWC&lElsAQS++Da&Q_pGZI`IYwn8<{=8?5F zA!pJH*xafGuC!Ik8}YX=vjknn%tOqqW@ZEHJ6Ycqp|P38FTjfoyoo==q9e9^^$8a~ zX7eavRLTTHs8L3N8f)aM@kXJVX?WCi9W&c1Mp~l zs*7{WK%7ubac(u6dNK7<^j-9DT&4UxPRK8*kJCQ^r^!UTkhXZC662@IR5U%_t#V*Q ze5JgEo=H}UpA6H;{ABfHLHy-#71?~U1@Zj+7ZS9=a>9EESF!MZ{O@5c*;8blWY6Na zLO0nSve(Jp!taBFWS@|IPWC0f4^EMtB@@GhvJG>q1QQt(T4*4fMRo<*Rru@RX0qGK?jT!^Uje@*YbRSnwif?5JVUmPYzJ94{$+TBY(Lri zWC!uR@C8}qTf%=3o+3B{T0*5vOc3%S;J;NeH$kY26Wpo<#?iZs%ne?sp;t#9fEIeK zWbkTdINP;l1J7j@yj?#sMKVSawhY4AlWVRlZ7foN1vJk;=O1s z>L60g g^ltP%^kMW5=+kHyy0d%FciJ?qJyoyj{HNymA6I!jGXMYp delta 4285 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 + return bool_pred(expr and (expr->type & TYPE_MASK == NUM_TYPE)) +end + def natv_and(symptr, expr) while expr and eval_expr(expr=>car) expr = expr=>cdr @@ -1355,6 +1360,7 @@ new_sym("CONS")=>natv = @natv_cons new_sym("LIST")=>natv = @natv_list new_sym("ATOM")=>natv = @natv_atom new_sym("EQ")=>natv = @natv_eq +new_sym("NUMBERP")=>natv = @natv_numberp new_sym("NOT")=>natv = @natv_null new_sym("AND")=>natv = @natv_and new_sym("OR")=>natv = @natv_or diff --git a/src/lisp/s-math.pla b/src/lisp/s-math.pla index 3ff10ac..83d0b04 100644 --- a/src/lisp/s-math.pla +++ b/src/lisp/s-math.pla @@ -118,11 +118,6 @@ def push_num(numptr)#0 fin end -def natv_numberp(symptr, expr) - expr = eval_expr(expr) - return bool_pred(expr and (expr->type & TYPE_MASK == NUM_TYPE)) -end - def natv_sum(symptr, expr) var num var[2] intsum @@ -788,7 +783,6 @@ fpu:constE() fpu:pullExt(@tempext) new_sym("MATH_E")=>apval = new_float(@tempext) ^ NULL_HACK fpu:sinX() // Force load of ELEMS library -new_sym("NUMBERP")=>natv = @natv_numberp new_sym("SUM")=>natv = @natv_sum new_sym("+")=>natv = @natv_sum new_sym("-")=>natv = @natv_sub