Changeset 496Tweet

Timestamp:

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

Author:

Sam Hocevar

Message:

lisp: implement LObject::Eval.

Location:

abuse/trunk/src

Files:

• chars.cpp (modified) (7 diffs)
• clisp.cpp (modified) (22 diffs)
• cop.cpp (modified) (5 diffs)
• dev.cpp (modified) (4 diffs)
• game.cpp (modified) (2 diffs)
• lisp/lisp.cpp (modified) (101 diffs)
• lisp/lisp.h (modified) (10 diffs)
• lisp/lisp_gc.h (modified) (1 diff)
• loader2.cpp (modified) (1 diff)
• menu.cpp (modified) (1 diff)

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)

abuse/trunk/src/clisp.cpp

@@ -573 +573 @@
     case 0 :
     {
-      current_object->set_aistate(lnumber_value(eval(CAR(args))));
+      current_object->set_aistate(lnumber_value(CAR(args)->Eval()));
       current_object->set_aistate_time(0);
       void *ai=figures[current_object->otype]->get_fun(OFUN_AI);
@@ -587 +587 @@
     {
       game_object *old_cur=current_object;
-      current_object=(game_object *)lpointer_value(eval(CAR(args)));
+      current_object=(game_object *)lpointer_value(CAR(args)->Eval());
       void *ret=eval_block(CDR(args));
       current_object=old_cur;
@@ -599 +599 @@
       game_object *o;
       if (args)
-        o=(game_object *)lpointer_value(eval(CAR(args)));
+        o=(game_object *)lpointer_value(CAR(args)->Eval());
       else o=current_object;
       game_object *hit=current_object->bmove(whit,o);
@@ -615 +615 @@
     case 5 : return LPointer::Create(current_level->find_closest(current_object->x,
                                  current_object->y,
-                               lnumber_value(eval(CAR(args))),
+                               lnumber_value(CAR(args)->Eval()),
                                        current_object)); break;
     case 6 : return LPointer::Create(current_level->find_xclosest(current_object->x,
                                   current_object->y,
-                                  lnumber_value(eval(CAR(args))),
+                                  lnumber_value(CAR(args)->Eval()),
                                   current_object
                                   )); break;
     case 7 :
     {
-      long n1=lnumber_value(eval(CAR(args)));
-      long n2=lnumber_value(eval(CAR(CDR(args))));
+      long n1=lnumber_value(CAR(args)->Eval());
+      long n2=lnumber_value(CAR(CDR(args))->Eval());
       return LPointer::Create(current_level->find_xrange(current_object->x,
                              current_object->y,
@@ -634 +634 @@
     case 8 :
     {
-      int type=lnumber_value(eval(CAR(args)));          args=CDR(args);
-      long x=lnumber_value(eval(CAR(args)));       args=CDR(args);
-      long y=lnumber_value(eval(CAR(args)));  args=CDR(args);
+      int type=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long x=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long y=lnumber_value(CAR(args)->Eval()); args=CDR(args);
       game_object *o;
       if (args)
-        o=create(type,x,y,0,lnumber_value(eval(CAR(args))));
+        o=create(type,x,y,0,lnumber_value(CAR(args)->Eval()));
       else
         o=create(type,x,y);
@@ -648 +648 @@
     case 22 :
     {
-      int type=lnumber_value(eval(CAR(args)));          args=CDR(args);
-      long x=lnumber_value(eval(CAR(args)));       args=CDR(args);
-      long y=lnumber_value(eval(CAR(args)));  args=CDR(args);
+      int type=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long x=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long y=lnumber_value(CAR(args)->Eval()); args=CDR(args);
       game_object *o;
       if (args)
-        o=create(type,x,y,0,lnumber_value(eval(CAR(args))));
+        o=create(type,x,y,0,lnumber_value(CAR(args)->Eval()));
       else
         o=create(type,x,y);
@@ -664 +664 @@
     case 10 :
     {
-      view *v=((game_object *)lpointer_value(eval(CAR(args))))->controller()->next;
+      view *v=((game_object *)lpointer_value(CAR(args)->Eval()))->controller()->next;
       if (v)
         return LPointer::Create(v->focus);
@@ -672 +672 @@
     {
       return LPointer::Create
-      ((void *)current_object->get_object(lnumber_value(eval(CAR(args)))));
+      ((void *)current_object->get_object(lnumber_value(CAR(args)->Eval())));
     } break;
     case 12 :
     {
       return LPointer::Create
-      ((void *)current_object->get_light(lnumber_value(eval(CAR(args)))));
+      ((void *)current_object->get_light(lnumber_value(CAR(args)->Eval())));
     } break;
     case 13 :
@@ -686 +686 @@
       {
     current_object=old_cur->get_object(i);
-    ret=eval(CAR(args));
+    ret = CAR(args)->Eval();
       }
       current_object=old_cur;
@@ -693 +693 @@
     case 14 :
     {
-      int t=lnumber_value(eval(CAR(args))); args=lcdr(args);
-      int x=lnumber_value(eval(CAR(args))); args=lcdr(args);
-      int y=lnumber_value(eval(CAR(args))); args=lcdr(args);
-      int r1=lnumber_value(eval(CAR(args))); args=lcdr(args);
-      int r2=lnumber_value(eval(CAR(args))); args=lcdr(args);
-      int xs=lnumber_value(eval(CAR(args))); args=lcdr(args);
-      int ys=lnumber_value(eval(CAR(args)));
+      int t=lnumber_value(CAR(args)->Eval()); args=lcdr(args);
+      int x=lnumber_value(CAR(args)->Eval()); args=lcdr(args);
+      int y=lnumber_value(CAR(args)->Eval()); args=lcdr(args);
+      int r1=lnumber_value(CAR(args)->Eval()); args=lcdr(args);
+      int r2=lnumber_value(CAR(args)->Eval()); args=lcdr(args);
+      int xs=lnumber_value(CAR(args)->Eval()); args=lcdr(args);
+      int ys=lnumber_value(CAR(args)->Eval());
       return LPointer::Create(add_light_source(t,x,y,r1,r2,xs,ys));
     } break;
@@ -714 +714 @@
     case 17 :
     {
-      long trials=lnumber_value(eval(CAR(args)));
+      long trials=lnumber_value(CAR(args)->Eval());
       args=CDR(args);
       time_marker start;
@@ -720 +720 @@
       {
     clear_tmp();
-    eval(CAR(args));
+    CAR(args)->Eval();
       }
       time_marker end;
@@ -731 +731 @@
     case 20 :
     {
-      long x1=lnumber_value(eval(CAR(args))); args=CDR(args);
-      long y1=lnumber_value(eval(CAR(args))); args=CDR(args);
-      long x2=lnumber_value(eval(CAR(args))); args=CDR(args);
-      long y2=lnumber_value(eval(CAR(args))); args=CDR(args);
-
-      void *list=eval(CAR(args));
+      long x1=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long y1=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long x2=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long y2=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+
+      void *list = CAR(args)->Eval();
       game_object *find=current_level->find_object_in_area(current_object->x,
                           current_object->y,
@@ -746 +746 @@
     case 21 :
     {
-      long a1=lnumber_value(eval(CAR(args))); args=CDR(args);
-      long a2=lnumber_value(eval(CAR(args))); args=CDR(args);
-
-      void *list=eval(CAR(args));
+      long a1=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      long a2=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+
+      void *list = CAR(args)->Eval();
       PtrRef r1(list);
       game_object *find=current_level->find_object_in_angle(current_object->x,
@@ -787 +787 @@
     case 24 :
     {
-      int32_t x1=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      int32_t y1=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      int32_t x2=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      int32_t y2=lnumber_value(eval(CAR(args)));
+      int32_t x1=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      int32_t y1=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      int32_t x2=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      int32_t y2=lnumber_value(CAR(args)->Eval());
       current_level->foreground_intersect(x1,y1,x2,y2);
       void *ret=NULL;
@@ -868 +868 @@
     case 46 :
     {
-      return LString::Create(start_argv[lnumber_value(eval(CAR(args)))]);
+      return LString::Create(start_argv[lnumber_value(CAR(args)->Eval())]);
     } break;
     case 47 :
@@ -901 +901 @@
     case 49 :
     {
-      int32_t x=lnumber_value(eval(CAR(args))); args=CDR(args);
-      int32_t y=lnumber_value(eval(CAR(args))); args=CDR(args);
+      int32_t x=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args)->Eval()); args=CDR(args);
 
       int32_t rx,ry;
@@ -916 +916 @@
     case 50 :
     {
-      int32_t x=lnumber_value(eval(CAR(args))); args=CDR(args);
-      int32_t y=lnumber_value(eval(CAR(args))); args=CDR(args);
+      int32_t x=lnumber_value(CAR(args)->Eval()); args=CDR(args);
+      int32_t y=lnumber_value(CAR(args)->Eval()); args=CDR(args);
 
       int32_t rx,ry;
@@ -945 +945 @@
     } break;
     case 55 :
-    { system(lstring_value(eval(CAR(args)))); } break;
+    { system(lstring_value(CAR(args)->Eval())); } break;
     case 56 :
     {
-      void *fn=eval(CAR(args)); args=CDR(args);
+      void *fn=CAR(args)->Eval(); args=CDR(args);
       char tmp[200];
       {
     PtrRef r1(fn);
-    char *slash=lstring_value(eval(CAR(args)));
+    char *slash=lstring_value(CAR(args)->Eval());
     char *filename=lstring_value(fn);
 
@@ -972 +972 @@
       int tfiles,tdirs,i;
 
-      get_directory(lstring_value(eval(CAR(args))),files,tfiles,dirs,tdirs);
+      get_directory(lstring_value(CAR(args)->Eval()),files,tfiles,dirs,tdirs);
       void *fl=NULL,*dl=NULL,*rl=NULL;
       {
@@ -995 +995 @@
     {
         long x;
-        sscanf(lstring_value(eval(CAR(args))),"%lx",&x);
+        sscanf(lstring_value(CAR(args)->Eval()),"%lx",&x);
         return LPointer::Create((void *)(intptr_t)x);
     } break;
@@ -1001 +1001 @@
     {
       char name[256],name2[256];
-      strcpy(name,lstring_value(eval(CAR(args))));  args=CDR(args);
-      long first=lnumber_value(eval(CAR(args)));  args=CDR(args);
-      long last=lnumber_value(eval(CAR(args)));
+      strcpy(name,lstring_value(CAR(args)->Eval()));  args=CDR(args);
+      long first=lnumber_value(CAR(args)->Eval());  args=CDR(args);
+      long last=lnumber_value(CAR(args)->Eval());
       long i;
       void *ret=NULL;

abuse/trunk/src/cop.cpp

@@ -256 +256 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      int32_t value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(CAR(args)->Eval());
       if (value)                                   // do we have ammo ?
       {
@@ -298 +298 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      int32_t value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(CAR(args)->Eval());
       if (value)                                   // do we have ammo ?
       {
@@ -325 +325 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      int32_t value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(CAR(args)->Eval());
       if (value)                                   // do we have ammo ?
       {
@@ -349 +349 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      int32_t value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(CAR(args)->Eval());
       if (value)                                   // do we have ammo ?
       {
@@ -376 +376 @@
     if (!o->lvars[fire_delay1])                   // make sur we are not waiting of previous fire
     {
-      int32_t value=lnumber_value(eval(CAR(args)));
+      int32_t value=lnumber_value(CAR(args)->Eval());
       if (value)                                   // do we have ammo ?
       {

abuse/trunk/src/dev.cpp

@@ -56 +56 @@
   char const *cs=prog;
   strcpy(prog,"(setq section 'game_section)\n");
-  eval(compile(cs));
+  LObject::Compile(cs)->Eval();
   strcpy(prog,"(load \"lisp/english.lsp\")\n");
   cs=prog;
-  if (!eval(compile(cs)))
+  if (!LObject::Compile(cs)->Eval())
   {
     printf("unable to open file '%s'\n",lsf);
@@ -965 +965 @@
     strcpy(prog,"(compile-file \"edit.lsp\")");
     cs=prog;
-    void *p=compile(cs);
+    LObject *p = LObject::Compile(cs);
     l_user_stack.push(p);
-    eval(p);
+    p->Eval();
     l_user_stack.pop(1);
     for (int i=0; i<total_pals; i++)
@@ -982 +982 @@
   if (command[0]=='(')            // is this a lisp command?
   {
-    eval(compile(command));
+    LObject::Compile(command)->Eval();
     return ;
   }
@@ -2309 +2309 @@
           atoi(mess_win->read(ID_MESS_STR2)));
       char const *s=name;
-      eval(compile(s));
+      LObject::Compile(s)->Eval();
       wm->push_event(new event(ID_CANCEL,NULL));        // close window
     } break;

abuse/trunk/src/game.cpp

@@ -1256 +1256 @@
 
     int i;
-    char *str = lstring_value(eval(LSymbol::FindOrCreate("plot_start")));
+    char *str = lstring_value(LSymbol::FindOrCreate("plot_start")->Eval());
 
     bFILE *fp = open_file("art/smoke.spe", "rb");
@@ -2311 +2311 @@
                 while(*s)
                 {
-                    void *prog = compile(s);
+                    LObject *prog = LObject::Compile(s);
                     l_user_stack.push(prog);
                     while(*s==' ' || *s=='\t' || *s=='\r' || *s=='\n') s++;
-                    ((LObject *)eval(prog))->Print();
+                    prog->Eval()->Print();
                     l_user_stack.pop(1);
                 }

abuse/trunk/src/lisp/lisp.cpp

@@ -140 +140 @@
       do
       {
-                void *prog=compile(s);
-                PtrRef r1(prog);
-                while (*s==' ' || *s=='\t' || *s=='\r' || *s=='\n') s++;
-                ((LObject *)eval(prog))->Print();
+        LObject *prog = LObject::Compile(s);
+        PtrRef r1(prog);
+        while (*s==' ' || *s=='\t' || *s=='\r' || *s=='\n')
+            s++;
+        prog->Eval()->Print();
       } while (*s);
     }
@@ -215 +216 @@
   while (list)
   {
-    ret=eval(CAR(list));
-    list=CDR(list);
+    ret = CAR(list)->Eval();
+    list = CDR(list);
   }
   return ret;
@@ -237 +238 @@
     if (rest)
     {
-        void *x = eval(CAR(rest));
+        LObject *x = CAR(rest)->Eval();
         if (x == colon_initial_contents)
         {
-            x = eval(CAR(CDR(rest)));
+            x = CAR(CDR(rest))->Eval();
             data = p->GetData();
             for (size_t i = 0; i < len; i++, x = CDR(x))
@@ -261 +262 @@
         else if (x == colon_initial_element)
         {
-            x = eval(CAR(CDR(rest)));
+            x = CAR(CDR(rest))->Eval();
             data = p->GetData();
             for (size_t i = 0; i < len; i++)
@@ -563 +564 @@
 }
 
-void *lcdr(void *c)
+LObject *lcdr(void *c)
 {
   if (!c) return NULL;
@@ -572 +573 @@
 }
 
-void *lcar(void *c)
+LObject *lcar(void *c)
 {
   if (!c) return NULL;
@@ -877 +878 @@
 }
 
-void ldelete_syms(LSymbol *root)
-{
-  if (root)
-  {
-    ldelete_syms(root->left);
-    ldelete_syms(root->right);
-    free(root);
-  }
+static void DeleteAllSymbols(LSymbol *root)
+{
+    if (root)
+    {
+        DeleteAllSymbols(root->left);
+        DeleteAllSymbols(root->right);
+        free(root);
+    }
 }
 
@@ -1124 +1125 @@
 void *comp_optimize(void *list);
 
-void *compile(char const *&s)
-{
-  void *ret=NULL;
-  if (!read_ltoken(s, n))
-    lerror(NULL, "unexpected end of program");
+LObject *LObject::Compile(char const *&code)
+{
+    LObject *ret = NULL;
+
+    if (!read_ltoken(code, n))
+        lerror(NULL, "unexpected end of program");
+
   if (!strcmp(n, "nil"))
     return NULL;
@@ -1135 +1138 @@
   else if (n[0]=='\'')                    // short hand for quote function
   {
-    void *cs = LList::Create(), *c2=NULL, *tmp;
+    LObject *cs = LList::Create(), *c2=NULL, *tmp;
     PtrRef r1(cs), r2(c2);
 
     ((LList *)cs)->car=quote_symbol;
     c2 = LList::Create();
-    tmp=compile(s);
+    tmp=Compile(code);
     ((LList *)c2)->car = (LObject *)tmp;
     ((LList *)c2)->cdr=NULL;
@@ -1148 +1151 @@
   else if (n[0]=='`')                    // short hand for backquote function
   {
-    void *cs = LList::Create(), *c2=NULL, *tmp;
+    LObject *cs = LList::Create(), *c2=NULL, *tmp;
     PtrRef r1(cs), r2(c2);
 
     ((LList *)cs)->car=backquote_symbol;
     c2 = LList::Create();
-    tmp=compile(s);
+    tmp=Compile(code);
     ((LList *)c2)->car = (LObject *)tmp;
     ((LList *)c2)->cdr=NULL;
@@ -1160 +1163 @@
   }  else if (n[0]==',')              // short hand for comma function
   {
-    void *cs = LList::Create(), *c2=NULL, *tmp;
+    LObject *cs = LList::Create(), *c2=NULL, *tmp;
     PtrRef r1(cs), r2(c2);
 
     ((LList *)cs)->car=comma_symbol;
     c2 = LList::Create();
-    tmp=compile(s);
+    tmp=Compile(code);
     ((LList *)c2)->car = (LObject *)tmp;
     ((LList *)c2)->cdr=NULL;
@@ -1178 +1181 @@
     do
     {
-      char const *tmp=s;
+      char const *tmp=code;
       if (!read_ltoken(tmp, n))           // check for the end of the list
         lerror(NULL, "unexpected end of program");
@@ -1184 +1187 @@
       {
                 done=1;
-                read_ltoken(s, n);                // read off the ')'
+                read_ltoken(code, n);                // read off the ')'
       }
       else
@@ -1191 +1194 @@
                 {
                   if (!first)
-                    lerror(s, "token '.' not allowed here\n");
+                    lerror(code, "token '.' not allowed here\n");
                   else
                   {
                     void *tmp;
-                    read_ltoken(s, n);              // skip the '.'
-                    tmp=compile(s);
+                    read_ltoken(code, n);              // skip the '.'
+                    tmp=Compile(code);
                     ((LList *)last)->cdr = (LObject *)tmp;          // link the last cdr to
                     last=NULL;
                   }
                 } else if (!last && first)
-                  lerror(s, "illegal end of dotted list\n");
+                  lerror(code, "illegal end of dotted list\n");
                 else
                 {
@@ -1208 +1211 @@
                   PtrRef r1(cur);
                   if (!first) first=cur;
-                  tmp=compile(s);
+                  tmp=Compile(code);
                   ((LList *)cur)->car = (LObject *)tmp;
                   if (last)
@@ -1216 +1219 @@
       }
     } while (!done);
-    ret=comp_optimize(first);
+    ret=(LObject *)comp_optimize(first);
 
   } else if (n[0]==')')
-    lerror(s, "mismatched )");
+    lerror(code, "mismatched )");
   else if (isdigit(n[0]) || (n[0]=='-' && isdigit(n[1])))
   {
@@ -1227 +1230 @@
   } else if (n[0]=='"')
   {
-    ret = LString::Create(str_token_len(s));
+    ret = LString::Create(str_token_len(code));
     char *start=lstring_value(ret);
-    for (; *s && (*s!='"' || s[1]=='"'); s++, start++)
-    {
-      if (*s=='\\')
-      {
-                s++;
-                if (*s=='n') *start='\n';
-                if (*s=='r') *start='\r';
-                if (*s=='t') *start='\t';
-                if (*s=='\\') *start='\\';
-      } else *start=*s;
-      if (*s=='"') s++;
+    for (; *code && (*code!='"' || code[1]=='"'); code++, start++)
+    {
+      if (*code=='\\')
+      {
+                code++;
+                if (*code=='n') *start='\n';
+                if (*code=='r') *start='\r';
+                if (*code=='t') *start='\t';
+                if (*code=='\\') *start='\\';
+      } else *start=*code;
+      if (*code=='"') code++;
     }
     *start=0;
-    s++;
+    code++;
   } else if (n[0]=='#')
   {
     if (n[1]=='\\')
     {
-      read_ltoken(s, n);                   // read character name
+      read_ltoken(code, n);                   // read character name
       if (!strcmp(n, "newline"))
         ret = LChar::Create('\n');
@@ -1257 +1260 @@
     else if (n[1]==0)                           // short hand for function
     {
-      void *cs = LList::Create(), *c2=NULL, *tmp;
+      LObject *cs = LList::Create(), *c2=NULL, *tmp;
       PtrRef r4(cs), r5(c2);
       tmp = LSymbol::FindOrCreate("function");
       ((LList *)cs)->car = (LObject *)tmp;
       c2 = LList::Create();
-      tmp=compile(s);
+      tmp=Compile(code);
       ((LList *)c2)->car = (LObject *)tmp;
       ((LList *)cs)->cdr = (LObject *)c2;
@@ -1522 +1525 @@
           cur=first = LList::Create();
 
-        void *val=eval(CAR(arg_list));
-        ((LList *)cur)->car = (LObject *)val;
+        LObject *val = CAR(arg_list)->Eval();
+        ((LList *)cur)->car = val;
         arg_list=lcdr(arg_list);
       }
@@ -1570 +1573 @@
 {
   PtrRef ref1(arg_list);
-  void *sym=eval(CAR(arg_list));
+  LObject *sym = CAR(arg_list)->Eval();
   switch ((short)item_type(sym))
   {
@@ -1593 +1596 @@
   for (i=0; i<num_args; i++)
   {
-    arg_on[i]=(LList *)eval(CAR(list_on));
+    arg_on[i] = (LList *)CAR(list_on)->Eval();
     PtrRef::stack.push(&arg_on[i]);
 
@@ -1654 +1657 @@
   PtrRef ref1(prog_list), ref2(el_list);
   void *ret=NULL;
-  void *rtype=eval(CAR(prog_list));
+  void *rtype = CAR(prog_list)->Eval();
 
   long len=0;                                // determin the length of the resulting string
@@ -1669 +1672 @@
       for (i=0; i<elements; i++, el_list=CDR(el_list))
       {
-        str_eval[i]=eval(CAR(el_list));
+        str_eval[i] = CAR(el_list)->Eval();
     PtrRef::stack.push(&str_eval[i]);
 
@@ -1748 +1751 @@
     return NULL;
   else if ((LSymbol *) (((LList *)args)->car)==comma_symbol)
-    return eval(CAR(CDR(args)));
+    return CAR(CDR(args))->Eval();
   else
   {
@@ -1759 +1762 @@
     if (CAR(args)==comma_symbol)               // dot list with a comma?
     {
-      tmp=eval(CAR(CDR(args)));
+      tmp = CAR(CDR(args))->Eval();
       ((LList *)last)->cdr = (LObject *)tmp;
       args=NULL;
@@ -1800 +1803 @@
       while (arg_list)
       {
-        ret=eval(CAR(arg_list));  arg_list=CDR(arg_list);
+        ret = CAR(arg_list)->Eval();
+        arg_list=CDR(arg_list);
         ((LObject *)ret)->Print();
       }
@@ -1806 +1810 @@
     } break;
     case SYS_FUNC_CAR:
-    { ret=lcar(eval(CAR(arg_list))); } break;
+    { ret=lcar(CAR(arg_list)->Eval()); } break;
     case SYS_FUNC_CDR:
-    { ret=lcdr(eval(CAR(arg_list))); } break;
+    { ret=lcdr(CAR(arg_list)->Eval()); } break;
     case SYS_FUNC_LENGTH:
     {
-      void *v=eval(CAR(arg_list));
+      void *v = CAR(arg_list)->Eval();
       switch (item_type(v))
       {
@@ -1830 +1834 @@
       {
     cur = LList::Create();
-    void *val=eval(CAR(arg_list));
+    void *val = CAR(arg_list)->Eval();
     ((LList *) cur)->car = (LObject *)val;
     if (last)
@@ -1843 +1847 @@
     { void *c = LList::Create();
       PtrRef r1(c);
-      void *val=eval(CAR(arg_list));
+      void *val = CAR(arg_list)->Eval();
       ((LList *)c)->car = (LObject *)val;
-      val=eval(CAR(CDR(arg_list)));
+      val = CAR(CDR(arg_list))->Eval();
       ((LList *)c)->cdr = (LObject *)val;
       ret=c;
@@ -1854 +1858 @@
     case SYS_FUNC_EQ:
     {
-      l_user_stack.push(eval(CAR(arg_list)));
-      l_user_stack.push(eval(CAR(CDR(arg_list))));
+      l_user_stack.push(CAR(arg_list)->Eval());
+      l_user_stack.push(CAR(CDR(arg_list))->Eval());
       ret=lisp_eq(l_user_stack.pop(1), l_user_stack.pop(1));
     } break;
     case SYS_FUNC_EQUAL:
     {
-      l_user_stack.push(eval(CAR(arg_list)));
-      l_user_stack.push(eval(CAR(CDR(arg_list))));
+      l_user_stack.push(CAR(arg_list)->Eval());
+      l_user_stack.push(CAR(CDR(arg_list))->Eval());
       ret=lisp_equal(l_user_stack.pop(1), l_user_stack.pop(1));
     } break;
@@ -1869 +1873 @@
       while (arg_list)
       {
-    sum+=lnumber_value(eval(CAR(arg_list)));
+    sum+=lnumber_value(CAR(arg_list)->Eval());
     arg_list=CDR(arg_list);
       }
@@ -1878 +1882 @@
     {
       long sum;
-      void *first=eval(CAR(arg_list));
+      void *first = CAR(arg_list)->Eval();
       PtrRef r1(first);
       if (arg_list && item_type(first)==L_FIXED_POINT)
@@ -1887 +1891 @@
       sum=(sum>>8)*(lfixed_point_value(first)>>8);
       arg_list=CDR(arg_list);
-      if (arg_list) first=eval(CAR(arg_list));
+      if (arg_list) first = CAR(arg_list)->Eval();
     } while (arg_list);
 
@@ -1895 +1899 @@
     do
     {
-      sum*=lnumber_value(eval(CAR(arg_list)));
+      sum*=lnumber_value(CAR(arg_list)->Eval());
       arg_list=CDR(arg_list);
-      if (arg_list) first=eval(CAR(arg_list));
+      if (arg_list) first =CAR(arg_list)->Eval();
     } while (arg_list);
     ret = LNumber::Create(sum);
@@ -1908 +1912 @@
       while (arg_list)
       {
-    void *i=eval(CAR(arg_list));
+    void *i = CAR(arg_list)->Eval();
     PtrRef r1(i);
     if (item_type(i)!=L_NUMBER)
@@ -1928 +1932 @@
     case SYS_FUNC_MINUS:
     {
-      long x=lnumber_value(eval(CAR(arg_list)));         arg_list=CDR(arg_list);
+      long x=lnumber_value(CAR(arg_list)->Eval());
+      arg_list=CDR(arg_list);
       while (arg_list)
       {
-    x-=lnumber_value(eval(CAR(arg_list)));
+    x-=lnumber_value(CAR(arg_list)->Eval());
     arg_list=CDR(arg_list);
       }
@@ -1939 +1944 @@
     case SYS_FUNC_IF:
     {
-      if (eval(CAR(arg_list)))
-      ret=eval(CAR(CDR(arg_list)));
+      if (CAR(arg_list)->Eval())
+      ret=CAR(CDR(arg_list))->Eval();
       else
       { arg_list=CDR(CDR(arg_list));                 // check for a else part
     if (arg_list)
-      ret=eval(CAR(arg_list));
+      ret = CAR(arg_list)->Eval();
     else ret=NULL;
       }
@@ -1951 +1956 @@
     case SYS_FUNC_SETF:
     {
-      void *set_to=eval(CAR(CDR(arg_list))), *i=NULL;
+      void *set_to = CAR(CDR(arg_list))->Eval(), *i=NULL;
       PtrRef r1(set_to), r2(i);
       i=CAR(arg_list);
@@ -1984 +1989 @@
           if (car==car_symbol)
           {
-            car=eval(CAR(CDR(i)));
+            car = CAR(CDR(i))->Eval();
             if (!car || item_type(car)!=L_CONS_CELL)
             { ((LObject *)car)->Print(); lbreak("setq car : evaled object is not a cons cell\n"); exit(0); }
@@ -1990 +1995 @@
           } else if (car==cdr_symbol)
           {
-            car=eval(CAR(CDR(i)));
+            car = CAR(CDR(i))->Eval();
             if (!car || item_type(car)!=L_CONS_CELL)
             { ((LObject *)car)->Print(); lbreak("setq cdr : evaled object is not a cons cell\n"); exit(0); }
@@ -1997 +2002 @@
           {
 #endif
-            LArray *a = (LArray *)eval(CAR(CDR(i)));
+            LArray *a = (LArray *)CAR(CDR(i))->Eval();
             PtrRef r1(a);
 #ifdef TYPE_CHECKING
@@ -2007 +2012 @@
             }
 #endif
-            int num = lnumber_value(eval(CAR(CDR(CDR(i)))));
+            int num = lnumber_value(CAR(CDR(CDR(i)))->Eval());
 #ifdef TYPE_CHECKING
             if (num >= (int)a->len || num < 0)
@@ -2039 +2044 @@
     case SYS_FUNC_ASSOC:
     {
-      void *item=eval(CAR(arg_list));
+      void *item = CAR(arg_list)->Eval();
       PtrRef r1(item);
-      void *list=(LList *)eval(CAR(CDR(arg_list)));
+      void *list=(LList *)CAR(CDR(arg_list))->Eval();
       PtrRef r2(list);
       ret=assoc(item, (LList *)list);
@@ -2047 +2052 @@
     case SYS_FUNC_NOT:
     case SYS_FUNC_NULL:
-    if (eval(CAR(arg_list))==NULL) ret=true_symbol; else ret=NULL;
+    if (CAR(arg_list)->Eval()==NULL) ret=true_symbol; else ret=NULL;
     break;
     case SYS_FUNC_ACONS:
     {
-      void *i1=eval(CAR(arg_list)), *i2=eval(CAR(CDR(arg_list)));
+      void *i1 = CAR(arg_list)->Eval(), *i2 = CAR(CDR(arg_list))->Eval();
       PtrRef r1(i1);
       LList *cs = LList::Create();
@@ -2061 +2066 @@
     case SYS_FUNC_PAIRLIS:
     {
-      l_user_stack.push(eval(CAR(arg_list))); arg_list=CDR(arg_list);
-      l_user_stack.push(eval(CAR(arg_list))); arg_list=CDR(arg_list);
-      void *n3=eval(CAR(arg_list));
+      l_user_stack.push(CAR(arg_list)->Eval());
+      arg_list=CDR(arg_list);
+      l_user_stack.push(CAR(arg_list)->Eval());
+      arg_list=CDR(arg_list);
+      void *n3 = CAR(arg_list)->Eval();
       void *n2=l_user_stack.pop(1);
       void *n1=l_user_stack.pop(1);
@@ -2089 +2096 @@
 
     l_user_stack.push(((LSymbol *)var_name)->value);
-    tmp=eval(CAR(CDR(CAR(var_list))));
+    tmp = CAR(CDR(CAR(var_list)))->Eval();
     ((LSymbol *)var_name)->SetValue((LObject *)tmp);
     var_list=CDR(var_list);
@@ -2098 +2105 @@
       while (block_list)
       {
-    ret=eval(CAR(block_list));
+    ret = CAR(block_list)->Eval();
     block_list=CDR(block_list);
       }
@@ -2144 +2151 @@
     } break;
     case SYS_FUNC_ATOM:
-    { ret=lisp_atom(eval(CAR(arg_list))); }
+    { ret=lisp_atom(CAR(arg_list)->Eval()); }
     case SYS_FUNC_AND:
     {
@@ -2152 +2159 @@
       while (l)
       {
-    if (!eval(CAR(l)))
+    if (!CAR(l)->Eval())
     {
       ret=NULL;
@@ -2166 +2173 @@
       while (l)
       {
-    if (eval(CAR(l)))
+    if (CAR(l)->Eval())
     {
       ret=true_symbol;
@@ -2180 +2187 @@
     case SYS_FUNC_CHAR_CODE:
     {
-      void *i=eval(CAR(arg_list));
+      void *i = CAR(arg_list)->Eval();
       PtrRef r1(i);
       ret=NULL;
@@ -2199 +2206 @@
     case SYS_FUNC_CODE_CHAR:
     {
-      void *i=eval(CAR(arg_list));
+      void *i = CAR(arg_list)->Eval();
       PtrRef r1(i);
       if (item_type(i)!=L_NUMBER)
@@ -2219 +2226 @@
         while (block_list)
     {
-      if (eval(lcar(CAR(block_list))))
-        ret=eval(CAR(CDR(CAR(block_list))));
+      if (lcar(CAR(block_list))->Eval())
+        ret = CAR(CDR(CAR(block_list)))->Eval();
       block_list=CDR(block_list);
     }
@@ -2227 +2234 @@
     case SYS_FUNC_SELECT:
     {
-      void *selector=eval(CAR(arg_list));
+      void *selector = CAR(arg_list)->Eval();
       void *sel=CDR(arg_list);
       PtrRef r1(selector), r2(sel);
       while (sel)
       {
-    if (lisp_equal(selector, eval(CAR(CAR(sel)))))
+    if (lisp_equal(selector, CAR(CAR(sel))->Eval()))
     {
       sel=CDR(CAR(sel));
       while (sel)
       {
-        ret=eval(CAR(sel));
+        ret = CAR(sel)->Eval();
         sel=CDR(sel);
       }
@@ -2245 +2252 @@
     } break;
     case SYS_FUNC_FUNCTION:
-      ret = ((LSymbol *)eval(CAR(arg_list)))->GetFunction();
+      ret = ((LSymbol *)CAR(arg_list)->Eval())->GetFunction();
     break;
     case SYS_FUNC_MAPCAR:
@@ -2251 +2258 @@
     case SYS_FUNC_FUNCALL:
     {
-      void *n1=eval(CAR(arg_list));
+      void *n1 = CAR(arg_list)->Eval();
       ret=eval_function((LSymbol *)n1, CDR(arg_list));
     } break;
     case SYS_FUNC_GT:
     {
-      long n1=lnumber_value(eval(CAR(arg_list)));
-      long n2=lnumber_value(eval(CAR(CDR(arg_list))));
+      long n1=lnumber_value(CAR(arg_list)->Eval());
+      long n2=lnumber_value(CAR(CDR(arg_list))->Eval());
       if (n1>n2) ret=true_symbol; else ret=NULL;
     }
@@ -2263 +2270 @@
     case SYS_FUNC_LT:
     {
-      long n1=lnumber_value(eval(CAR(arg_list)));
-      long n2=lnumber_value(eval(CAR(CDR(arg_list))));
+      long n1=lnumber_value(CAR(arg_list)->Eval());
+      long n2=lnumber_value(CAR(CDR(arg_list))->Eval());
       if (n1<n2) ret=true_symbol; else ret=NULL;
     }
@@ -2270 +2277 @@
     case SYS_FUNC_GE:
     {
-      long n1=lnumber_value(eval(CAR(arg_list)));
-      long n2=lnumber_value(eval(CAR(CDR(arg_list))));
+      long n1=lnumber_value(CAR(arg_list)->Eval());
+      long n2=lnumber_value(CAR(CDR(arg_list))->Eval());
       if (n1>=n2) ret=true_symbol; else ret=NULL;
     }
@@ -2277 +2284 @@
     case SYS_FUNC_LE:
     {
-      long n1=lnumber_value(eval(CAR(arg_list)));
-      long n2=lnumber_value(eval(CAR(CDR(arg_list))));
+      long n1=lnumber_value(CAR(arg_list)->Eval());
+      long n2=lnumber_value(CAR(CDR(arg_list))->Eval());
       if (n1<=n2) ret=true_symbol; else ret=NULL;
     }
@@ -2293 +2300 @@
     case SYS_FUNC_SYMBOL_NAME:
       void *symb;
-      symb=eval(CAR(arg_list));
+      symb = CAR(arg_list)->Eval();
 #ifdef TYPE_CHECKING
       if (item_type(symb)!=L_SYMBOL)
@@ -2307 +2314 @@
       trace_level++;
       if (arg_list)
-        trace_print_level=lnumber_value(eval(CAR(arg_list)));
+        trace_print_level=lnumber_value(CAR(arg_list)->Eval());
       ret=true_symbol;
     break;
@@ -2320 +2327 @@
     {
       char tmp[50], *tp;
-      long num=lnumber_value(eval(CAR(arg_list)));
-      long dig=lnumber_value(eval(CAR(CDR(arg_list))));
+      long num=lnumber_value(CAR(arg_list)->Eval());
+      long dig=lnumber_value(CAR(CDR(arg_list))->Eval());
       tp=tmp+49;
       *(tp--)=0;
@@ -2340 +2347 @@
     case SYS_FUNC_COMPILE_FILE:
     {
-            void *fn = eval( CAR( arg_list ) );
+            void *fn = CAR(arg_list)->Eval();
             char *st = lstring_value( fn );
             PtrRef r1( fn );
@@ -2393 +2400 @@
                 crc_manager.get_filenumber(st);               // make sure this file gets crc'ed
             #endif
-                void *compiled_form=NULL;
+                LObject *compiled_form = NULL;
                 PtrRef r11(compiled_form);
                 while (!end_of_program(cs))  // see if there is anything left to compile and run
@@ -2401 +2408 @@
             #endif
                   void *m=mark_heap(TMP_SPACE);
-                  compiled_form=compile(cs);
-                  eval(compiled_form);
+                  compiled_form=LObject::Compile(cs);
+                  compiled_form->Eval();
                   compiled_form=NULL;
                   restore_heap(m, TMP_SPACE);
@@ -2415 +2422 @@
     } break;
     case SYS_FUNC_ABS:
-      ret = LNumber::Create(abs(lnumber_value(eval(CAR(arg_list))))); break;
+      ret = LNumber::Create(abs(lnumber_value(CAR(arg_list)->Eval()))); break;
     case SYS_FUNC_MIN:
     {
-      int x=lnumber_value(eval(CAR(arg_list))), y=lnumber_value(eval(CAR(CDR(arg_list))));
+      int x=lnumber_value(CAR(arg_list)->Eval()),
+          y=lnumber_value(CAR(CDR(arg_list))->Eval());
       ret = LNumber::Create(x < y ? x : y);
     } break;
     case SYS_FUNC_MAX:
     {
-      int x=lnumber_value(eval(CAR(arg_list))), y=lnumber_value(eval(CAR(CDR(arg_list))));
+      int x=lnumber_value(CAR(arg_list)->Eval()),
+          y=lnumber_value(CAR(CDR(arg_list))->Eval());
       ret = LNumber::Create(x > y ? x : y);
     } break;
@@ -2439 +2448 @@
     case SYS_FUNC_NTH:
     {
-      long x=lnumber_value(eval(CAR(arg_list)));
-      ret=nth(x, eval(CAR(CDR(arg_list))));
+      long x=lnumber_value(CAR(arg_list)->Eval());
+      ret=nth(x, CAR(CDR(arg_list))->Eval());
     } break;
     case SYS_FUNC_RESIZE_TMP:
-        resize_tmp(lnumber_value(eval(CAR(arg_list)))); break;
+        resize_tmp(lnumber_value(CAR(arg_list)->Eval())); break;
     case SYS_FUNC_RESIZE_PERM:
-        resize_perm(lnumber_value(eval(CAR(arg_list)))); break;
+        resize_perm(lnumber_value(CAR(arg_list)->Eval())); break;
     case SYS_FUNC_COS:
-        ret = LFixedPoint::Create(lisp_cos(lnumber_value(eval(CAR(arg_list))))); break;
+        ret = LFixedPoint::Create(lisp_cos(lnumber_value(CAR(arg_list)->Eval()))); break;
     case SYS_FUNC_SIN:
-        ret = LFixedPoint::Create(lisp_sin(lnumber_value(eval(CAR(arg_list))))); break;
+        ret = LFixedPoint::Create(lisp_sin(lnumber_value(CAR(arg_list)->Eval()))); break;
     case SYS_FUNC_ATAN2:
     {
-      long y=(lnumber_value(eval(CAR(arg_list))));   arg_list=CDR(arg_list);
-      long x=(lnumber_value(eval(CAR(arg_list))));
+      long y=(lnumber_value(CAR(arg_list)->Eval()));   arg_list=CDR(arg_list);
+      long x=(lnumber_value(CAR(arg_list)->Eval()));
       ret = LNumber::Create(lisp_atan2(y, x));
     } break;
@@ -2463 +2472 @@
       while (arg_list)
       {
-    void *sym=eval(CAR(arg_list));
+    void *sym = CAR(arg_list)->Eval();
     PtrRef r1(sym);
     switch (item_type(sym))
@@ -2471 +2480 @@
       case L_CONS_CELL :
       {
-        void *s=eval(CAR(sym));
+        void *s = CAR(sym)->Eval();
         PtrRef r1(s);
 #ifdef TYPE_CHECKING
@@ -2481 +2490 @@
         }
 #endif
-        x=lnumber_value(eval(CAR(CDR(sym))));
+        x=lnumber_value(CAR(CDR(sym))->Eval());
         ((LSymbol *)sym)->value = LNumber::Create(x);
       } break;
@@ -2502 +2511 @@
     case SYS_FUNC_EVAL:
     {
-      ret=eval(eval(CAR(arg_list)));
+      ret = CAR(arg_list)->Eval()->Eval();
     } break;
     case SYS_FUNC_BREAK: lbreak("User break"); break;
     case SYS_FUNC_MOD:
     {
-      long x=lnumber_value(eval(CAR(arg_list))); arg_list=CDR(arg_list);
-      long y=lnumber_value(eval(CAR(arg_list)));
+      long x=lnumber_value(CAR(arg_list)->Eval()); arg_list=CDR(arg_list);
+      long y=lnumber_value(CAR(arg_list)->Eval());
       if (y==0) { lbreak("mod : division by zero\n"); y=1; }
       ret = LNumber::Create(x%y);
@@ -2514 +2523 @@
 /*    case SYS_FUNC_WRITE_PROFILE:
     {
-      char *fn=lstring_value(eval(CAR(arg_list)));
+      char *fn=lstring_value(CAR(arg_list)->Eval());
       FILE *fp=fopen(fn, "wb");
       if (!fp)
@@ -2538 +2547 @@
       arg_list=CDR(arg_list);
 
-      void *ilist=eval(CAR(arg_list)); arg_list=CDR(arg_list);
+      void *ilist = CAR(arg_list)->Eval(); arg_list=CDR(arg_list);
       PtrRef r2(ilist);
 
@@ -2552 +2561 @@
                 bind_var->SetValue((LObject *)CAR(ilist));
                 for (block=arg_list; block; block=CDR(block))
-                  ret=eval(CAR(block));
+                  ret = CAR(block)->Eval();
                 ilist=CDR(ilist);
       }
@@ -2561 +2570 @@
     {
       bFILE *old_file=current_print_file;
-      void *str1=eval(CAR(arg_list));
+      void *str1 = CAR(arg_list)->Eval();
       PtrRef r1(str1);
-      void *str2=eval(CAR(CDR(arg_list)));
+      void *str2 = CAR(CDR(arg_list))->Eval();
 
 
@@ -2573 +2582 @@
                 while (arg_list)
                 {
-                  ret=eval(CAR(arg_list));
+                  ret = CAR(arg_list)->Eval();
                   arg_list=CDR(arg_list);
                 }
@@ -2583 +2592 @@
     case SYS_FUNC_BIT_AND:
     {
-      long first=lnumber_value(eval(CAR(arg_list))); arg_list=CDR(arg_list);
+      long first=lnumber_value(CAR(arg_list)->Eval()); arg_list=CDR(arg_list);
       while (arg_list)
       {
-        first&=lnumber_value(eval(CAR(arg_list)));
+        first&=lnumber_value(CAR(arg_list)->Eval());
                 arg_list=CDR(arg_list);
       }
@@ -2593 +2602 @@
     case SYS_FUNC_BIT_OR:
     {
-      long first=lnumber_value(eval(CAR(arg_list))); arg_list=CDR(arg_list);
+      long first=lnumber_value(CAR(arg_list)->Eval()); arg_list=CDR(arg_list);
       while (arg_list)
       {
-        first|=lnumber_value(eval(CAR(arg_list)));
+        first|=lnumber_value(CAR(arg_list)->Eval());
                 arg_list=CDR(arg_list);
       }
@@ -2603 +2612 @@
     case SYS_FUNC_BIT_XOR:
     {
-      long first=lnumber_value(eval(CAR(arg_list))); arg_list=CDR(arg_list);
+      long first=lnumber_value(CAR(arg_list)->Eval()); arg_list=CDR(arg_list);
       while (arg_list)
       {
-        first^=lnumber_value(eval(CAR(arg_list)));
+        first^=lnumber_value(CAR(arg_list)->Eval());
                 arg_list=CDR(arg_list);
       }
@@ -2613 +2622 @@
     case SYS_FUNC_MAKE_ARRAY:
     {
-      long l=lnumber_value(eval(CAR(arg_list)));
+      long l=lnumber_value(CAR(arg_list)->Eval());
       if (l>=2<<16 || l<=0)
       {
@@ -2623 +2632 @@
     case SYS_FUNC_AREF:
     {
-      long x=lnumber_value(eval(CAR(CDR(arg_list))));
-      ret = ((LArray *)eval(CAR(arg_list)))->Get(x);
+      long x=lnumber_value(CAR(CDR(arg_list))->Eval());
+      ret = ((LArray *)CAR(arg_list)->Eval())->Get(x);
     } break;
     case SYS_FUNC_IF_1PROGN:
     {
-      if (eval(CAR(arg_list)))
+      if (CAR(arg_list)->Eval())
         ret=eval_block(CAR(CDR(arg_list)));
-      else ret=eval(CAR(CDR(CDR(arg_list))));
+      else ret = CAR(CDR(CDR(arg_list)))->Eval();
 
     } break;
     case SYS_FUNC_IF_2PROGN:
     {
-      if (eval(CAR(arg_list)))
-        ret=eval(CAR(CDR(arg_list)));
+      if (CAR(arg_list)->Eval())
+        ret = CAR(CDR(arg_list))->Eval();
       else ret=eval_block(CAR(CDR(CDR(arg_list))));
 
@@ -2642 +2651 @@
     case SYS_FUNC_IF_12PROGN:
     {
-      if (eval(CAR(arg_list)))
+      if (CAR(arg_list)->Eval())
         ret=eval_block(CAR(CDR(arg_list)));
       else ret=eval_block(CAR(CDR(CDR(arg_list))));
@@ -2649 +2658 @@
     case SYS_FUNC_EQ0:
     {
-      void *v=eval(CAR(arg_list));
+      void *v = CAR(arg_list)->Eval();
       if (item_type(v)!=L_NUMBER || (((LNumber *)v)->num!=0))
         ret=NULL;
@@ -2657 +2666 @@
     {
 #ifdef L_PROFILE
-      char *s=lstring_value(eval(CAR(arg_list)));
+      char *s=lstring_value(CAR(arg_list)->Eval());
       preport(s);
 #endif
@@ -2663 +2672 @@
     case SYS_FUNC_SEARCH:
     {
-      void *arg1=eval(CAR(arg_list)); arg_list=CDR(arg_list);
+      void *arg1 = CAR(arg_list)->Eval(); arg_list=CDR(arg_list);
       PtrRef r1(arg1);       // protect this refrence
-      char *haystack=lstring_value(eval(CAR(arg_list)));
+      char *haystack=lstring_value(CAR(arg_list)->Eval());
       char *needle=lstring_value(arg1);
 
@@ -2675 +2684 @@
     case SYS_FUNC_ELT:
     {
-      void *arg1=eval(CAR(arg_list)); arg_list=CDR(arg_list);
+      void *arg1 = CAR(arg_list)->Eval(); arg_list=CDR(arg_list);
       PtrRef r1(arg1);       // protect this refrence
-      long x=lnumber_value(eval(CAR(arg_list)));
+      long x=lnumber_value(CAR(arg_list)->Eval());
       char *st=lstring_value(arg1);
       if (x < 0 || (unsigned)x >= strlen(st))
@@ -2686 +2695 @@
     case SYS_FUNC_LISTP:
     {
-      return item_type(eval(CAR(arg_list)))==L_CONS_CELL ? true_symbol : NULL;
+      return item_type(CAR(arg_list)->Eval())==L_CONS_CELL ? true_symbol : NULL;
     } break;
     case SYS_FUNC_NUMBERP:
     {
-      int t=item_type(eval(CAR(arg_list)));
+      int t=item_type(CAR(arg_list)->Eval());
       if (t==L_NUMBER || t==L_FIXED_POINT) return true_symbol; else return NULL;
     } break;
@@ -2713 +2722 @@
       // push all of the init forms, so we can set the symbol
       for (init_var=CAR(arg_list); init_var; init_var=CDR(init_var))
-                l_user_stack.push(eval(CAR(CDR(CAR((init_var))))));
+                l_user_stack.push(CAR(CDR(CAR((init_var))))->Eval());
 
       // now set all the symbols
@@ -2725 +2734 @@
       do
       {
-                i=(eval(CAR(CAR(CDR(arg_list))))!=NULL);
+                i = CAR(CAR(CDR(arg_list)))->Eval() != NULL;
                 if (!i)
                 {
                   eval_block(CDR(CDR(arg_list)));
                   for (init_var=CAR(arg_list); init_var; init_var=CDR(init_var))
-                    eval(CAR(CDR(CDR(CAR(init_var)))));
+                    CAR(CDR(CDR(CAR(init_var))))->Eval();
                 }
       } while (!i);
 
-      ret=eval(CAR(CDR(CAR(CDR(arg_list)))));
+      ret = CAR(CDR(CAR(CDR(arg_list))))->Eval();
 
       // restore old values for symbols
@@ -2753 +2762 @@
     case SYS_FUNC_SCHAR:
     {
-      char *s=lstring_value(eval(CAR(arg_list)));      arg_list=CDR(arg_list);
-      long x=lnumber_value(eval(CAR(arg_list)));
+      char *s=lstring_value(CAR(arg_list)->Eval());
+      arg_list=CDR(arg_list);
+      long x=lnumber_value(CAR(arg_list)->Eval());
 
       if ((unsigned)x >= strlen(s))
@@ -2763 +2773 @@
     } break;
     case SYS_FUNC_SYMBOLP:
-    { if (item_type(eval(CAR(arg_list)))==L_SYMBOL) return true_symbol;
+    { if (item_type(CAR(arg_list)->Eval())==L_SYMBOL) return true_symbol;
       else return NULL; } break;
     case SYS_FUNC_NUM2STR:
     {
       char str[20];
-      sprintf(str, "%ld", (long int)lnumber_value(eval(CAR(arg_list))));
+      sprintf(str, "%ld", (long int)lnumber_value(CAR(arg_list)->Eval()));
       ret=LString::Create(str);
     } break;
     case SYS_FUNC_NCONC:
     {
-      void *l1=eval(CAR(arg_list)); arg_list=CDR(arg_list);
+      void *l1=CAR(arg_list)->Eval(); arg_list=CDR(arg_list);
       PtrRef r1(l1);
       void *first=l1, *next;
@@ -2780 +2790 @@
       if (!l1)
       {
-                l1=first=eval(CAR(arg_list));
+                l1=first=CAR(arg_list)->Eval();
                 arg_list=CDR(arg_list);
       }
@@ -2790 +2800 @@
                 next=l1;
                 while (next) { l1=next; next=lcdr(next); }
-                ((LList *)l1)->cdr = (LObject *)eval(CAR(arg_list));
+                ((LList *)l1)->cdr = CAR(arg_list)->Eval();
                 arg_list=CDR(arg_list);
       } while (arg_list);
@@ -2796 +2806 @@
     } break;
     case SYS_FUNC_FIRST:
-    { ret=CAR(eval(CAR(arg_list))); } break;
+    { ret=CAR(CAR(arg_list)->Eval()); } break;
     case SYS_FUNC_SECOND:
-    { ret=CAR(CDR(eval(CAR(arg_list)))); } break;
+    { ret=CAR(CDR(CAR(arg_list)->Eval())); } break;
     case SYS_FUNC_THIRD:
-    { ret=CAR(CDR(CDR(eval(CAR(arg_list))))); } break;
+    { ret=CAR(CDR(CDR(CAR(arg_list)->Eval()))); } break;
     case SYS_FUNC_FOURTH:
-    { ret=CAR(CDR(CDR(CDR(eval(CAR(arg_list)))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CAR(arg_list)->Eval())))); } break;
     case SYS_FUNC_FIFTH:
-    { ret=CAR(CDR(CDR(CDR(CDR(eval(CAR(arg_list))))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CDR(CAR(arg_list)->Eval()))))); } break;
     case SYS_FUNC_SIXTH:
-    { ret=CAR(CDR(CDR(CDR(CDR(CDR(eval(CAR(arg_list)))))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CAR(arg_list)->Eval())))))); } break;
     case SYS_FUNC_SEVENTH:
-    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(eval(CAR(arg_list))))))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CAR(arg_list)->Eval()))))))); } break;
     case SYS_FUNC_EIGHTH:
-    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(eval(CAR(arg_list)))))))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CAR(arg_list)->Eval())))))))); } break;
     case SYS_FUNC_NINTH:
-    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(eval(CAR(arg_list))))))))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CAR(arg_list)->Eval()))))))))); } break;
     case SYS_FUNC_TENTH:
-    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(eval(CAR(arg_list)))))))))))); } break;
+    { ret=CAR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CDR(CAR(arg_list)->Eval())))))))))); } break;
     case SYS_FUNC_SUBSTR:
     {
-      long x1=lnumber_value(eval(CAR(arg_list))); arg_list=CDR(arg_list);
-      long x2=lnumber_value(eval(CAR(arg_list))); arg_list=CDR(arg_list);
-      void *st=eval(CAR(arg_list));
+      long x1=lnumber_value(CAR(arg_list)->Eval()); arg_list=CDR(arg_list);
+      long x2=lnumber_value(CAR(arg_list)->Eval()); arg_list=CDR(arg_list);
+      void *st=CAR(arg_list)->Eval();
       PtrRef r1(st);
 
@@ -2838 +2848 @@
       while (arg_list)
       {
-        void *q=eval(CAR(arg_list));
+        void *q = CAR(arg_list)->Eval();
         if (!rstart) rstart=q;
         while (r && CDR(r)) r=CDR(r);
@@ -2933 +2943 @@
       if (!arg_list)
       { ((LObject *)sym)->Print(); lbreak("too few parameter to function\n"); exit(0); }
-      l_user_stack.push(eval(CAR(arg_list)));
+      l_user_stack.push(CAR(arg_list)->Eval());
       f_arg=CDR(f_arg);
       arg_list=CDR(arg_list);
@@ -2955 +2965 @@
   while (block_list)
   {
-    ret=eval(CAR(block_list));
+    ret=CAR(block_list)->Eval();
     block_list=CDR(block_list);
   }
@@ -2974 +2984 @@
 }
 
-
-
-
-
-void *eval(void *prog)
-{
-
-
-  void *ret=NULL;
-  PtrRef ref1(prog);
-
-
-  int tstart=trace_level;
-
-  if (trace_level)
-  {
-    if (trace_level<=trace_print_level)
-    {
-      dprintf("%d (%d, %d, %d) TRACE : ", trace_level,
-          space_size[PERM_SPACE]-((char *)free_space[PERM_SPACE]-(char *)space[PERM_SPACE]),
-          space_size[TMP_SPACE]-((char *)free_space[TMP_SPACE]-(char *)space[TMP_SPACE]),
-          PtrRef::stack.son);
-      ((LObject *)prog)->Print();
-
-      dprintf("\n");
-    }
-    trace_level++;
-  }
-  if (prog)
-  {
-    switch (item_type(prog))
-    {
-      case L_BAD_CELL :
-      { lbreak("error : eval on a bad cell\n"); exit(0); } break;
-      case L_CHARACTER :
-      case L_STRING :
-      case L_NUMBER :
-      case L_POINTER :
-      case L_FIXED_POINT :
-      { ret=prog; } break;
-      case L_SYMBOL :
-      { if (prog==true_symbol)
-                  ret=prog;
-        else
-                {
-                  ret = ((LSymbol *)prog)->GetValue();
-                  if (item_type(ret)==L_OBJECT_VAR)
-                    ret=l_obj_get(((LObjectVar *)ret)->index);
-                }
-      } break;
-      case L_CONS_CELL :
-      {
-        ret=eval_function((LSymbol *)CAR(prog), CDR(prog));
-      }
-      break;
-      default :
-        fprintf(stderr, "shouldn't happen\n");
-    }
-  }
-  if (tstart)
-  {
-    trace_level--;
-    if (trace_level<=trace_print_level)
-      dprintf("%d (%d, %d, %d) TRACE ==> ", trace_level,
-          space_size[PERM_SPACE]-((char *)free_space[PERM_SPACE]-(char *)space[PERM_SPACE]),
-          space_size[TMP_SPACE]-((char *)free_space[TMP_SPACE]-(char *)space[TMP_SPACE]),
-          PtrRef::stack.son);
-    ((LObject *)ret)->Print();
-    dprintf("\n");
-  }
+LObject *LObject::Eval()
+{
+    LObject *ret = NULL;
+    PtrRef ref1(this);
+
+    int tstart = trace_level;
+
+    if (trace_level)
+    {
+        if (trace_level <= trace_print_level)
+        {
+            dprintf("%d (%d, %d, %d) TRACE : ", trace_level,
+                    get_free_size(PERM_SPACE), get_free_size(TMP_SPACE),
+                    PtrRef::stack.son);
+            Print();
+            dprintf("\n");
+        }
+        trace_level++;
+    }
+
+    if (this)
+    {
+        switch (item_type(this))
+        {
+        case L_BAD_CELL:
+            lbreak("error: eval on a bad cell\n");
+            exit(0);
+            break;
+        case L_CHARACTER:
+        case L_STRING:
+        case L_NUMBER:
+        case L_POINTER:
+        case L_FIXED_POINT:
+            ret = this;
+            break;
+        case L_SYMBOL:
+            if (this == true_symbol)
+                ret = this;
+            else
+            {
+                ret = ((LSymbol *)this)->GetValue();
+                if (item_type(ret) == L_OBJECT_VAR)
+                    ret = (LObject *)l_obj_get(((LObjectVar *)ret)->index);
+            }
+            break;
+        case L_CONS_CELL:
+            ret = (LObject *)eval_function((LSymbol *)CAR(this), CDR(this));
+            break;
+        default :
+            fprintf(stderr, "shouldn't happen\n");
+            break;
+        }
+    }
+
+    if (tstart)
+    {
+        trace_level--;
+        if (trace_level <= trace_print_level)
+            dprintf("%d (%d, %d, %d) TRACE ==> ", trace_level,
+                    get_free_size(PERM_SPACE), get_free_size(TMP_SPACE),
+                    PtrRef::stack.son);
+        ret->Print();
+        dprintf("\n");
+    }
 
 /*  l_user_stack.push(ret);
@@ -3049 +3053 @@
   ret=l_user_stack.pop(1);  */
 
-
-  return ret;
+    return ret;
 }
 
@@ -3116 +3119 @@
     free(space[0]);
     free(space[1]);
-    ldelete_syms(LSymbol::root);
+    DeleteAllSymbols(LSymbol::root);
     LSymbol::root = NULL;
     LSymbol::count = 0;
@@ -3123 +3126 @@
 void clear_tmp()
 {
-  free_space[TMP_SPACE]=space[TMP_SPACE];
+    free_space[TMP_SPACE] = space[TMP_SPACE];
 }
 

abuse/trunk/src/lisp/lisp.h

@@ -48 +48 @@
 struct LObject
 {
+    /* Factories */
+    static LObject *Compile(char const *&s);
+
+    /* Methods */
+    LObject *Eval();
     void Print();
 
+    /* Members */
     ltype type;
 };
@@ -55 +61 @@
 struct LObjectVar : LObject
 {
+    /* Factories */
     static LObjectVar *Create(int index);
 
+    /* Members */
     int index;
 };
@@ -62 +70 @@
 struct LList : LObject
 {
+    /* Factories */
     static LList *Create();
 
+    /* Methods */
     size_t GetLength();
 
+    /* Members */
     LObject *cdr, *car;
 };
@@ -71 +82 @@
 struct LNumber : LObject
 {
+    /* Factories */
     static LNumber *Create(long num);
 
+    /* Members */
     long num;
 };
@@ -78 +91 @@
 struct LRedirect : LObject
 {
+    /* Members */
     LObject *ref;
 };
@@ -83 +97 @@
 struct LString : LObject
 {
+    /* Factories */
     static LString *Create(char const *string);
     static LString *Create(char const *string, int length);
     static LString *Create(int length);
 
+    /* Methods */
     char *GetString();
 
+    /* Members */
 private:
     char str[1]; /* Can be allocated much larger than 1 */
@@ -155 +172 @@
 struct LChar : LObject
 {
+    /* Factories */
     static LChar *Create(uint16_t ch);
 
+    /* Members */
     uint16_t ch;
 };
@@ -162 +181 @@
 struct LPointer : LObject
 {
+    /* Factories */
     static LPointer *Create(void *addr);
 
+    /* Members */
     void *addr;
 };
@@ -169 +190 @@
 struct LFixedPoint : LObject
 {
+    /* Factories */
     static LFixedPoint *Create(int32_t x);
 
+    /* Members */
     int32_t x;
 };
@@ -186 +209 @@
 long lfixed_point_value(void *c);
 void *lisp_atom(void *i);
-void *lcdr(void *c);
-void *lcar(void *c);
+LObject *lcdr(void *c);
+LObject *lcar(void *c);
 void *lisp_eq(void *n1, void *n2);
 void *lisp_equal(void *n1, void *n2);
-void *eval(void *prog);
 void *eval_block(void *list);
 void *eval_function(LSymbol *sym, void *arg_list);
 void *eval_user_fun(LSymbol *sym, void *arg_list);
-void *compile(char const *&s);
 void *assoc(void *item, void *list);
 void resize_tmp(int new_size);

abuse/trunk/src/lisp/lisp_gc.h

@@ -31 +31 @@
     }
 
+    template<typename T> inline PtrRef(T * const &ref)
+    {
+        stack.push((void **)&ref);
+    }
+
     inline ~PtrRef()
     {

abuse/trunk/src/loader2.cpp

@@ -344 +344 @@
 
   cs=prog;
-  if (!eval(compile(cs)))
+  if (!LObject::Compile(cs)->Eval())
   {
     printf("unable to open file '%s'\n",lsf);

abuse/trunk/src/menu.cpp

@@ -385 +385 @@
 //    char *prog="((\"art/help.spe\" . \"sell2\")(\"art/help.spe\" . \"sell4\")(\"art/help.spe\" . \"sell3\")(\"art/endgame.spe\" . \"credit\"))";
 //    char *prog="((\"art/endgame.spe\" . \"credit\") (\"art/help.spe\" . \"sell6\"))";
-    char const *prog="((\"art/endgame.spe\" . \"credit\"))";
-    ss->SetValue((LObject *)compile(prog));
+    char const *prog = "((\"art/endgame.spe\" . \"credit\"))";
+    ss->SetValue(LObject::Compile(prog));
     current_space=sp;
   }