Changeset 636 for abuse/trunk/src/lisp/lisp_gc.cppTweet

Timestamp:

May 11, 2011, 1:26:15 AM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: merge the Lisp and LispGC classes and improve coding style.

File:

• abuse/trunk/src/lisp/lisp_gc.cpp (modified) (10 diffs)

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -41 +41 @@
 static uint8_t *cstart, *cend, *collected_start, *collected_end;
 
-LArray *LispGC::CollectArray(LArray *x)
-{
-    size_t s = x->len;
+LArray *Lisp::CollectArray(LArray *x)
+{
+    size_t s = x->m_len;
     LArray *a = LArray::Create(s, NULL);
     LObject **src = x->GetData();
@@ -53 +53 @@
 }
 
-LList *LispGC::CollectList(LList *x)
+LList *Lisp::CollectList(LList *x)
 {
     LList *prev = NULL, *first = NULL;
@@ -60 +60 @@
     {
         LList *p = LList::Create();
-        LObject *old_car = x->car;
+        LObject *old_car = x->m_car;
         LObject *old_x = x;
         x = (LList *)CDR(x);
-        ((LRedirect *)old_x)->type = L_COLLECTED_OBJECT;
-        ((LRedirect *)old_x)->ref = p;
-
-        p->car = CollectObject(old_car);
+        ((LRedirect *)old_x)->m_type = L_COLLECTED_OBJECT;
+        ((LRedirect *)old_x)->m_ref = p;
+
+        p->m_car = CollectObject(old_car);
 
         if (prev)
-            prev->cdr = p;
+            prev->m_cdr = p;
         else
             first = p;
@@ -75 +75 @@
     }
     if (x)
-        prev->cdr = CollectObject(x);
+        prev->m_cdr = CollectObject(x);
 
     return first; // we already set the collection pointers
 }
 
-LObject *LispGC::CollectObject(LObject *x)
+LObject *Lisp::CollectObject(LObject *x)
 {
     LObject *ret = x;
@@ -92 +92 @@
             break;
         case L_NUMBER:
-            ret = LNumber::Create(((LNumber *)x)->num);
+            ret = LNumber::Create(((LNumber *)x)->m_num);
             break;
         case L_SYS_FUNCTION:
@@ -111 +111 @@
             break;
         case L_CHARACTER:
-            ret = LChar::Create(lcharacter_value(x));
+            ret = LChar::Create(((LChar *)x)->m_ch);
             break;
         case L_C_FUNCTION:
@@ -141 +141 @@
             break;
         case L_OBJECT_VAR:
-            ret = LObjectVar::Create(((LObjectVar *)x)->index);
+            ret = LObjectVar::Create(((LObjectVar *)x)->m_index);
             break;
         case L_COLLECTED_OBJECT:
-            ret = ((LRedirect *)x)->ref;
+            ret = ((LRedirect *)x)->m_ref;
             break;
         default:
@@ -150 +150 @@
             break;
         }
-        ((LRedirect *)x)->type = L_COLLECTED_OBJECT;
-        ((LRedirect *)x)->ref = ret;
+        ((LRedirect *)x)->m_type = L_COLLECTED_OBJECT;
+        ((LRedirect *)x)->m_ref = ret;
     }
     else if ((uint8_t *)x < collected_start || (uint8_t *)x >= collected_end)
@@ -172 +172 @@
 }
 
-void LispGC::CollectSymbols(LSymbol *root)
+void Lisp::CollectSymbols(LSymbol *root)
 {
     if (!root)
         return;
 
-    root->value = CollectObject(root->value);
-    root->function = CollectObject(root->function);
-    root->name = (LString *)CollectObject(root->name);
-    CollectSymbols(root->left);
-    CollectSymbols(root->right);
-}
-
-void LispGC::CollectStacks()
+    root->m_value = CollectObject(root->m_value);
+    root->m_function = CollectObject(root->m_function);
+    root->m_name = (LString *)CollectObject(root->m_name);
+    CollectSymbols(root->m_left);
+    CollectSymbols(root->m_right);
+}
+
+void Lisp::CollectStacks()
 {
     void **d = l_user_stack.sdata;
@@ -205 +205 @@
 }
 
-void LispGC::CollectSpace(LSpace *which_space, int grow)
+void Lisp::CollectSpace(LSpace *which_space, int grow)
 {
     LSpace *old_space = LSpace::Current;