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/25 08:45:24 UTC
[lucy-commits] svn commit: r1188533 -
/incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y
Author: marvin
Date: Tue Oct 25 06:45:24 2011
New Revision: 1188533
URL: http://svn.apache.org/viewvc?rev=1188533&view=rev
Log:
Change the default token type to char*.
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=1188533&r1=1188532&r2=1188533&view=diff
==============================================================================
--- incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y (original)
+++ incubator/lucy/branches/clownfish_lemon/clownfish/src/CFCParseHeader.y Tue Oct 25 06:45:24 2011
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-%token_type { CFCBase* }
-%token_destructor { CFCBase_decref((CFCBase*)$$); }
+%token_type {char*}
+%token_destructor { FREEMEM($$); }
%token_prefix CFC_TOKENTYPE_
%extra_argument { CFCParser *state }
@@ -217,6 +217,50 @@ S_new_type(CFCParser *state, int flags,
CFCParser_set_text(state, NULL, 0);
}
+%type result {CFCBase*}
+%type file {CFCBase*}
+%type major_block {CFCBase*}
+%type parcel_definition {CFCBase*}
+%type class_declaration {CFCBase*}
+%type class_head {CFCBase*}
+%type class_defs {CFCBase*}
+%type var_declaration_statement {CFCBase*}
+%type subroutine_declaration_statement {CFCBase*}
+%type type {CFCBase*}
+%type param_variable {CFCBase*}
+%type param_list {CFCBase*}
+%type param_list_elems {CFCBase*}
+%type docucomment {CFCBase*}
+%type cblock {CFCBase*}
+%type void_type_specifier {const char*}
+%type va_list_specifier {const char*}
+%type float_type_specifier {const char*}
+%type integer_type_specifier {const char*}
+%type type_qualifier {int}
+%type type_qualifier_list {int}
+
+%destructor result { CFCBase_decref((CFCBase*)$$); }
+%destructor file { CFCBase_decref((CFCBase*)$$); }
+%destructor major_block { CFCBase_decref((CFCBase*)$$); }
+%destructor parcel_definition { CFCBase_decref((CFCBase*)$$); }
+%destructor class_declaration { CFCBase_decref((CFCBase*)$$); }
+%destructor class_head { CFCBase_decref((CFCBase*)$$); }
+%destructor class_defs { CFCBase_decref((CFCBase*)$$); }
+%destructor var_declaration_statement { CFCBase_decref((CFCBase*)$$); }
+%destructor subroutine_declaration_statement { CFCBase_decref((CFCBase*)$$); }
+%destructor type { CFCBase_decref((CFCBase*)$$); }
+%destructor param_variable { CFCBase_decref((CFCBase*)$$); }
+%destructor param_list { CFCBase_decref((CFCBase*)$$); }
+%destructor param_list_elems { CFCBase_decref((CFCBase*)$$); }
+%destructor docucomment { CFCBase_decref((CFCBase*)$$); }
+%destructor cblock { CFCBase_decref((CFCBase*)$$); }
+%destructor void_type_specifier { }
+%destructor va_list_specifier { }
+%destructor float_type_specifier { }
+%destructor integer_type_specifier { }
+%destructor type_qualifier { }
+%destructor type_qualifier_list { }
+
/* Temporary. */
result ::= type(A). { CFCParser_set_result(state, A); }
result ::= param_list(A). { CFCParser_set_result(state, A); }
@@ -440,57 +484,6 @@ type(A) ::= type_qualifier_list(B) type_
A = S_new_type(state, B, C, NULL, E);
}
-%type identifier {char*}
-%type type_name {char*}
-%type exposure_specifier {char*}
-%type void_type_specifier {const char*}
-%type va_list_specifier {const char*}
-%type float_type_specifier {const char*}
-%type integer_type_specifier {const char*}
-%type object_type_specifier {char*}
-%type type_qualifier {int}
-%type type_qualifier_list {int}
-%type declaration_modifier {char*}
-%type declaration_modifier_list {char*}
-%type scalar_constant {char*}
-%type integer_literal {char*}
-%type float_literal {char*}
-%type hex_literal {char*}
-%type string_literal {char*}
-%type asterisk_postfix {char*}
-%type array_postfix {char*}
-%type array_postfix_elem {char*}
-%type declarator {char*}
-%type qualified_id {char*}
-%type class_inheritance {char*}
-%type cnick {char*}
-%type blob {char*}
-%destructor identifier { FREEMEM($$); }
-%destructor type_name { FREEMEM($$); }
-%destructor exposure_specifier { FREEMEM($$); }
-%destructor void_type_specifier { }
-%destructor va_list_specifier { }
-%destructor float_type_specifier { }
-%destructor integer_type_specifier { }
-%destructor object_type_specifier { FREEMEM($$); }
-%destructor type_qualifier { }
-%destructor type_qualifier_list { }
-%destructor declaration_modifier { FREEMEM($$); }
-%destructor declaration_modifier_list { FREEMEM($$); }
-%destructor scalar_constant { FREEMEM($$); }
-%destructor integer_literal { FREEMEM($$); }
-%destructor float_literal { FREEMEM($$); }
-%destructor hex_literal { FREEMEM($$); }
-%destructor string_literal { FREEMEM($$); }
-%destructor asterisk_postfix { FREEMEM($$); }
-%destructor array_postfix { FREEMEM($$); }
-%destructor array_postfix_elem { FREEMEM($$); }
-%destructor declarator { FREEMEM($$); }
-%destructor qualified_id { FREEMEM($$); }
-%destructor class_inheritance { FREEMEM($$); }
-%destructor cnick { FREEMEM($$); }
-%destructor blob { FREEMEM($$); }
-
void_type_specifier(A) ::= VOID. { A = KW_VOID; }
va_list_specifier(A) ::= VA_LIST. { A = KW_VA_LIST; }
integer_type_specifier(A) ::= INT8_T. { A = KW_INT8_T; }