rev 217 - trunk/src

Author: bcollins
Date: 2004-03-30 15:39:52 -0500 (Tue, 30 Mar 2004)
New Revision: 217

Modified:
   trunk/src/Makefile.in
   trunk/src/builtins.c
   trunk/src/object.c
Log:
Fix Makefile object list, and fixup bug I left in Dict.__str__.


Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	2004-03-30 20:32:57 UTC (rev 216)
+++ trunk/src/Makefile.in	2004-03-30 20:39:52 UTC (rev 217)
@@ -11,8 +11,8 @@
 
 BUILTIN_MOD_OBJS = builtins.o
 
-# NOTE: main.o must come before any builtins, and object.o must come after
-OBJS = main.o $(BUILTIN_MOD_OBJS) object.o argproc.o clist.o lock.o \
+# NOTE: amain.o must come before any builtins, and object.o must come after
+OBJS = amain.o $(BUILTIN_MOD_OBJS) object.o argproc.o clist.o lock.o \
 	memory_mgr.o parser.o prmalloc.o sys.o interp.o parser_routines.o \
 	symbol.o thread.o getline.o console.o
 

Modified: trunk/src/builtins.c
===================================================================
--- trunk/src/builtins.c	2004-03-30 20:32:57 UTC (rev 216)
+++ trunk/src/builtins.c	2004-03-30 20:39:52 UTC (rev 217)
@@ -1035,6 +1035,7 @@
 
 	len = dict_len(ist, self);
 	keys = dict_keys(ist, self);
+	vals = dict_values(ist, self);
 	dict_values(ist, self);
 
 	res = pr_malloc(3);

Modified: trunk/src/object.c
===================================================================
--- trunk/src/object.c	2004-03-30 20:32:57 UTC (rev 216)
+++ trunk/src/object.c	2004-03-30 20:39:52 UTC (rev 217)
@@ -297,15 +297,6 @@
 		(*dll_initcalls)(&dll_services);
 		dll_initcalls++;
 	}
-
-	{	
-		list_p lstp = OBJ(LIST_PROTO)->data.ptr = 
-			pr_malloc((LIST_OVERHEAD+2) * sizeof(list_t));
-		OBJ(LIST_PROTO)->data_type = OBJ_TYPE_DATAPTR;
-		lstpsize(lstp) = 2;
-		lstplen(lstp)  = 0;
-		set_immutable(OBJ(LIST_PROTO));
-	}
 }
 
 //********************************* new_object ********************************