[Commit] nickle ChangeLog, 1.9, 1.10 Makefile.am, 1.41, 1.42 builtin.h, 1.6, 1.7 configure.in, 1.27, 1.28 value.h, 1.95, 1.96

Sun Feb 15 23:41:43 PST 2004

Committed by: keithp

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

Modified Files:
	ChangeLog Makefile.am builtin.h configure.in value.h 
Log Message:
	* Makefile.am:
	* configure.in:
	* builtin.h:
	Move builtin sources to top level directory so that
	make works right -- leaving them in the subdir meant that
	yacc/lex wouldn't get run at the right time.
	* value.h:
	Use unsigned bitfields to make :1 values easier to read in gdb
	Prototype more functions
	* debian/control:
	Switch standards version to 3.5.10 to make lintian happy
	* debian/rules:
	Don't install .cvsignore files in docs


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10

--- ChangeLog	16 Feb 2004 00:15:04 -0000	1.9
+++ ChangeLog	16 Feb 2004 07:41:40 -0000	1.10
@@ -1,6 +1,22 @@
 2004-02-15  Keith Packard  <keithp at keithp.com>
 
 	* Makefile.am:
+	* configure.in:
+	* builtin.h:
+	Move builtin sources to top level directory so that
+	make works right -- leaving them in the subdir meant that
+	yacc/lex wouldn't get run at the right time.
+	* value.h:
+	Use unsigned bitfields to make :1 values easier to read in gdb
+	Prototype more functions
+	* debian/control:
+	Switch standards version to 3.5.10 to make lintian happy
+	* debian/rules:
+	Don't install .cvsignore files in docs
+
+2004-02-15  Keith Packard  <keithp at keithp.com>
+
+	* Makefile.am:
 	* test/Makefile.am:
 	* builtin/Makefile.am:
 	Fix EXTRA_DIST.  Remove automatic version number updates.  That

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile.am	16 Feb 2004 00:15:04 -0000	1.41
+++ Makefile.am	16 Feb 2004 07:41:40 -0000	1.42
@@ -4,7 +4,7 @@
 ## All Rights Reserved.  See the file COPYING in this directory
 ## for licensing information.
 
-SUBDIRS = builtin bench test
+SUBDIRS = bench test
 
 NICKLEFILES = builtin.5c math.5c scanf.5c mutex.5c \
 	arc4.5c prng.5c command.5c abort.5c \
@@ -19,33 +19,26 @@
 DEBIAN = debian/changelog  debian/control debian/copyright \
 	debian/docs debian/files debian/rules
 
-EXTRA_DIST = README.name autogen.sh update-version.sh $(NICKLEFILES) \
-	gram.h $(EXAMPLES) $(TEST) $(DEBIAN) version.m4
+EXTRA_DIST = README.name autogen.sh update-version.sh make-version.sh \
+	$(NICKLEFILES) gram.h $(EXAMPLES) $(TEST) $(DEBIAN) version.m4
 
 bin_PROGRAMS = nickle
 
-nickle_SOURCES = alarm.c array.c atom.c avl.c box.c \
-	compile.c debug.c divide.c edit.c \
-	error.c execute.c expr.c file.c float.c frame.c func.c \
-	gcd.c hash.c int.c integer.c io.c main.c mem.c \
-	natural.c pretty.c profile.c rational.c ref.c refer.c \
-	sched.c scope.c stack.c string.c struct.c \
-	symbol.c sync.c type.c union.c util.c value.c \
-	avl.h mem.h memp.h nickle.h opcode.h ref.h stack.h value.h \
+nickle_SOURCES = \
+	alarm.c array.c atom.c avl.c box.c compile.c debug.c \
+	divide.c edit.c error.c execute.c expr.c file.c float.c \
+	frame.c func.c gcd.c hash.c int.c integer.c io.c main.c \
+	mem.c natural.c pretty.c profile.c rational.c ref.c \
+	refer.c sched.c scope.c stack.c string.c struct.c \
+	symbol.c sync.c type.c union.c util.c value.c avl.h \
+	mem.h memp.h nickle.h opcode.h ref.h stack.h value.h \
+	builtin-command.c builtin-debug.c builtin-environ.c \
+	builtin-file.c builtin-math.c builtin-namespaces.h \
+	builtin-semaphore.c builtin-sockets.c builtin-string.c \
+	builtin-thread.c builtin-toplevel.c builtin.c builtin.h \
 	gram.y lex.l
