Changeset 529

Timestamp:

02/04/09 22:01:44 (3 years ago)

Author:

mooneer

Message:

Applied patch to System.list to fix operators (credit: Michael Edgar)

File:

• interpreter/trunk/modules/System/list.c (modified) (4 diffs)

interpreter/trunk/modules/System/list.c

@@ -105 +105 @@
         return; \
     }
-
-KITE_CLASS_METHOD(List_add) {
+KITE_CLASS_METHOD(List_lshift) {
     kite_object_t *cur = this, *rhs;
     kite_object_t *secondhalf;
-    
+
     rhs = kite_list_object(thd, args);
     secondhalf = rhs->builtin_data.listvalue.car;
-    
+
     if (cur->builtin_data.listvalue.car == NULL) {
         cur->builtin_data.listvalue.car = kite_reference_object(secondhalf);
@@ -118 +117 @@
         kite_vm_return(thd, this);
     }
-    
+
     while(cur->builtin_data.listvalue.cdr != NULL) {
         cur = cur->builtin_data.listvalue.cdr;
     }
-    
+
     if (secondhalf->type == OBJ_LIST) {
         secondhalf = kite_reference_object(secondhalf);
@@ -130 +129 @@
             kite_reference_object(rhs->builtin_data.listvalue.car);
     }
-    
+
     cur->builtin_data.listvalue.cdr = secondhalf;
     kite_dereference_object(rhs);
     kite_vm_return(thd, this);
+}
+
+KITE_CLASS_METHOD(List_add) {
+    kite_object_t *cur = this, *rhs;
+    kite_object_t *secondhalf, *new;
+    
+    new = kite_new_list(thd);
+    
+    rhs = kite_list_object(thd, args);
+    secondhalf = rhs->builtin_data.listvalue.car;
+    
+    if (secondhalf->type == OBJ_LIST) {
+        secondhalf = kite_reference_object(secondhalf);
+    } else {
+        secondhalf = kite_new_list(thd);
+        secondhalf->builtin_data.listvalue.car = 
+            kite_reference_object(rhs->builtin_data.listvalue.car);
+    }
+    
+    if (cur->builtin_data.listvalue.car == NULL) {
+        if (secondhalf->type == OBJ_LIST)
+          new = kite_reference_object(secondhalf);
+        else
+          new->builtin_data.listvalue.car = kite_reference_object(secondhalf);
+        kite_dereference_object(rhs);
+        kite_vm_return(thd, new);
+        return;
+    }
+    
+    while (cur && cur->builtin_data.listvalue.car) {
+          kite_append_list(thd,new,cur->builtin_data.listvalue.car);
+          cur = cur->builtin_data.listvalue.cdr;
+    }
+    cur = new;
+    while(cur->builtin_data.listvalue.cdr != NULL) {
+        cur = cur->builtin_data.listvalue.cdr;
+    }
+    
+    cur->builtin_data.listvalue.cdr = secondhalf;
+    
+    kite_dereference_object(rhs);
+    kite_vm_return(thd, new);
 }
 
@@ -578 +619 @@
     kite_add_operator(thread, newclass, OP_ADD, 
         kite_new_method_compiled_with_docs(thread, List_add, 
-                                  "Adds item to the end of the list.", 1,
+   kite_add_operator(thread, newclass, OP_LEFT_SHIFT, 
+       kite_new_method_compiled_with_docs(thread, List_lshift, 
+                                 "Adds item to the end of the list.", 1,
+                                 "item", "Item to add."));
+                                 
+                                  "Creates a new list that is the combination of the two operands.", 1,
                                   "item", "Item to add."));
     kite_add_operator(thread, newclass, OP_LESS_THAN,