You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/10/21 04:46:42 UTC
[lucy-commits] svn commit: r1187170 -
/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y
Author: marvin
Date: Fri Oct 21 02:46:41 2011
New Revision: 1187170
URL: http://svn.apache.org/viewvc?rev=1187170&view=rev
Log:
Change type_qualifier_list to avoid shift-reduce conflicts.
Modified:
incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y
Modified: incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y?rev=1187170&r1=1187169&r2=1187170&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y Fri Oct 21 02:46:41 2011
@@ -377,11 +377,15 @@ type_qualifier(A) ::= NULLABLE. { A =
type_qualifier(A) ::= INCREMENTED. { A = CFCTYPE_INCREMENTED; }
type_qualifier(A) ::= DECREMENTED. { A = CFCTYPE_DECREMENTED; }
-type_qualifier_list(A) ::= type_qualifier(B). { A = B; }
-type_qualifier_list(A) ::= type_qualifier_list CONST. { A |= CFCTYPE_CONST; }
-type_qualifier_list(A) ::= type_qualifier_list NULLABLE. { A |= CFCTYPE_NULLABLE; }
-type_qualifier_list(A) ::= type_qualifier_list INCREMENTED. { A |= CFCTYPE_INCREMENTED; }
-type_qualifier_list(A) ::= type_qualifier_list DECREMENTED. { A |= CFCTYPE_DECREMENTED; }
+type_qualifier_list(A) ::= type_qualifier(B).
+{
+ A = B;
+}
+type_qualifier_list(A) ::= type_qualifier_list(B) type_qualifier(C).
+{
+ A = B;
+ A |= C;
+}
declaration_modifier(A) ::= INERT. { A = CFCUtil_strdup("inert"); }
declaration_modifier(A) ::= INLINE. { A = CFCUtil_strdup("inline"); }