[lucy-commits] svn commit: r1327671 - /lucy/trunk/clownfish/src/CFCParseHeader.y

[nw...@apache.org]

Author: nwellnhof
Date: Wed Apr 18 20:35:45 2012
New Revision: 1327671

URL: http://svn.apache.org/viewvc?rev=1327671&view=rev
Log:
Simplify previous commit

Parcel can be derived from exposure.

Modified:
    lucy/trunk/clownfish/src/CFCParseHeader.y

Modified: lucy/trunk/clownfish/src/CFCParseHeader.y
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCParseHeader.y?rev=1327671&r1=1327670&r2=1327671&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCParseHeader.y (original)
+++ lucy/trunk/clownfish/src/CFCParseHeader.y Wed Apr 18 20:35:45 2012
@@ -54,8 +54,8 @@ S_start_class(CFCParser *state, CFCDocuC
 }
 
 static CFCVariable*
-S_new_var(CFCParser *state, CFCParcel *parcel, char *exposure, char *modifiers,
-          CFCType *type, char *name) {
+S_new_var(CFCParser *state, char *exposure, char *modifiers, CFCType *type,
+          char *name) {
     int inert = false;
     if (modifiers) {
         if (strcmp(modifiers, "inert") != 0) {
@@ -64,9 +64,11 @@ S_new_var(CFCParser *state, CFCParcel *p
         inert = true;
     }
 
-    const char *class_name = NULL;
+    CFCParcel  *parcel      = NULL;
+    const char *class_name  = NULL;
     const char *class_cnick = NULL;
     if (exposure && strcmp(exposure, "local") != 0) {
+        parcel      = CFCParser_get_parcel(state);
         class_name  = CFCParser_get_class_name(state);
         class_cnick = CFCParser_get_class_cnick(state);
     }
@@ -408,28 +410,26 @@ class_defs(A) ::= class_defs(B) subrouti
 var_declaration_statement(A) ::= 
     type(D) declarator(E) SEMICOLON.
 {
-    A = S_new_var(state, CFCParser_get_parcel(state),
-                  CFCParser_dupe(state, "parcel"), NULL, D, E);
+    A = S_new_var(state, CFCParser_dupe(state, "parcel"), NULL, D, E);
 }
 var_declaration_statement(A) ::= 
     exposure_specifier(B)
     type(D) declarator(E) SEMICOLON.
 {
-    A = S_new_var(state, CFCParser_get_parcel(state), B, NULL, D, E);
+    A = S_new_var(state, B, NULL, D, E);
 }
 var_declaration_statement(A) ::= 
     declaration_modifier_list(C)
     type(D) declarator(E) SEMICOLON.
 {
-    A = S_new_var(state, CFCParser_get_parcel(state),
-                  CFCParser_dupe(state, "parcel"), C, D, E);
+    A = S_new_var(state, CFCParser_dupe(state, "parcel"), C, D, E);
 }
 var_declaration_statement(A) ::= 
     exposure_specifier(B)
     declaration_modifier_list(C)
     type(D) declarator(E) SEMICOLON.
 {
-    A = S_new_var(state, CFCParser_get_parcel(state), B, C, D, E);
+    A = S_new_var(state, B, C, D, E);
 }
 
 subroutine_declaration_statement(A) ::= 
@@ -591,7 +591,7 @@ declarator(A) ::= IDENTIFIER(B).
 
 param_variable(A) ::= type(B) declarator(C).
 {
-    A = S_new_var(state, NULL, NULL, NULL, B, C);
+    A = S_new_var(state, NULL, NULL, B, C);
 }
 
 param_list(A) ::= LEFT_PAREN RIGHT_PAREN.