Changeset 499Tweet

Timestamp:

Apr 17, 2011, 11:57:07 PM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: implement LSymbol::EvalUserFunction? and ensure all local pointers
are protected against collection.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (1 diff)
• lisp/lisp.cpp (modified) (8 diffs)
• lisp/lisp.h (modified) (2 diffs)
• objects.cpp (modified) (2 diffs)
• view.cpp (modified) (1 diff)

abuse/trunk/src/ant.cpp

@@ -119 +119 @@
     push_onto_list(LNumber::Create(o->aitype()),call_list);
     push_onto_list(LPointer::Create(o),call_list);
-    eval_user_fun((LSymbol *)l_fire_object,call_list);
+    ((LSymbol *)l_fire_object)->EvalUserFunction((LList *)call_list);
     o->set_state((character_state)S_weapon_fire);
   }

abuse/trunk/src/lisp/lisp.cpp

@@ -1460 +1460 @@
         break;
     case L_USER_FUNCTION:
-        return (LObject *)eval_user_fun(this, arg_list);
+        return EvalUserFunction((LList *)arg_list);
     default:
         Print();
@@ -1506 +1506 @@
         break;
     case L_USER_FUNCTION:
-        return (LObject *)eval_user_fun(this, arg_list);
+        return EvalUserFunction((LList *)arg_list);
     case L_C_FUNCTION:
     case L_C_BOOL:
@@ -2773 +2773 @@
         if (x < 0 || x >= (int32_t)strlen(st))
         {
-            lbreak("elt : out of range of string\n");
+            lbreak("elt: out of range of string\n");
             ret = NULL;
         }