-nickle_LDADD = -Lbuiltin -lbuiltin
-nickle_DEPENDENCIES = builtin/libbuiltin.a
-
-# XXX for version numbering only
 
-NICKLEBUILTINSOURCES = builtin/bsdrandom.c builtin/builtin.c \
-	builtin/builtin.h builtin/command.c \
-	builtin/debug.c builtin/environ.c \
-	builtin/file.c builtin/gcd.c \
-	builtin/math.c builtin/namespaces.h \
-	builtin/semaphore.c builtin/sockets.c \
-	builtin/string.c builtin/thread.c \
-	builtin/toplevel.c
+CLEANFILES=version.h
 
 pkgdata_DATA = $(NICKLEFILES)
 
@@ -53,9 +46,11 @@
 
 AM_YFLAGS = -d
 
+DEFINES = -DBUILD=\""`sh $(top_builddir)/date-sh`"\"
+
 AM_CFLAGS = -Wall -Wpointer-arith -Wstrict-prototypes \
 	-Wmissing-prototypes -Wmissing-declarations \
-	-Wnested-externs -fno-strict-aliasing
+	-Wnested-externs -fno-strict-aliasing $(DEFINES)
 
 all: version.m4
 
@@ -70,3 +65,8 @@
 	type.o
 
 $(USES_GRAM_H): gram.h
+
+builtin.o: version.h
+
+version.h: $(top_srcdir)/make-version.sh $(top_srcdir)/version.m4
+	sh $(top_srcdir)/make-version.sh $(top_srcdir)/version.m4

Index: builtin.h
===================================================================
RCS file: /local/src/CVS/nickle/builtin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- builtin.h	25 Oct 2003 18:37:08 -0000	1.6
+++ builtin.h	16 Feb 2004 07:41:40 -0000	1.7
@@ -127,4 +127,4 @@
 #define BuiltinFuncs2J(n, f) \
 	BuiltinFuncsGeneric(n, f, fbuiltin_2j, builtin2J, True)
 
-#include "namespaces.h"
+#include "builtin-namespaces.h"

Index: configure.in
===================================================================
RCS file: /local/src/CVS/nickle/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.in	14 Oct 2003 01:20:29 -0000	1.27
+++ configure.in	16 Feb 2004 07:41:40 -0000	1.28
@@ -86,7 +86,6 @@
 
 AC_CONFIG_FILES(
  Makefile
- builtin/Makefile
  test/Makefile
  bench/Makefile
  date-sh

Index: value.h
===================================================================
RCS file: /local/src/CVS/nickle/value.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- value.h	10 Jan 2004 06:20:02 -0000	1.95
+++ value.h	16 Feb 2004 07:41:40 -0000	1.96
@@ -546,8 +546,8 @@
 
 typedef struct _array {
     BaseValue	base;
-    int		resizable : 1;
-    int		ndim : (sizeof (int) * 8 - 1);
+    unsigned int	resizable : 1;
+    unsigned int	ndim : (sizeof (int) * 8 - 1);
     BoxPtr	values;
 } Array;
 
@@ -979,7 +979,10 @@
 Value	FileStringWrite (void);
 Value	FileStringString (Value file);
 void	FileSetFd (int fd), FileResetFd (int fd);
+Bool	FileIsReadable (int fd);
+Bool	FileIsWritable (int fd);
 void	FilePuts (Value, char *);
+void	FilePutDoubleDigitBase (Value file, double_digit a, int base);
 void	FilePutUIntBase (Value file, unsigned int a, int base);
 void	FilePutIntBase (Value file, int a, int base);
 void	FilePutInt (Value, int);
@@ -1002,8 +1005,6 @@
 void	FilePrintf (Value, char *, ...);
 void	FileVPrintf (Value, char *, va_list);
 void	FileSetBuffer (Value file, int buf);
-Bool	FileIsReadable (int fd);
-Bool	FileIsWritable (int fd);
 
 extern Bool	anyFileWriteBlocked;
 extern Bool	anyFileReadBlocked;


