Changeset 496 for abuse/trunk/src/chars.cppTweet

Timestamp:

Apr 17, 2011, 11:56:55 PM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: implement LObject::Eval.

File:

• abuse/trunk/src/chars.cpp (modified) (7 diffs)

abuse/trunk/src/chars.cpp

@@ -340 +340 @@
     PtrRef r5(ab);
     if (!NILP(ab))
-      abil[i]=lnumber_value(eval(lcar(lcdr(ab))));
+      abil[i]=lnumber_value(lcar(lcdr(ab))->Eval());
       }
     } else if (f==l_funs)
@@ -361 +361 @@
     Cell *ab=assoc(LSymbol::FindOrCreate(cflag_names[i]),l);
     PtrRef r5(ab);
-    if (!NILP(ab) && eval(lcar(lcdr(ab))))
+    if (!NILP(ab) && lcar(lcdr(ab))->Eval())
     cflags|=(1<<i);
       }
@@ -373 +373 @@
     } else if (f==l_range)
     {
-      rangex=lnumber_value(eval(lcar(lcdr(lcar(field)))));
-      rangey=lnumber_value(eval(lcar(lcdr(lcdr(lcar(field))))));
+      rangex=lnumber_value(lcar(lcdr(lcar(field)))->Eval());
+      rangey=lnumber_value(lcar(lcdr(lcdr(lcar(field))))->Eval());
     } else if (f==l_draw_range)
     {
-      draw_rangex=lnumber_value(eval(lcar(lcdr(lcar(field)))));
-      draw_rangey=lnumber_value(eval(lcar(lcdr(lcdr(lcar(field))))));
+      draw_rangex=lnumber_value(lcar(lcdr(lcar(field)))->Eval());
+      draw_rangey=lnumber_value(lcar(lcdr(lcdr(lcar(field))))->Eval());
     } else if (f==l_states)
     {
@@ -384 +384 @@
       PtrRef r4(l);
       char fn[100];
-      strcpy(fn,lstring_value(eval(CAR(l)))); l=CDR(l);
+      strcpy(fn,lstring_value(CAR(l)->Eval())); l=CDR(l);
       while (l)
       {
@@ -391 +391 @@
       sequence *mem;
       index = add_state(CAR((CAR(l))));
-      e = eval(CAR(CDR(CAR(l))));
+      e = CAR(CDR(CAR(l)))->Eval();
       mem = new sequence(fn,e,NULL);
     seq[index]=mem;
@@ -402 +402 @@
       while (!NILP(mf))
       {
-    char *real=lstring_value(eval(lcar(lcar(mf))));
-    char *fake=lstring_value(eval(lcar(lcdr(lcar(mf)))));
+    char *real=lstring_value(lcar(lcar(mf))->Eval());
+    char *fake=lstring_value(lcar(lcdr(lcar(mf)))->Eval());
     if (!isa_var_name(real))
     {
@@ -418 +418 @@
     } else if (f==l_logo)
     {
-      char *fn=lstring_value(eval(CAR(CDR(CAR(field)))));
-      char *o=lstring_value(eval(CAR(CDR(CDR(CAR(field))))));
+      char *fn=lstring_value(CAR(CDR(CAR(field)))->Eval());
+      char *o=lstring_value(CAR(CDR(CDR(CAR(field))))->Eval());
       logo=cache.reg(fn,o,SPEC_IMAGE,1);
     } else if (f==l_vars)