- Revision
- 1106
- Author
- rfscholte
- Date
- 2011-03-05 08:16:30 -0600 (Sat, 05 Mar 2011)
Log Message
moving memberend
Modified Paths
Diff
Modified: trunk/qdox/src/grammar/parser.y (1105 => 1106)
--- trunk/qdox/src/grammar/parser.y 2011-03-05 13:59:21 UTC (rev 1105) +++ trunk/qdox/src/grammar/parser.y 2011-03-05 14:16:30 UTC (rev 1106) @@ -553,14 +553,6 @@ InterfaceType: classtype; -memberend: - SEMI { - $$ = ""; - } - | CODEBLOCK { - $$ = lexer.getCodeBody(); - }; - static_block: modifiers CODEBLOCK { lexer.getCodeBody(); modifiers.clear(); }; @@ -594,7 +586,7 @@ mth.typeParams = typeParams; mth.returnType = $3; mth.name = $4; - } methoddef Dims_opt Throws_opt memberend { + } methoddef Dims_opt Throws_opt memberend /* =MethodBody */ { mth.dimensions = $7; mth.body = $9; builder.endMethod(mth); @@ -606,7 +598,7 @@ mth.modifiers.addAll(modifiers); modifiers.clear(); mth.returnType = $2; mth.name = $3; - } methoddef Dims_opt Throws_opt memberend { + } methoddef Dims_opt Throws_opt memberend /* =MethodBody */ { mth.dimensions = $6; mth.body = $8; builder.endMethod(mth); @@ -619,7 +611,7 @@ mth.lineNumber = lexer.getLine(); mth.modifiers.addAll(modifiers); modifiers.clear(); mth.constructor = true; mth.name = $2; - } methoddef Throws_opt memberend { + } methoddef Throws_opt memberend /* =MethodBody */ { mth.body = $6; builder.endConstructor(mth); mth = new MethodDef(); @@ -630,12 +622,23 @@ mth.typeParams = typeParams; mth.modifiers.addAll(modifiers); modifiers.clear(); mth.constructor = true; mth.name = $3; - } methoddef Throws_opt memberend { + } methoddef Throws_opt memberend /* =MethodBody */ { mth.body = $7; builder.endConstructor(mth); mth = new MethodDef(); }; +// 8.4.7 Method Body + +memberend: CODEBLOCK + { + $$ = lexer.getCodeBody(); + } + | SEMI + { + $$ = ""; + }; + methoddef: PARENOPEN opt_params PARENCLOSE; // 8.4.6 Method Throws @@ -646,7 +649,7 @@ { mth.exceptions.add($1); } - | ExceptionTypeList COMMA classtype /*ExceptionType*/ + | ExceptionTypeList COMMA classtype /* =ExceptionType */ { mth.exceptions.add($3); };
To unsubscribe from this list please visit:
