[Commit] nickle/builtin Makefile.am, 1.10, 1.11 builtin.c, 1.13, 1.14 builtin.h, 1.5, 1.6

[Keith Packard]

Committed by: keithp

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

Modified Files:
	Makefile.am builtin.c builtin.h 
Log Message:
	* builtin/Makefile.am:
	* builtin/builtin.c: (BuiltinType):
	* builtin/builtin.h:
	* expr.c: (NewExprComma):
	* nickle.h:
	* version.m4:
	Eliminate bogus explicit dependencies from Makefile.am
	Eliminate need for gram.h in builtins
	Move #include version.h from builtin.h to builtin.c


Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/builtin/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	15 Oct 2003 19:28:15 -0000	1.10
+++ Makefile.am	25 Oct 2003 18:37:08 -0000	1.11
@@ -12,12 +12,5 @@
 			string.c thread.c toplevel.c \
 			sockets.c # bsdrandom.c gcd.c
 
-$(libbuiltin_a_OBJECTS): builtin.h namespaces.h ../gram.h
-
-../gram.h:
-	$(MAKE) -C .. gram.h
-
-version.h: ../version.m4
+version.h:
 	( cd .. && sh update-version.sh )
-
-builtin.o: version.h

Index: builtin.c
===================================================================
RCS file: /local/src/CVS/nickle/builtin/builtin.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- builtin.c	14 Oct 2003 01:43:55 -0000	1.13
+++ builtin.c	25 Oct 2003 18:37:08 -0000	1.14
@@ -13,6 +13,7 @@
  */
 
 #include	"builtin.h"
+#include	"version.h"
 
 struct sbuiltin {
     char	    *value;
@@ -138,7 +139,7 @@
 	format++;
 	while (*format == '*')
 	{
-	    dims = NewExprTree (COMMA, 0, dims);
+	    dims = NewExprComma (0, dims);
 	    format++;
 	}
     }

Index: builtin.h
===================================================================
RCS file: /local/src/CVS/nickle/builtin/builtin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- builtin.h	14 Oct 2003 01:43:55 -0000	1.5
+++ builtin.h	25 Oct 2003 18:37:08 -0000	1.6
@@ -13,8 +13,6 @@
  */
 
 #include	"nickle.h"
-#include	"gram.h"
-#include        "version.h"
 
 SymbolPtr
 BuiltinAddName (NamespacePtr	*namespacep,