From: <nu...@us...> - 2010-09-28 20:50:51
|
Revision: 13202 http://pcgen.svn.sourceforge.net/pcgen/?rev=13202&view=rev Author: nuance Date: 2010-09-28 20:50:44 +0000 (Tue, 28 Sep 2010) Log Message: ----------- Fix tiny whitespace niggles. Modified Paths: -------------- sandbox/FormulaCompiler/src/pcgen/core/formula/parse/formula.jjt Modified: sandbox/FormulaCompiler/src/pcgen/core/formula/parse/formula.jjt =================================================================== --- sandbox/FormulaCompiler/src/pcgen/core/formula/parse/formula.jjt 2010-09-28 20:02:15 UTC (rev 13201) +++ sandbox/FormulaCompiler/src/pcgen/core/formula/parse/formula.jjt 2010-09-28 20:50:44 UTC (rev 13202) @@ -172,7 +172,8 @@ OperatorStrings greaterThanToken() #void : { Token t; } - { t=<GT> + { + t=<GT> { OperatorStrings Os = new OperatorStrings(t.image, GT_STRING); return Os; } } @@ -236,7 +237,7 @@ #void : { OperatorStrings image; } { unaryExpr() - ( + ( image = geometricFtn() unaryExpr() #Geometric(2) { ((SimpleNode) jjtree.peekNode()).setOperator(image); } )* @@ -255,7 +256,7 @@ OperatorStrings multToken() #void : { Token t; } - { + { t=<MULT> { OperatorStrings Os = new OperatorStrings(t.image, MUL_STRING); return Os;} } @@ -281,12 +282,12 @@ #void : { Token t = null; } { ( t=<MINUS> )? exponExpr() #Unary(t != null) - { + { if (t != null) { - OperatorStrings Os = new OperatorStrings(t.image, NEG_STRING); - ((SimpleNode) jjtree.peekNode()).setOperator(Os); + OperatorStrings Os = new OperatorStrings(t.image, NEG_STRING); + ((SimpleNode) jjtree.peekNode()).setOperator(Os); } - } + } } /****************************************************************************** @@ -298,10 +299,10 @@ primitiveExpr() ( t=<POW> primitiveExpr() - { - OperatorStrings Os = new OperatorStrings(t.image, EXP_STRING); - jjtThis.setOperator(Os); - } + { + OperatorStrings Os = new OperatorStrings(t.image, EXP_STRING); + jjtThis.setOperator(Os); + } )* } @@ -312,8 +313,8 @@ void primitiveExpr() #void : {} { - parenExpr() | - numberExpr() | + parenExpr() | + numberExpr() | lookupExpr() } @@ -332,8 +333,8 @@ #Num : { Token t1 = null, t2 = null, t3 = null; } { ( - (t1 = <INT> ( LOOKAHEAD(2) t2 = <FULLSTOP> t3 = <INT>)? ) | - (t1 = <FULLSTOP> t2 = <INT>) + (t1 = <INT> ( LOOKAHEAD(2) t2 = <FULLSTOP> t3 = <INT>)? ) | + (t1 = <FULLSTOP> t2 = <INT>) ) { String image; @@ -388,7 +389,7 @@ #PCGenBracket : { Token t1, t2; } { t1=<OPENBRACKET> dotSeparatedWords() ( parenGroup() )? t2=<CLOSEBRACKET> - { + { OperatorStrings Os1 = new OperatorStrings(t1.image, BOP_STRING); OperatorStrings Os2 = new OperatorStrings(t2.image, BCL_STRING); jjtThis.setBalancedPair(Os1, Os2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |