Changeset 530

Timestamp:

02/04/09 22:49:43 (3 years ago)

Author:

mooneer

Message:

Integrate array class as System.collections.array (credit: Michael J. Edgar), and fixed tests and other issues resulting from the System.list patch.

Location:

interpreter/trunk

Files:

• ChangeLog (modified) (1 diff)
• modules/Makefile.am (modified) (1 diff)
• modules/System/collections (added)
• modules/System/collections/array.c (added)
• modules/System/list.c (modified) (2 diffs)
• modules/System/regex.kt (modified) (4 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/objs/array (added)
• tests/objs/array/test_array.kt (added)
• tests/objs/array/test_array.kt.out (added)
• tests/objs/list/append.kt.out (modified) (1 diff)
• tests/objs/list/prepend2.kt (modified) (1 diff)

interpreter/trunk/ChangeLog

@@ +1 @@
+2/4/2009:
+    * list|append and operator+ now create new lists instead of modifying the existing list.
+      The << operator modifies the list on the left hand side. (credit: Michael J. Edgar)
+    * Integrate array class as System.collections.array. (credit: Michael J. Edgar)
+    
 1/31/2009:
     * Regular expressions can be specified with "r/.../[i]" syntax (ticket #79)

interpreter/trunk/modules/Makefile.am

@@ -13 +13 @@
         __internal/_cinvoke_function.c __internal/_cinvoke_structure.c \
         __internal/_cinvoke_callback.c System/digest.c System/digest/md5.c \
-        System/digest/md5.h System/date/hires.c
+        System/digest/md5.h System/date/hires.c System/collections/array.c
 
 nobase_dist_pkglib_SCRIPTS = System.kt System/network/wrapper.kt \

interpreter/trunk/modules/System/list.c

@@ -619 +619 @@
     kite_add_operator(thread, newclass, OP_ADD, 
         kite_new_method_compiled_with_docs(thread, List_add, 
+        "Creates a new list that is the combination of the two operands.", 1,
+        "item", "Item to add."));
+
    kite_add_operator(thread, newclass, OP_LEFT_SHIFT, 
        kite_new_method_compiled_with_docs(thread, List_lshift, 
@@ -624 +627 @@
                                  "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, 
         kite_new_method_compiled_with_docs(thread, List_lessthan, 

interpreter/trunk/modules/System/regex.kt

@@ -173 +173 @@
     while(not (thematch is System.null) and j < max)
     [
-        ret|append(str|substring(start, thematch.match_begin - start));
+        ret << str|substring(start, thematch.match_begin - start);
         decide
         [
@@ -180 +180 @@
                 while(i < thematch.captures|count)
                 [
-                    ret|append(thematch.captures[i]);
+                    ret << thematch.captures[i];
                     i = i + 1;
                 ];
@@ -191 +191 @@
     ];
     
-    ret|append(str|substring(start));
+    ret << str|substring(start);
     ret;
 ];
@@ -214 +214 @@
         while (i < arg|get_num_groups)
         [
-            this.captures|append(arg|get_group(i));
+            this.captures << arg|get_group(i);
             i = i + 1;
         ];

interpreter/trunk/tests/Makefile.am

@@ -248 +248 @@
 ./objs/os/args.kt.out \
 ./objs/os/args.kt \
+./objs/array/test_array.kt \
+./objs/array/test_array.kt.out \
 ./objs/regex/basic_regex.kt \
 ./objs/regex/basic_regex.kt.out \

interpreter/trunk/tests/objs/list/append.kt.out

@@ -1 +1 @@
 [2]
-[[1, 2, 3]]
+[1, 2, 3]
 [1, 2, 3]
 [1, 2, 3, 4]

interpreter/trunk/tests/objs/list/prepend2.kt

@@ -1 +1 @@
 stack = [];
-stack|append("is a");
-stack|prepend("This ");
-stack|append(" test!");
+stack = stack|append("is a");
+stack = stack|prepend("This ");
+stack = stack|append(" test!");
 stack|print;