[Commit] nickle ChangeLog,1.68,1.69 gram.y,1.136,1.137

[Keith Packard]

Committed by: keithp

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

Modified Files:
	ChangeLog gram.y 
Log Message:
2004-06-17  Keith Packard  <keithp at keithp.com>

	* gram.y:
	Update conflict comment to note new reduce/reduce
	conflicts caused by accepting ** and && as unary operators


Index: ChangeLog
===================================================================
RCS file: /local/src/CVS/nickle/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ChangeLog	17 Jun 2004 20:30:47 -0000	1.68
+++ ChangeLog	17 Jun 2004 20:46:09 -0000	1.69
@@ -1,5 +1,11 @@
 2004-06-17  Keith Packard  <keithp at keithp.com>
 
+	* gram.y:
+	Update conflict comment to note new reduce/reduce
+	conflicts caused by accepting ** and && as unary operators
+
+2004-06-17  Keith Packard  <keithp at keithp.com>
+
 	* compile.c: (CompileLvalue):
 	Handle nested & in Lvalues with auto_reference so that &&7 works.
 	* gram.y:

Index: gram.y
===================================================================
RCS file: /local/src/CVS/nickle/gram.y,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- gram.y	17 Jun 2004 20:30:47 -0000	1.136
+++ gram.y	17 Jun 2004 20:46:09 -0000	1.137
@@ -11,19 +11,21 @@
 #include	<stdio.h>
 
 /*
- * This grammar generates 2 reduce/reduce and 4 shift/reduce conflicts:
+ * This grammar generates 4 reduce/reduce and 4 shift/reduce conflicts:
  * 
- * reduce/reduce conflict on:
+ * reduce/reduce conflicts on:
  *
- *	    *int . func
+ *	    *int . func 
+ *	    **int . func
  *
  *	Is the '*' a dereference operator or a pointer type modifier?
  *	The grammar is ordered to make this a type modifier since
  *	the other way is less common.  Use parens when you want this.
  *
- *  reduce/reduce conflict on:
+ *  reduce/reduce conflicts on:
  *
  *	   &int . func
+ *	   &&int . func
  *
  *	Is the '&' a reference operator or a reference type modifier?
  *	The grammar is ordered to make this a type modifier since