Changeset cefff4d955ce997b4aab97a3d87a867091ca7521

Timestamp:

04/09/10 17:29:01 (2 years ago)

Author:

Philip Herron <redbrain@…>

Parents:

a6c888b20a503ddf30bb1cfdf422c579066a4d14

Children:

90547e447318d72714752d57b6569764d87beb86

git-committer:

Philip Herron <redbrain@omicron.(none)> / 2010-04-09T17:29:01Z+0100

Message:

free hash tables bug fix causing garbage stack corruption on cleanup

Files:

• Makefile.am (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/gg_garbage.c (modified) (1 diff)
• src/rr_runtime.c (modified) (4 diffs)
• src/ss_parser.y (modified) (1 diff)

Makefile.am

@@ -10 +10 @@
         gitcl2gnucl
 
-.PHONY: test
+.PHONY: test check-syntax
 
 test: test-crules
@@ -18 +18 @@
         $(MAKE) $(AM_MAKEFLAGS) test
 
+check-syntax: all
+
 doxygen:
         doxygen Doxyfile

src/Makefile.am

@@ -50 +50 @@
 crldot_CFLAGS = -DSYM_DOT
 crldot_SOURCES = mm_crldot.c
+
+.PHONY: check-syntax
+
+check-syntax: all

src/gg_garbage.c

@@ -263 +263 @@
               crl_symbol_obj *sym= array[i].symbol;
               if( sym )
-                crl_garbage_mark_obj( &sym );
+                crl_garbage_free_obj( &sym );
             }
           crl_free( (*table)->array );

src/rr_runtime.c

@@ -1179 +1179 @@
         }
     }
+  else if( sym->type == OP_BIN_ACCESSOR )
+    {
+      crl_debug("object accessor dispatch!\n");
+      
+    }
   else
     {
@@ -1531 +1536 @@
           switch( sym->type )
             {
-            case BUILTIN_CALL:
-              ex= crl_builtin_dispatch( sym, context );
-              if( ex )
-                {
-                  if( ex->op_a_t == TYPE_SYMBOL_NIL )
-                    {
-                      crl_free(ex);
-                    }
-                  else
-                    {
-                      // garbage symbol now!
-                      crl_garbage_mark_obj( &ex );
-                    }
-                }
-              else { retval= false; }
-              break;
-
             case OP_CALL_GOTO:
               ex= crl_runtime_call_dispatch( sym, context );
@@ -1635 +1623 @@
           switch( sym->type )
             {
-            case BUILTIN_CALL:
-              ex= crl_builtin_dispatch( sym, context );
-              if( ex )
-                {
-                  if( ex->op_a_t == TYPE_SYMBOL_NIL )
-                    {
-                      crl_free(ex);
-                    }
-                  else
-                    {
-                      if( crl_interactive )
-                        crl_runtime_object_print( ex, context, crlout, true );
-                      // garbage symbol now!
-                      crl_garbage_mark_obj( &ex );
-                    }
-                }
-              else { retval= false; }
-              break;
-
             case OP_CALL_GOTO:
               ex= crl_runtime_call_dispatch( sym, context );
@@ -1703 +1672 @@
               break;
 
+            case OP_BIN_ACCESSOR:
+              ex = crl_runtime_evaluate_expression( sym, context );
+              if( ex )
+                {
+                  if( ex->op_a_t == TYPE_SYMBOL_NIL )
+                    {
+                      crl_free( ex );
+                    }
+                  else
+                    {
+                      if( crl_interactive )
+                        crl_runtime_object_print( ex, context, crlout, true );
+                      // garbage symbol now!
+                      crl_garbage_mark_obj( &ex );
+                    }
+                }
+              break;
+
             default:
               crl_error("unhandled symbol type '0x%X'\n", sym->type );

src/ss_parser.y

@@ -905 +905 @@
         {
           crl_symbol_obj *sym;
-          crl_symbol_init( sym );
-          
-          sym->type= BUILTIN_CALL;
-          sym->op_a_t= TYPE_STRING;
-          sym->op_a.string= crl_strdup("print");
-          
-          sym->op_b_t= TYPE_ARGUMENTS;
-          sym->op_b.stack_table= $2;
-          $$= sym;
+          crl_symbol_init( sym );
+
+          sym->type= OP_CALL_GOTO;
+          sym->op_a_t= TYPE_STRING;
+          sym->op_b_t= TYPE_ARGUMENTS;
+
+          sym->op_a.string= crl_strdup( "print" );
+          sym->op_b.stack_table= $2;
+
+          crl_symbol_obj *acc;
+          crl_symbol_init( acc );
+          acc->type = SYMBOL_REFERENCE;
+          acc->op_a_t = TYPE_STRING;
+          acc->op_a.string = crl_strdup( "__builtin__" );
+
+          crl_symbol_obj *print_call;
+          crl_symbol_init( print_call );
+
+          print_call->type = OP_BIN_ACCESSOR;
+          print_call->op_a_t = TYPE_SYMBOL;
+          print_call->op_b_t = TYPE_SYMBOL;
+          print_call->op_a.symbol_table = acc;
+          print_call->op_b.symbol_table = sym;
+
+          $$ = print_call;
         }
         ;