Changeset 622

Timestamp:

09/04/10 19:16:57 (17 months ago)

Author:

mooneer

Message:

Added inherit_list object to enable primitive multiple inheritance (at least, as allowable by Kite syntax and semantics).

Location:

interpreter/trunk

Files:

• backend/common/kite_lexer.l (modified) (1 diff)
• backend/common/kite_parser.y (modified) (4 diffs)
• backend/kite-vm-1.0/kite_execute.c (modified) (1 diff)
• docs/version.texi (modified) (1 diff)
• modules/Makefile.am (modified) (1 diff)
• modules/System/object.c (modified) (2 diffs)
• modules/inherit_list.kt (added)
• tests/check_tests.sh (modified) (1 diff)
• tests/declarations/_inherit_defs.kt (added)
• tests/declarations/inherit_list_multiple.kt (added)
• tests/declarations/inherit_list_multiple.kt.out (added)

interpreter/trunk/backend/common/kite_lexer.l

@@ -92 +92 @@
 null { fillBoth(yyscanner); return NULL_VALUE; }
 version { fillBoth(yyscanner); return VERSION_KEYWORD; }
+options[ \t\r\n]+set { fillBoth(yyscanner); return OPTIONS_SET; }
 
 "<<" { fillBoth(yyscanner); return LEFT_SHIFT; }

interpreter/trunk/backend/common/kite_parser.y

@@ -54 +54 @@
 extern int yylex(void *, void *, void *);
 
+/* Need to grab dylib path from compiler. TODO: use separate method to manipulate. */
+extern char *kite_dylib_path;
 %}
 
@@ -111 +113 @@
 %token REGEX_VALUE_CI
 %token ARRAY_SET
+%token OPTIONS_SET
 
 /* Needed since we can't quite lay out the associativity using the rules yet. */
@@ -182 +185 @@
 statement:
     | data_manipulation_statement
+    | options_set_statement
     | loop_statement
     | from_statement
@@ -196 +200 @@
     | operator_definition
     ;
-    
+
+options_set_statement:  OPTIONS_SET STRING_VALUE STRING_VALUE {
+    if (strcmp("import_path", $<stringValue>2) == 0)
+    {
+        /* TODO: thread safety */
+        char *old_kite_dylib_path = kite_dylib_path;
+#ifndef HAVE_GC_H
+        kite_dylib_path = malloc(strlen(old_kite_dylib_path) + strlen($<stringValue>3) + 2);
+#else
+        kite_dylib_path = GC_malloc(strlen(old_kite_dylib_path) + strlen($<stringValue>3) + 2);
+#endif
+        strcpy(kite_dylib_path, old_kite_dylib_path);
+        strcat(kite_dylib_path, ":");
+        strcat(kite_dylib_path, $<stringValue>3);
+    }
+    else
+    {
+        /* TODO: throw exception if no valid option found. */
+    }
+};
+
 import_statement:    IMPORT STRING_VALUE     {
         kite_compiler_t *compiler = (kite_compiler_t*)yyget_extra(parm);

interpreter/trunk/backend/kite-vm-1.0/kite_execute.c

@@ -447 +447 @@
         KITE_FIND_ANY_IN_SYMTAB(entry, curr->object_data.properties, name);
         if (entry) {
-            if ((!entry->global && obj != curr) ||
+            if ((!entry->global && obj != curr && curr->type != OBJ_INSTANCE) ||
                 (entry->value && entry->value->type == OBJ_METHOD && 
                  obj != curr)) {

interpreter/trunk/docs/version.texi

@@ -1 @@
-@set UPDATED 21 December 2008
+@set UPDATED 16 December 2008
 @set UPDATED-MONTH December 2008
 @set EDITION 1.0.4

interpreter/trunk/modules/Makefile.am

@@ -21 +21 @@
         interface/text.kt interface/text/readline.kt interface/text/base64.kt \
         interface/text/binary.kt interface/pop3.kt interface/smtp.kt all_modules.kt \
-        System/compile_options.kt System/package/builder.kt local-pkgs/blank.kt
+        System/compile_options.kt System/package/builder.kt local-pkgs/blank.kt inherit_list.kt
 
 AM_CFLAGS = -Wdeclaration-after-statement -Wextra -fno-omit-frame-pointer -ISystem/digest/ -I../objs -I../backend/common -fPIC -W -Wall -DCINVOKE_BUILD

interpreter/trunk/modules/System/object.c

@@ -777 +777 @@
     
     kite_add_method(thd, this, KITE_GET_STRING_VALUE(name), method);
+}
+
+/*****************************************************************************
+ * Call method on given object.
+ ****************************************************************************/
+KITE_CLASS_METHOD(Object_callWithObject)
+{
+    kite_object_t *method, *a;
+
+    KITE_GET_METHOD_ARGUMENT(method, 1);
+    KITE_GET_METHOD_ARGUMENT(a, 2);
+    
+    if (method->type == OBJ_METHOD)
+    {
+        kite_vm_call_object(thd, this, method, a);
+    }
+    else
+    {
+        kite_vm_call_method(thd, this, KITE_GET_STRING_VALUE(method), a, TRUE);
+    }
 }
 
@@ -899 +919 @@
                                   "name", "The method's name.",
                                   "numargs", "The number of arguments of the given method."));
+    kite_add_method(thread, newclass, "call_with_object",
+        kite_new_method_compiled_with_docs(thread, Object_callWithObject,
+                                  "Calls the given method with the given arguments.", 2,
+                                  "m", "The method object or name to call.",
+                                  "args", "The list of method arguments to pass in."));
     kite_add_method(thread, newclass, "get_destructor",
         kite_new_method_compiled_with_docs(thread, Object_getDestructor, 

interpreter/trunk/tests/check_tests.sh

@@ -18 +18 @@
 rm -f $LOC/test.log
 cd $LOC/tmp/lib/kite
-for i in `find $LOC/tests -name '*.kt' | grep -v '.svn'`; do
+for i in `find $LOC/tests -name '[A-Za-z]*.kt' | grep -v '.svn'`; do
         echo -n "$i: "
         echo "$i:" >>$LOC/test.log