[lucy-commits] svn commit: r1188985 - in /incubator/lucy/branches/clownfish_lemon/clownfish/src: CFCLexHeader.l CFCParseHeader.y

[ma...@apache.org]

Author: marvin
Date: Wed Oct 26 00:55:52 2011
New Revision: 1188985

URL: http://svn.apache.org/viewvc?rev=1188985&view=rev
Log:
Differentiate some type names only in lexer.

Since we now always pass the value of the type specifier from the lexer to the
parser, it is no longer necessary to differentiate between certain classes of
type name -- so e.g. all integer type names can share the same terminal token
type.

Modified:
    incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l
    incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y

Modified: incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l
URL: http://svn.apache.org/viewvc/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l?rev=1188985&r1=1188984&r2=1188985&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCLexHeader.l Wed Oct 26 00:55:52 2011
@@ -42,22 +42,22 @@ incremented { PARSE(CFC_TOKENTYPE_INCREM
 decremented { PARSE(CFC_TOKENTYPE_DECREMENTED); } 
 
 void       { PARSE(CFC_TOKENTYPE_VOID); }
-float      { PARSE(CFC_TOKENTYPE_FLOAT); }
-double     { PARSE(CFC_TOKENTYPE_DOUBLE); }
-int8_t     { PARSE(CFC_TOKENTYPE_INT8_T); }
-int16_t    { PARSE(CFC_TOKENTYPE_INT16_T); }
-int32_t    { PARSE(CFC_TOKENTYPE_INT32_T); }
-int64_t    { PARSE(CFC_TOKENTYPE_INT64_T); }
-uint8_t    { PARSE(CFC_TOKENTYPE_UINT8_T); }
-uint16_t   { PARSE(CFC_TOKENTYPE_UINT16_T); }
-uint32_t   { PARSE(CFC_TOKENTYPE_UINT32_T); }
-uint64_t   { PARSE(CFC_TOKENTYPE_UINT64_T); }
-char       { PARSE(CFC_TOKENTYPE_CHAR); }
-short      { PARSE(CFC_TOKENTYPE_SHORT); }
-int        { PARSE(CFC_TOKENTYPE_INT); }
-long       { PARSE(CFC_TOKENTYPE_LONG); }
-size_t     { PARSE(CFC_TOKENTYPE_SIZE_T); }
-bool_t     { PARSE(CFC_TOKENTYPE_BOOL_T); }
+float      { PARSE(CFC_TOKENTYPE_FLOAT_TYPE_NAME); }
+double     { PARSE(CFC_TOKENTYPE_FLOAT_TYPE_NAME); }
+int8_t     { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+int16_t    { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+int32_t    { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+int64_t    { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+uint8_t    { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+uint16_t   { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+uint32_t   { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+uint64_t   { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+char       { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+short      { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+int        { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+long       { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+size_t     { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
+bool_t     { PARSE(CFC_TOKENTYPE_INTEGER_TYPE_NAME); }
 va_list    { PARSE(CFC_TOKENTYPE_VA_LIST); }
 true       { PARSE(CFC_TOKENTYPE_TRUE); }
 false      { PARSE(CFC_TOKENTYPE_FALSE); }

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=1188985&r1=1188984&r2=1188985&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y Wed Oct 26 00:55:52 2011
@@ -502,30 +502,11 @@ type(A) ::= type_qualifier_list(B) type_
     A = S_new_type(state, B, C, NULL, E);
 }
 
-void_type_specifier(A)    ::= VOID(B).      { A = B; }
-va_list_specifier(A)      ::= VA_LIST(B).   { A = B; }
-integer_type_specifier(A) ::= INT8_T(B).    { A = B; }
-integer_type_specifier(A) ::= INT16_T(B).   { A = B; }
-integer_type_specifier(A) ::= INT32_T(B).   { A = B; }
-integer_type_specifier(A) ::= INT64_T(B).   { A = B; }
-integer_type_specifier(A) ::= UINT8_T(B).   { A = B; }
-integer_type_specifier(A) ::= UINT16_T(B).  { A = B; }
-integer_type_specifier(A) ::= UINT32_T(B).  { A = B; }
-integer_type_specifier(A) ::= UINT64_T(B).  { A = B; }
-integer_type_specifier(A) ::= CHAR(B).      { A = B; }
-integer_type_specifier(A) ::= SHORT(B).     { A = B; }
-integer_type_specifier(A) ::= INT(B).       { A = B; }
-integer_type_specifier(A) ::= LONG(B).      { A = B; }
-integer_type_specifier(A) ::= SIZE_T(B).    { A = B; }
-integer_type_specifier(A) ::= BOOL_T(B).    { A = B; }
-float_type_specifier(A)   ::= FLOAT(B).     { A = B; }
-float_type_specifier(A)   ::= DOUBLE(B).    { A = B; }
-
-type_name(A) ::= void_type_specifier(B).     { A = B; }
-type_name(A) ::= va_list_specifier(B).       { A = B; }
-type_name(A) ::= integer_type_specifier(B).  { A = B; }
-type_name(A) ::= float_type_specifier(B).    { A = B; }
-type_name(A) ::= IDENTIFIER(B).              { A = B; }
+type_name(A) ::= VOID(B).               { A = B; }
+type_name(A) ::= VA_LIST(B).            { A = B; }
+type_name(A) ::= INTEGER_TYPE_NAME(B).  { A = B; }
+type_name(A) ::= FLOAT_TYPE_NAME(B).    { A = B; }
+type_name(A) ::= IDENTIFIER(B).         { A = B; }
 
 exposure_specifier(A) ::= PUBLIC(B).  { A = B; }
 exposure_specifier(A) ::= PRIVATE(B). { A = B; }