Changeset 563Tweet

Timestamp:

Apr 30, 2011, 12:49:15 AM (12 years ago)

Author:

Sam Hocevar

Message:

lisp: minor refactoring.

File:

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

abuse/trunk/src/lisp/lisp.cpp

@@ -280 +280 @@
 LFixedPoint *LFixedPoint::Create(int32_t x)
 {
-    size_t size = sizeof(LFixedPoint);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LFixedPoint), sizeof(LRedirect));
 
     LFixedPoint *p = (LFixedPoint *)lmalloc(size, current_space);
@@ -292 +290 @@
 LObjectVar *LObjectVar::Create(int index)
 {
-    size_t size = sizeof(LObjectVar);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LObjectVar), sizeof(LRedirect));
 
     LObjectVar *p = (LObjectVar *)lmalloc(size, current_space);
@@ -306 +302 @@
     if (addr == NULL)
         return NULL;
-    size_t size = sizeof(LPointer);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LPointer), sizeof(LRedirect));
 
     LPointer *p = (LPointer *)lmalloc(size, current_space);
@@ -318 +312 @@
 LChar *LChar::Create(uint16_t ch)
 {
-    size_t size = sizeof(LChar);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LChar), sizeof(LRedirect));
 
     LChar *c = (LChar *)lmalloc(size, current_space);
@@ -345 +337 @@
 struct LString *LString::Create(int length)
 {
-    size_t size = sizeof(LString) + length - 1;
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LString) + length - 1, sizeof(LRedirect));
 
     LString *s = (LString *)lmalloc(size, current_space);
@@ -359 +349 @@
     PtrRef r1(arg_list), r2(block_list);
 
-    size_t size = sizeof(LUserFunction);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LUserFunction), sizeof(LRedirect));
 
     LUserFunction *lu = (LUserFunction *)lmalloc(size, current_space);
@@ -372 +360 @@
 LSysFunction *new_lisp_sys_function(int min_args, int max_args, int fun_number)
 {
-    size_t size = sizeof(LSysFunction);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LSysFunction), sizeof(LRedirect));
 
     // System functions should reside in permanant space
@@ -409 +395 @@
 LSymbol *new_lisp_symbol(char *name)
 {
-    size_t size = sizeof(LSymbol);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LSymbol), sizeof(LRedirect));
 
     LSymbol *s = (LSymbol *)lmalloc(size, current_space);
+    PtrRef ref(s);
+
     s->type = L_SYMBOL;
     s->name = LString::Create(name);
@@ -426 +412 @@
 LNumber *LNumber::Create(long num)
 {
-    size_t size = sizeof(LNumber);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LNumber), sizeof(LRedirect));
 
     LNumber *n = (LNumber *)lmalloc(size, current_space);
@@ -438 +422 @@
 LList *LList::Create()
 {
-    size_t size = sizeof(LList);
-    if (size < sizeof(LRedirect))
-        size = sizeof(LRedirect);
+    size_t size = Max(sizeof(LList), sizeof(LRedirect));
 
     LList *c = (LList *)lmalloc(size, current_space);