[Commit] nickle ChangeLog, 1.8, 1.9 Makefile.am, 1.40, 1.41 file.c, 1.57, 1.58 nickle.h, 1.111, 1.112

[Keith Packard]

Committed by: keithp

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

Modified Files:
	ChangeLog Makefile.am file.c nickle.h 
Log Message:
	* Makefile.am:
	* test/Makefile.am:
	* builtin/Makefile.am:
	Fix EXTRA_DIST.  Remove automatic version number updates.  That
	should be done by CVS.  Make separate build dir work.
	
	* debian/changelog:
	* debian/control:
	* debian/copyright:
	Take over debian package creation.

	* file.c: (FilePutDoubleDigitBase), (FilePutUIntBase),
	* nickle.h:
	(FileVPrintf):
	Add 'D' format to print out 64-bit values (for tick counts)


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ChangeLog	17 Jan 2004 15:32:15 -0000	1.8
+++ ChangeLog	16 Feb 2004 00:15:04 -0000	1.9
@@ -1,3 +1,21 @@
+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
+	should be done by CVS.  Make separate build dir work.
+	
+	* debian/changelog:
+	* debian/control:
+	* debian/copyright:
+	Take over debian package creation.
+
+	* file.c: (FilePutDoubleDigitBase), (FilePutUIntBase),
+	* nickle.h:
+	(FileVPrintf):
+	Add 'D' format to print out 64-bit values (for tick counts)
+
 2004-01-18  Keith Packard  <keithp at keithp.com>
 
 	* box.c: (NewBox):

Index: Makefile.am
===================================================================
RCS file: /local/src/CVS/nickle/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- Makefile.am	25 Oct 2003 19:00:33 -0000	1.40
+++ Makefile.am	16 Feb 2004 00:15:04 -0000	1.41
@@ -19,8 +19,8 @@
 DEBIAN = debian/changelog  debian/control debian/copyright \
 	debian/docs debian/files debian/rules
 
-EXTRA_DIST = README.name autoconfigure.sh $(NICKLEFILES) \
-	gram.h $(EXAMPLES) $(TEST) $(DEBIAN)
+EXTRA_DIST = README.name autogen.sh update-version.sh $(NICKLEFILES) \
+	gram.h $(EXAMPLES) $(TEST) $(DEBIAN) version.m4
 
 bin_PROGRAMS = nickle
 
@@ -70,7 +70,3 @@
 	type.o
 
 $(USES_GRAM_H): gram.h
-
-version.m4: update-version.sh \
-  $(nickle_SOURCES) $(NICKLEFILES) $(NICKLEBUILTINSOURCES)
-	sh update-version.sh

Index: file.c
===================================================================
RCS file: /local/src/CVS/nickle/file.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- file.c	10 Jan 2004 06:20:02 -0000	1.57
+++ file.c	16 Feb 2004 00:15:04 -0000	1.58
@@ -1243,7 +1243,7 @@
 }
 
 void
-FilePutUIntBase (Value file, unsigned int a, int base)
+FilePutDoubleDigitBase (Value file, double_digit a, int base)
 {
     int	    digit;
     char    space[64], *s;
@@ -1269,6 +1269,12 @@
 }
 
 void
+FilePutUIntBase (Value file, unsigned int a, int base)
+{
+    FilePutDoubleDigitBase (file, (double_digit) a, base);
+}
+
+void
 FilePutIntBase (Value file, int a, int base)
 {
     if (a < 0)
@@ -1744,6 +1750,9 @@
 	    case 'x':
 		FilePutUIntBase (file, va_arg (args, unsigned int), 16);
 		break;
+	    case 'D':
+		FilePutDoubleDigitBase (file, va_arg (args, double_digit), 10);
+		break;
 	    case 'v':
 	    case 'g':
 		v = va_arg (args, Value);

Index: nickle.h
===================================================================
RCS file: /local/src/CVS/nickle/nickle.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- nickle.h	25 Oct 2003 18:37:08 -0000	1.111
+++ nickle.h	16 Feb 2004 00:15:04 -0000	1.112
@@ -189,8 +189,8 @@
     int		    line;
     NamespacePtr    namespace;
     Type	    *type;
-    unsigned long   ticks;
-    unsigned long   sub_ticks;
+    double_digit    ticks;
+    double_digit    sub_ticks;
 } ExprBase;
 
 typedef struct _exprTree {
@@ -672,8 +672,8 @@
 void	*AllocateTemp (int size);
 
 typedef struct _ProfileData {
-    int	    sub;
-    int	    self;
+    double_digit    sub;
+    double_digit    self;
 } ProfileData;
 
 void	PrettyPrint (Value f, Publish publish, SymbolPtr name);