Changeset 486 for abuse/trunk/src/lispTweet

Timestamp:

Apr 17, 2011, 10:28:28 AM (12 years ago)

Author:

Sam Hocevar

Message:

lisp: implement LispNumber::Create.

Location:

abuse/trunk/src/lisp

Files:

• lisp.cpp (modified) (19 diffs)
• lisp.h (modified) (2 diffs)
• lisp_gc.cpp (modified) (1 diff)

abuse/trunk/src/lisp/lisp.cpp

@@ -442 +442 @@
 }
 
-LispNumber *new_lisp_number(long num)
-{
-  LispNumber *s=(LispNumber *)lmalloc(sizeof(LispNumber), current_space);
-  s->type=L_NUMBER;
-  s->num=num;
-  return s;
+LispNumber *LispNumber::Create(long num)
+{
+    LispNumber *s = (LispNumber *)lmalloc(sizeof(LispNumber), current_space);
+    s->type = L_NUMBER;
+    s->num = num;
+    return s;
 }
 
@@ -1212 +1212 @@
   else if (isdigit(n[0]) || (n[0]=='-' && isdigit(n[1])))
   {
-    LispNumber *num=new_lisp_number(0);
+    LispNumber *num = LispNumber::Create(0);
     sscanf(n, "%ld", &num->num);
     ret=num;
@@ -1525 +1525 @@
       }
       if(t == L_C_FUNCTION)
-        ret=new_lisp_number(c_caller( ((LispSysFunction *)fun)->fun_number, first));
+        ret = LispNumber::Create(c_caller( ((LispSysFunction *)fun)->fun_number, first));
       else if (c_caller( ((LispSysFunction *)fun)->fun_number, first))
         ret=true_symbol;
@@ -1812 +1812 @@
       switch (item_type(v))
       {
-        case L_STRING : ret=new_lisp_number(strlen(lstring_value(v))); break;
-        case L_CONS_CELL : ret=new_lisp_number(list_length(v)); break;
+        case L_STRING : ret = LispNumber::Create(strlen(lstring_value(v))); break;
+        case L_CONS_CELL : ret = LispNumber::Create(list_length(v)); break;
         default :
         { lprint(v);
@@ -1869 +1869 @@
     arg_list=CDR(arg_list);
       }
-      ret=new_lisp_number(sum);
+      ret = LispNumber::Create(sum);
     }
     break;
@@ -1896 +1896 @@
       if (arg_list) first=eval(CAR(arg_list));
     } while (arg_list);
-    ret=new_lisp_number(sum);
+    ret = LispNumber::Create(sum);
       }
     }
@@ -1920 +1920 @@
     arg_list=CDR(arg_list);
       }
-      ret=new_lisp_number(sum);
+      ret = LispNumber::Create(sum);
     }
     break;
@@ -1931 +1931 @@
     arg_list=CDR(arg_list);
       }
-      ret=new_lisp_number(x);
+      ret = LispNumber::Create(x);
     }
     break;
@@ -2183 +2183 @@
       {
         case L_CHARACTER :
-        { ret=new_lisp_number(((LispChar *)i)->ch); } break;
+        { ret = LispNumber::Create(((LispChar *)i)->ch); } break;
         case L_STRING :
-        {  ret=new_lisp_number(*lstring_value(i)); } break;
+        {  ret = LispNumber::Create(*lstring_value(i)); } break;
         default :
         {
@@ -2412 +2412 @@
     } break;
     case SYS_FUNC_ABS:
-      ret=new_lisp_number(abs(lnumber_value(eval(CAR(arg_list))))); break;
+      ret = LispNumber::Create(abs(lnumber_value(eval(CAR(arg_list))))); break;
     case SYS_FUNC_MIN:
     {
       int x=lnumber_value(eval(CAR(arg_list))), y=lnumber_value(eval(CAR(CDR(arg_list))));
-      if (x<y) ret=new_lisp_number(x); else ret=new_lisp_number(y);
+      ret = LispNumber::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))));
-      if (x>y) ret=new_lisp_number(x); else ret=new_lisp_number(y);
+      ret = LispNumber::Create(x > y ? x : y);
     } break;
     case SYS_FUNC_BACKQUOTE:
@@ -2451 +2451 @@
       long y=(lnumber_value(eval(CAR(arg_list))));   arg_list=CDR(arg_list);
       long x=(lnumber_value(eval(CAR(arg_list))));
-      ret=new_lisp_number(lisp_atan2(y, x));
+      ret = LispNumber::Create(lisp_atan2(y, x));
     } break;
     case SYS_FUNC_ENUM:
@@ -2465 +2465 @@
     {
       case L_SYMBOL :
-      { ((LispSymbol *)sym)->value=new_lisp_number(x); } break;
+      { ((LispSymbol *)sym)->value = LispNumber::Create(x); } break;
       case L_CONS_CELL :
       {
@@ -2478 +2478 @@
 #endif
         x=lnumber_value(eval(CAR(CDR(sym))));
-        ((LispSymbol *)sym)->value=new_lisp_number(x);
+        ((LispSymbol *)sym)->value = LispNumber::Create(x);
       } break;
       default :
@@ -2506 +2506 @@
       long y=lnumber_value(eval(CAR(arg_list)));
       if (y==0) { lbreak("mod : division by zero\n"); y=1; }
-      ret=new_lisp_number(x%y);
+      ret = LispNumber::Create(x%y);
     } break;
 /*    case SYS_FUNC_WRITE_PROFILE:
@@ -2585 +2585 @@
                 arg_list=CDR(arg_list);
       }
-      ret=new_lisp_number(first);
+      ret = LispNumber::Create(first);
     } break;
     case SYS_FUNC_BIT_OR:
@@ -2595 +2595 @@
                 arg_list=CDR(arg_list);
       }
-      ret=new_lisp_number(first);
+      ret = LispNumber::Create(first);
     } break;
     case SYS_FUNC_BIT_XOR:
@@ -2605 +2605 @@
                 arg_list=CDR(arg_list);
       }
-      ret=new_lisp_number(first);
+      ret = LispNumber::Create(first);
     } break;
     case SYS_FUNC_MAKE_ARRAY:
@@ -2666 +2666 @@
       char *find=strstr(haystack, needle);
       if (find)
-        ret=new_lisp_number(find-haystack);
+        ret = LispNumber::Create(find-haystack);
       else ret=NULL;
     } break;
@@ -3153 +3153 @@
         ((LispNumber *)value)->num = num;
     else
-        value = new_lisp_number(num);
+        value = LispNumber::Create(num);
 }
 

abuse/trunk/src/lisp/lisp.h

@@ -63 +63 @@
 struct LispNumber : LispObject
 {
+    static LispNumber *Create(long num);
+
     long num;
 };
@@ -180 +182 @@
 
 
-LispNumber *new_lisp_number(long num);
 LispPointer *new_lisp_pointer(void *addr);
 LispChar *new_lisp_character(uint16_t ch);

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -135 +135 @@
         break;
       case L_NUMBER:
-        ret = new_lisp_number(((LispNumber *)x)->num);
+        ret = LispNumber::Create(((LispNumber *)x)->num);
         break;
       case L_SYS_FUNCTION: