Changeset 89dcccd4721f29950f4455a999e0f47593678065

Timestamp:

04/11/10 01:48:11 (2 years ago)

Author:

Philip Herron <redbrain@…>

Parents:

b2bc0049fdf32f673fc66b045a4bb2b3ca350e40

Children:

8f36f3a9825b8570f8db262e1bf3bea0a64e07d5

git-committer:

Philip Herron <redbrain@omicron.(none)> / 2010-04-11T01:48:11Z+0100

Message:

more code time for sleep

Files:

• include/crules/objects.h (modified) (1 diff)
• src/obj_class.c (modified) (1 diff)
• src/rr_runtime.c (modified) (2 diffs)
• tools/crules.el (modified) (1 diff)

include/crules/objects.h

@@ -73 +73 @@
 
 extern crl_symbol_obj * crl_obj_class_dispatch_symbol( const char * , crl_context_table * ,
-                                                       enum crl_class_ctx_type_t ,
-                                                       crl_obj_state_t * );
+                                                       enum crl_class_ctx_type_t , crl_obj_state_t *,
+                                                       crl_symbol_obj * );
+
+extern crl_symbol_obj * crl_obj_class_dispatch_functor( const char *, crl_context_table *,
+                                                        crl_obj_state_t *, crl_symbol_obj * );
 
 // --------------------------------------------------------------------------

src/obj_class.c

@@ -40 +40 @@
 
 crl_symbol_obj *
-crl_obj_class_dispatch_symbol( const char * ident,
-                               crl_context_table * context,
-                               enum crl_class_ctx_type_t type,
-                               crl_obj_state_t * obj )
+crl_obj_class_dispatch_functor( const char * ident, crl_context_table * context,
+                                crl_obj_state_t * obj, crl_symbol_obj * call )
 {
   crl_symbol_obj *retval = NULL;
+
+  crl_context_table *object_ctx = (crl_context_table*)
+    crl_malloc( sizeof(crl_context_table) );
+  crl_context_init_table( &object_ctx );
+  crl_context_push( (obj->context), object_ctx );
+
+  
+
+
   return retval;
 }
+
+crl_symbol_obj *
+crl_obj_class_dispatch_symbol( const char * ident, crl_context_table * context,
+                               enum crl_class_ctx_type_t type, crl_obj_state_t * obj,
+                               crl_symbol_obj * functor_call )
+{
+  crl_symbol_obj *retval = NULL;
+
+  switch( type )
+    {
+    case T_FUNCTOR:
+      retval = crl_obj_class_dispatch_functor( ident, context, obj,
+                                               functor_call );
+      break;
+
+    default:
+      crl_error("unhandled type!\n");
+      break;
+    }
+
+  return retval;
+}

src/rr_runtime.c

@@ -1073 +1073 @@
       if( o )
         {
+          crl_assert( sym->op_a_t == TYPE_SYMBOL );
+          // dispatch the object __init__ function on construction!
+          crl_symbol_obj *rr = crl_obj_class_dispatch_symbol( "__init__", context, T_FUNCTOR,
+                                                              retval->op_a.object_state,
+                                                              sym->op_a.symbol_table );
+          if( rr )
+            {
+              if( rr->op_a_t != TYPE_SYMBOL_NIL )
+                {
+                  crl_warning( "object <%s> __init__ did not return Nil!\n",
+                               object_ident );
+                }
+            }
+          else
+            {
+              crl_fatal("error initilzing object <%s>!\n", object_ident );
+            }
+
+          // nothing to do with it...
+          crl_garbage_mark_obj( &rr );
+
           crl_symbol_init( retval );
           retval->type = SYMBOL_PRIMARY;
@@ -1078 +1099 @@
           retval->op_a.object_state = crl_context_clone_obj_state( o );
 
-          // dispatch the object __init__ function on construction!
-          crl_symbol_obj *rr = crl_obj_class_dispatch_symbol( "__init__", context, T_FUNCTOR,
-                                                              retval->op_a.object_state );
-          if( rr->op_a_t != TYPE_SYMBOL_NIL )
-            {
-              crl_warning( "object <%s> __init__ did not return Nil!\n",
-                           object_ident );
-            }
-          // nothing to do with it...
-          crl_garbage_mark_obj( &rr );
-
-          
+          // its now initilized!
+          retval->op_a.object_state = CLASS_INIT;
         }
       else

tools/crules.el

@@ -23 +23 @@
 (define-generic-mode 'crules-mode
   '("#")
-  '("workflow" "class" "rule" "defun" "each" "break" "where"
-    "continue" "return" "in" "for" "while" "until" "import"
-    "from" "if" "elif" "else" "print" "true" "false" "eval"
-    "let" "null" "this" "at" "defre")
+  '("object" "defun" "break" "continue"
+    "return" "for" "while" "import" "if"
+    "elif" "else" "print" )
   '(("[a-zA-Z_][a-zA-Z0-9_]+" . font-lock-variable-name-face)
-    ("[0-9]+" "true" "false" . font-lock-constant-face)
+    ("[0-9]+" "[0-9]+.[0-9]+" 
+    "true" "false" "nil" . font-lock-constant-face)
     ("\\[.*\\]" . font-lock-type-face))
   '(".crl\\'")