Changeset 635 for abuse/trunk/src/objects.cppTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

lisp: refactor Lisp spaces so that they are real objects, and get rid
of the unused USER_SPACE.

File:

• abuse/trunk/src/objects.cpp (modified) (16 diffs)

abuse/trunk/src/objects.cpp

@@ -261 +261 @@
     current_object=this;
 
-    void *m=mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
     ((LSymbol *)ns)->EvalFunction(NULL);
-    restore_heap(m,TMP_SPACE);
+    LSpace::Tmp.Restore(m);
 
     current_object=o;
@@ -275 +275 @@
     {
         current_object = this;
-        void *m = mark_heap( TMP_SPACE );
+        void *m = LSpace::Tmp.Mark();
         ((LSymbol *)ns)->EvalFunction(NULL);
-        restore_heap( m, TMP_SPACE );
+        LSpace::Tmp.Restore(m);
     }
     else
@@ -410 +410 @@
 
     current_object=this;
-    void *m=mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
 
     time_marker *prof1=NULL;
@@ -424 +424 @@
     }
 
-    restore_heap(m,TMP_SPACE);
+    LSpace::Tmp.Restore(m);
 
     if (keep_ai_info())
@@ -484 +484 @@
     current_object = this;
 
-    void *m = mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
 
     am = LList::Create();
@@ -528 +528 @@
     }
 
-    restore_heap(m, TMP_SPACE);
+    LSpace::Tmp.Restore(m);
 
     current_object = o;
@@ -624 +624 @@
     current_object=this;
 
-    void *m=mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
     time_marker *prof1=NULL;
     if (profiling())
@@ -637 +637 @@
     }
 
-
-
-    restore_heap(m,TMP_SPACE);
+    LSpace::Tmp.Restore(m);
 
   } else drawer();
@@ -651 +649 @@
     current_object=this;
 
-    void *m=mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
     time_marker *prof1=NULL;
     if (profiling())
@@ -664 +662 @@
     }
 
-    restore_heap(m,TMP_SPACE);
-
+    LSpace::Tmp.Restore(m);
   }
 }
@@ -1157 +1154 @@
     current_object=g;
 
-    void *m=mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
 
     time_marker *prof1=NULL;
@@ -1171 +1168 @@
     }
 
-
-
-    restore_heap(m,TMP_SPACE);
-
-    current_object=o;
+    LSpace::Tmp.Restore(m);
+    current_object = o;
   }
   return g;
@@ -1222 +1216 @@
     lcy->cdr = lb;
 
-    void *m = mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
 
     time_marker *prof1 = NULL;
@@ -1236 +1230 @@
     }
 
-    restore_heap(m,TMP_SPACE);
+    LSpace::Tmp.Restore(m);
 
     if (item_type(r)!=L_NUMBER)
@@ -1626 +1620 @@
     current_object=this;
 
-    void *m=mark_heap(TMP_SPACE);
+    void *m = LSpace::Tmp.Mark();
 
     time_marker *prof1=NULL;
@@ -1640 +1634 @@
     }
 
-
-    restore_heap(m,TMP_SPACE);
-
-    current_object=o;
-  }
-}
+    LSpace::Tmp.Restore(m);
+    current_object = o;
+  }
+}