Changeset 523

Timestamp:

01/31/09 20:31:16 (3 years ago)

Author:

mooneer

Message:

Now return reference to list element during list dereference, allowing constructs like list[x] = y; to work properly. (ticket #83)

Location:

interpreter/trunk

Files:

• ChangeLog (modified) (1 diff)
• modules/System/list.c (modified) (2 diffs)
• objs/kite_object.h (modified) (1 diff)
• objs/kite_symtab.c (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/objs/list/set_deref.kt (added)
• tests/objs/list/set_deref.kt.out (added)
• vm/kite_execute.c (modified) (1 diff)
• vm/kite_stack.c (modified) (1 diff)

interpreter/trunk/ChangeLog

@@ -3 +3 @@
     * Integrated interface.pop3 and interface.smtp modules (credit: Michael J. Edgar)
     * Integrated new System.date.hires object. (credit: Michael J. Edgar)
+    * Now return reference to list element during list dereference, allowing constructs 
+      like list[x] = y; to work properly. (ticket #83)
 
 1/30/2009:

interpreter/trunk/modules/System/list.c

@@ -203 +203 @@
     /* Special-case: return list if range object is given */
     kite_object_t *exc, *rhs;
+    kite_symtab_t *ret;
     int badType = FALSE, index;
     if (args->type == OBJ_LIST) { 
@@ -243 +244 @@
         this = this->builtin_data.listvalue.cdr;
     }
-    
-    kite_vm_push(thd, this->builtin_data.listvalue.car);
+
+    ret = kite_new_symtab();
+    ret->value = (kite_object_t*)&this->builtin_data.listvalue.car;
+    ret->global = -1;
+    kite_reference_object(KITE_LIST_CAR(this));
+    kite_push_stack(&(thd)->running_stack, TRUE, ret);
 }
 

interpreter/trunk/objs/kite_object.h

@@ -611 +611 @@
  * Symbol table manipulation
  */ 
- 
+
+/**
+ * Create a new symbol table object.
+ * @return Symbol table object.
+ */
+kite_symtab_t *kite_new_symtab();
+
 /**
  * Insert entry into symbol table.

interpreter/trunk/objs/kite_symtab.c

@@ -42 +42 @@
 
 /*****************************************************************************
+ * Create a new symbol table object.
+ ****************************************************************************/
+kite_symtab_t *kite_new_symtab()
+{
+    kite_symtab_t *newVal;
+    
+    #ifndef HAVE_GC_H
+        newVal = (kite_symtab_t*)calloc(1, sizeof(kite_symtab_t));
+    #else
+        newVal = (kite_symtab_t*)GC_malloc(sizeof(kite_symtab_t));
+    #endif
+    
+    return newVal;
+}
+
+/*****************************************************************************
  * Copy a symbol table's elements.
  ****************************************************************************/

interpreter/trunk/tests/Makefile.am

@@ -224 +224 @@
 ./objs/list/sort_list.kt \
 ./objs/list/sort_list.kt.out \
+./objs/list/set_deref.kt \
+./objs/list/set_deref.kt.out \
 ./objs/integer/float.kt \
 ./objs/integer/str.kt \

interpreter/trunk/vm/kite_execute.c

@@ -834 +834 @@
         kite_symtab_t *symt = 
             (kite_symtab_t*)thd->running_stack->stack[thd->running_stack->length - 1].obj;
-        kite_object_t *oldobj = symt->value;
-        symt->value = kite_reference_object(rhs);
+        kite_object_t *oldobj;
+        if (symt->global == -1)
+        {
+            oldobj = *(kite_object_t**)symt->value;
+            *(kite_object_t**)symt->value = kite_reference_object(rhs);
+        }
+        else
+        {
+            oldobj = symt->value;
+            symt->value = kite_reference_object(rhs);
+        }
         kite_dereference_object(oldobj);
         kite_dereference_object(oldobj->parent);

interpreter/trunk/vm/kite_stack.c

@@ -107 +107 @@
     entry = &st->stack[st->length - 1];
     if (entry->reference) {
+        if (((kite_symtab_t*)entry->obj)->global == -1) 
+            return *(kite_object_t**)((kite_symtab_t*)entry->obj)->value;
         return ((kite_symtab_t*)entry->obj)->value;
     }