@@ -2782 +2782 @@
     case SYS_FUNC_LISTP:
     {
-        ltype t = item_type(CAR(arg_list)->Eval());
+        LObject *tmp = CAR(arg_list)->Eval();
+        ltype t = item_type(tmp);
         ret = (t == L_CONS_CELL) ? true_symbol : NULL;
         break;
@@ -2788 +2789 @@
     case SYS_FUNC_NUMBERP:
     {
-        ltype t = item_type(CAR(arg_list)->Eval());
+        LObject *tmp = CAR(arg_list)->Eval();
+        ltype t = item_type(tmp);
         ret = (t == L_NUMBER || t == L_FIXED_POINT) ? true_symbol : NULL;
         break;
@@ -2796 +2798 @@
         LObject *init_var = CAR(arg_list);
         PtrRef r1(init_var);
-        int ustack_start = l_user_stack.son;      // restore stack at end
+        int ustack_start = l_user_stack.son; // restore stack at end
         LSymbol *sym = NULL;
         PtrRef r2(sym);
@@ -2868 +2870 @@
     }
     case SYS_FUNC_SYMBOLP:
-        if (item_type(CAR(arg_list)->Eval()) == L_SYMBOL)
-            ret = true_symbol;
-        break;
+    {
+        LObject *tmp = CAR(arg_list)->Eval();
+        ret = (item_type(tmp) == L_SYMBOL) ? true_symbol : NULL;
+        break;
+    }
     case SYS_FUNC_NUM2STR:
     {
@@ -2988 +2992 @@
 void tmp_space()
 {
-  current_space=TMP_SPACE;
+    current_space = TMP_SPACE;
 }
 
 void perm_space()
 {
-  current_space=PERM_SPACE;
+    current_space = PERM_SPACE;
 }
 
 void use_user_space(void *addr, long size)
 {
-  current_space = 2;
-  free_space[USER_SPACE] = space[USER_SPACE] = (uint8_t *)addr;
-  space_size[USER_SPACE] = size;
-}
-
-
-void *eval_user_fun(LSymbol *sym, void *arg_list)
-{
-  void *ret=NULL;
-  PtrRef ref1(ret);
+    current_space = 2;
+    free_space[USER_SPACE] = space[USER_SPACE] = (uint8_t *)addr;
+    space_size[USER_SPACE] = size;
+}
+
+/* PtrRef check: OK */
+LObject *LSymbol::EvalUserFunction(LList *arg_list)
+{
+    LObject *ret = NULL;
+    PtrRef ref1(ret);
 
 #ifdef TYPE_CHECKING
-  if (item_type(sym)!=L_SYMBOL)
-  {
-    ((LObject *)sym)->Print();
-    lbreak("EVAL : is not a function name (not symbol either)");
-    exit(0);
-  }
+    if (item_type(this) != L_SYMBOL)
+    {
+        Print();
+        lbreak("EVAL : is not a function name (not symbol either)");
+        exit(0);
+    }
 #endif
 #ifdef L_PROFILE
-  time_marker start;
-#endif
-
-
-  LUserFunction *fun=(LUserFunction *)(((LSymbol *)sym)->function);
+    time_marker start;
+#endif
+
+    LUserFunction *fun = (LUserFunction *)function;
 
 #ifdef TYPE_CHECKING
-  if (item_type(fun)!=L_USER_FUNCTION)
-  {
-    ((LObject *)sym)->Print();
-    lbreak("is not a user defined function\n");
-  }
+    if (item_type(fun) != L_USER_FUNCTION)
+    {
+        Print();
+        lbreak("is not a user defined function\n");
+    }
 #endif
 
 #ifndef NO_LIBS
-  void *fun_arg_list=cache.lblock(fun->alist);
-  void *block_list=cache.lblock(fun->blist);
-  PtrRef r9(block_list), r10(fun_arg_list);
+    void *fun_arg_list = cache.lblock(fun->alist);
+    void *block_list = cache.lblock(fun->blist);
+    PtrRef r9(block_list), r10(fun_arg_list);
 #else
-  void *fun_arg_list=fun->arg_list;
-  void *block_list=fun->block_list;
-  PtrRef r9(block_list), r10(fun_arg_list);
-#endif
-
-
-
-  // mark the start start, so we can restore when done
-  long stack_start=l_user_stack.son;
-
-  // first push all of the old symbol values
-  void *f_arg=fun_arg_list;
-  PtrRef r18(f_arg);
-  PtrRef r19(arg_list);
-  for (; f_arg; f_arg=CDR(f_arg))
-  {
-    LSymbol *s = (LSymbol *)CAR(f_arg);
-    l_user_stack.push(s->value);
-  }
-
-  // open block so that local vars aren't saved on the stack
-  {
-    int new_start=l_user_stack.son;
-    int i=new_start;
-    // now push all the values we wish to gather
-    for (f_arg=fun_arg_list; f_arg; )
-    {
-      if (!arg_list)
-      { sym->Print(); lbreak("too few parameter to function\n"); exit(0); }
-      l_user_stack.push(CAR(arg_list)->Eval());
-      f_arg=CDR(f_arg);
-      arg_list=CDR(arg_list);
-    }
-
-
-    // now store all the values and put them into the symbols
-    for (f_arg=fun_arg_list; f_arg; f_arg=CDR(f_arg))
-      ((LSymbol *)CAR(f_arg))->SetValue((LObject *)l_user_stack.sdata[i++]);
-
-    l_user_stack.son=new_start;
-  }
-
-
-
-  if (f_arg)
-  { sym->Print(); lbreak("too many parameter to function\n"); exit(0); }
-
-
-  // now evaluate the function block
-  while (block_list)
-  {
-    ret=CAR(block_list)->Eval();
-    block_list=CDR(block_list);
-  }
-
-  long cur_stack=stack_start;
-  for (f_arg=fun_arg_list; f_arg; f_arg=CDR(f_arg))
-    ((LSymbol *)CAR(f_arg))->SetValue((LObject *)l_user_stack.sdata[cur_stack++]);
-
-  l_user_stack.son=stack_start;
+    void *fun_arg_list = fun->arg_list;
+    void *block_list = fun->block_list;
+    PtrRef r9(block_list), r10(fun_arg_list);
+#endif
+
+    // mark the start start, so we can restore when done
+    long stack_start = l_user_stack.son;
+
+    // first push all of the old symbol values
+    LObject *f_arg = NULL;
+    PtrRef r18(f_arg);
+    PtrRef r19(arg_list);
+
+    for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+    {
+        LSymbol *s = (LSymbol *)CAR(f_arg);
+        l_user_stack.push(s->value);
+    }
+
+    // open block so that local vars aren't saved on the stack
+    {
+        int new_start = l_user_stack.son;
+        int i = new_start;
+        // now push all the values we wish to gather
+        for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+        {
+            if (!arg_list)
+            {
+                Print();
+                lbreak("too few parameter to function\n");
+                exit(0);
+            }
+            l_user_stack.push(CAR(arg_list)->Eval());
+            arg_list = (LList *)CDR(arg_list);
+        }
+
+        // now store all the values and put them into the symbols
+        for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+            ((LSymbol *)CAR(f_arg))->SetValue((LObject *)l_user_stack.sdata[i++]);
+
+        l_user_stack.son = new_start;
+    }
+
+    if (f_arg)
+    {
+        Print();
+        lbreak("too many parameter to function\n");
+        exit(0);
+    }
+
+    // now evaluate the function block
+    while (block_list)
+    {
+        ret = CAR(block_list)->Eval();
+        block_list = CDR(block_list);
+    }
+
+    long cur_stack = stack_start;
+    for (f_arg = (LObject *)fun_arg_list; f_arg; f_arg = CDR(f_arg))
+        ((LSymbol *)CAR(f_arg))->SetValue((LObject *)l_user_stack.sdata[cur_stack++]);
+
+    l_user_stack.son = stack_start;
 
 #ifdef L_PROFILE
-  time_marker end;
-  sym->time_taken += end.diff_time(&start);
-#endif
-
-
-  return ret;
+    time_marker end;
+    sym->time_taken += end.diff_time(&start);
+#endif
+
+    return ret;
 }
 

abuse/trunk/src/lisp/lisp.h

@@ -118 +118 @@
     /* Methods */
     LObject *EvalFunction(void *arg_list);
+    LObject *EvalUserFunction(LList *arg_list);
 
     LString *GetName();
@@ -220 +221 @@
 void *lisp_equal(void *n1, void *n2);
 void *eval_block(void *list);
-void *eval_user_fun(LSymbol *sym, void *arg_list);
 void *assoc(void *item, void *list);
 void resize_tmp(int new_size);

abuse/trunk/src/objects.cpp

@@ -524 +524 @@
       prof1 = new time_marker;
 
-    eval_user_fun((LSymbol *)d, am);
+    ((LSymbol *)d)->EvalUserFunction(am);
     if (profiling())
     {
@@ -1594 +1594 @@
         prof1=new time_marker;
 
-      eval_user_fun((LSymbol *)f,NULL);
+      ((LSymbol *)f)->EvalUserFunction(NULL);
 
       if (profiling())

abuse/trunk/src/view.cpp

@@ -884 +884 @@
       game_object *o=current_object;
       current_object=focus;
-      eval_user_fun((LSymbol *)figures[focus->otype]->get_fun(OFUN_CONSTRUCTOR),NULL);
+      ((LSymbol *)figures[focus->otype]->get_fun(OFUN_CONSTRUCTOR))->EvalUserFunction(NULL);
       current_object=o;
     }