Changeset aaca19fb68c3cfe89e2acb105d2c3e8f5e028275

Timestamp:

06/20/10 04:51:37 (2 years ago)

Author:

redbrain <redbrain@…>

Parents:

20d93fb737c36e2fa36fb1e9ac36734be14a77c6

Children:

15f9f5604c8c79bc8923edc3cbbf26eec93484c9

git-committer:

redbrain <redbrain@crules.org> / 2010-06-20T04:51:37Z+0100

Message:

bug fix on many references to single objects in a single context

Files:

• include/crules/symbols.h (modified) (1 diff)
• src/obj_integer.c (modified) (1 diff)
• src/rr_context.c (modified) (1 diff)
• src/rr_runtime.c (modified) (2 diffs)
• src/ss_parser.y (modified) (3 diffs)

include/crules/symbols.h

@@ -134 +134 @@
   bool (*print_hook)( void * , FILE * , bool );
   crl_branch_context * context;
-  struct crl_number_prot_t * binary_protocol;
-  struct crl_builtin_member_def_t * member_fields;
-  struct crl_builtin_function_def_t * member_functions;
+  const struct crl_number_prot_t * binary_protocol;
+  const struct crl_builtin_member_def_t * member_fields;
+  const struct crl_builtin_function_def_t * member_functions;
   bool builtin;
 } crl_type_obj_def_t ;

src/obj_integer.c

@@ -155 +155 @@
 };
 
-struct crl_builtin_function_def_t integer_module_function_table[] = {
+const struct crl_builtin_function_def_t integer_module_function_table[] = {
   { "to_string", 0, &crl_obj_integer_to_string },
   { NULL, 0, NULL },
 } ;
 
-struct crl_builtin_member_def_t integer_module_member_table[] = {
+const struct crl_builtin_member_def_t integer_module_member_table[] = {
   { 0, NULL },
 } ;
 
-struct crl_type_obj_def_t integer_object = {
+const struct crl_type_obj_def_t integer_object = {
   "Int",
   sizeof( crl_type_integer_t ),

src/rr_context.c

@@ -102 +102 @@
             }
         }
+
+      // def any local symbols pointing to the objects!
+      idx = 0; crl_table_entry *c_arr = ctx->symbol_table->array;
+      for( ; idx<(ctx->symbol_table->size); ++idx )
+        {
+          crl_symbol_obj *o = c_arr[idx].symbol;
+
+          if( o )
+            {
+              o->n_ref--;
+              crl_debug("de-referencing object <%p> to count <%i>!\n",
+                        (void*)o, o->n_ref );
+            }
+        }      
     }
 

src/rr_runtime.c

@@ -1407 +1407 @@
           switch( sym->type )
             {
-              /*
             case STRUCTURE_CONDIT_CTX:
               crl_runtime_conditional_dispatch( sym, context );
@@ -1422 +1421 @@
               break;
 
+              /*
             case STRUCTURE_OBJECT_DEF:
               if( !(crl_rr_context_push_obj_def( sym, &context )) )

src/ss_parser.y

@@ -52 +52 @@
 extern bool crl_interactive;
 extern int yylineno;
+
+ bool crl_parse_error = false;
 
 // Helps build up symbol tables to have
@@ -170 +172 @@
             {
               crl_runtime_exec_toplevel( $2, crl_runtime_ctx_table );
-              if( (( $2->type != STRUCTURE_FUNCTION_DEF) &&
-                  ($2->type != STRUCTURE_OBJECT_DEF)) )
+              if( !crl_parse_error )
                 {
-                  crl_garbage_mark_obj( &$2 );
+                  if( (( $2->type != STRUCTURE_FUNCTION_DEF) &&
+                       ($2->type != STRUCTURE_OBJECT_DEF)) )
+                    {
+                      crl_garbage_mark_obj( &$2 );
+                    }
+                }
+              else
+                {
+                  if( crl_interactive )
+                    {
+                      crl_parse_error = false;
+                      crl_garbage_mark_obj( &$2 );
+                    }
                 }
             }
@@ -179 +192 @@
             {
               crl_error("malformed declaration!\n");
+              crl_parse_error = true;
             }
             ;