[Commit] nickle ChangeLog, 1.6, 1.7 compile.c, 1.143, 1.144 version.m4, 1.4, 1.5

[Keith Packard]

Committed by: keithp

Update of /local/src/CVS/nickle
In directory home.keithp.com:/tmp/cvs-serv1163

Modified Files:
	ChangeLog compile.c version.m4 
Log Message:
	* compile.c: (CompileBuildArray), (CompileArrayInit),
	(CompileImplicitInit):
	Use canonical type to see if ANONINIT is an array.
	Don't need to call TypeCanon before recursive CompileImplicitInit
	call.
	* version.m4:


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	25 Oct 2003 19:00:33 -0000	1.6
+++ ChangeLog	14 Dec 2003 07:45:01 -0000	1.7
@@ -1,3 +1,12 @@
+2003-12-13  Keith Packard  <keithp at keithp.com>
+
+	* compile.c: (CompileBuildArray), (CompileArrayInit),
+	(CompileImplicitInit):
+	Use canonical type to see if ANONINIT is an array.
+	Don't need to call TypeCanon before recursive CompileImplicitInit
+	call.
+	* version.m4:
+
 2003-10-25  Keith Packard  <keithp at keithp.com>
 
 	* Makefile.am:

Index: compile.c
===================================================================
RCS file: /local/src/CVS/nickle/compile.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- compile.c	25 Oct 2003 19:00:33 -0000	1.143
+++ compile.c	14 Dec 2003 07:45:01 -0000	1.144
@@ -1319,7 +1319,7 @@
     }
     else
     {
-	CompileArrayDimValue (obj, type, False, stat, code);
+	obj = CompileArrayDimValue (obj, type, False, stat, code);
 	BuildInst (obj, OpBuildArrayInd, inst, stat);
     }
     inst->array.ndim = ndim;
@@ -1742,7 +1742,7 @@
 		RETURN (obj);
 	    }
 	    if (ndim > ninitdim ||
-		(ndim < ninitdim && sub->base.tag != type_array))
+		(ndim < ninitdim && TypeCanon(sub)->base.tag != type_array))
 	    {
 		CompileError (obj, stat, "Array dimension mismatch %d != %d\n",
 			      ndim, ninitdim);
@@ -1813,6 +1813,9 @@
 }
 
 		    
+/*
+ * Construct an implicit initializer expression for the specified type
+ */
 static ExprPtr
 CompileImplicitInit (Type *type)
 {
@@ -1863,7 +1866,7 @@
 	{
 	    ExprPtr	member;
 	    
-	    sub = TypeCanon (types[i]);
+	    sub = types[i];
 
 	    member = CompileImplicitInit (sub);
 	    if (member)

Index: version.m4
===================================================================
RCS file: /local/src/CVS/nickle/version.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- version.m4	25 Oct 2003 19:00:33 -0000	1.4
+++ version.m4	14 Dec 2003 07:45:01 -0000	1.5
@@ -1,7 +1,7 @@
 dnl This file is maintained automatically by update-version.sh
 dnl The file format is finicky, so do not hand-edit lightly.
-dnl Last updated Sat Oct 25 11:54:45 PDT 2003
+dnl Last updated Sat Dec 13 23:43:27 PST 2003
 dnl CURHEADER $Header$
-dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.3 2003/10/15 19:28:14 bart Exp >
-dnl CURVERSION 2.23
-define([VERSION_NUMBER],[2.23])
+dnl OLDHEADER <Header: /local/src/CVS/nickle/version.m4,v 1.5 2003/12/05 05:06:13 keithp Exp >
+dnl CURVERSION 2.25
+define([VERSION_NUMBER],[2.25])