<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#copied {background-color:#ccccff;}
tr.alt #copied {background-color:#bbbbf7;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="5">Commit in <b><tt>metaas/trunk/src</tt></b></td></tr>
<tr><td><tt>main/antlr/org/asdt/core/internal/antlr/<a href="#file1">AS3.g3</a></tt> </td><td></td><td align="right" id="added">+10</td><td align="right" id="removed">-6</td><td nowrap="nowrap" align="center">522 -> 523</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file2">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+71</td><td></td><td nowrap="nowrap" align="center">522 -> 523</td></tr>
<tr><td><tt> /<a href="#file3">ASTUtils.java</a></tt> </td><td></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="center">522 -> 523</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file4"><span id="added">OperatorPrecedenceTests.java</span></a></tt> </td><td></td><td align="right" id="added">+39</td><td></td><td nowrap="nowrap" align="right">added 523</td></tr>
<tr><td></td><td></td><td align="right" id="added">+121</td><td align="right" id="removed">-6</td><td></td></tr>
</table>
<small id="info">1 added + 3 modified, total 4 files</small><br />
<pre class="comment">
auto-parenthesise terms in expressions to maintain correct operator precedence
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/antlr/org/asdt/core/internal/antlr</span><br />
<div class="fileheader"><big><b>AS3.g3</b></big> <small id="info">522 -> 523</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2007-09-01 23:57:56 UTC (rev 522)
+++ trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2007-09-02 00:35:23 UTC (rev 523)
@@ -656,8 +656,8 @@
</small></pre><pre class="diff" id="context"> typeExpression
: c=COLON
// TODO: identifier allows namespaces, and I suspect a type:spec shouldn't
</pre><pre class="diff" id="removed">- (identifier | 'void' | STAR)
- -> ^(TYPE_SPEC[$c] identifier? 'void'? STAR?)
</pre><pre class="diff" id="added">+ (identifier | VOID | STAR)
+ -> ^(TYPE_SPEC[$c] identifier? VOID? STAR?)
</pre><pre class="diff" id="context">
identifier
</pre><pre class="diff"><small id="info">@@ -923,7 +923,7 @@
</small></pre><pre class="diff" id="context">
relationalOperator
: {$InOperator::allowed}? IN
</pre><pre class="diff" id="removed">- | LT | GT | LE | GE | IS | AS | <span id="removedchars">'instanceof'</span>
</pre><pre class="diff" id="added">+ | LT | GT | LE | GE | IS | AS | <span id="addedchars">INSTANCEOF</span>
</pre><pre class="diff" id="context">
// bit shift expressions (level 4)
</pre><pre class="diff"><small id="info">@@ -968,9 +968,9 @@
</small></pre><pre class="diff" id="context">
unaryExpressionNotPlusMinus
</pre><pre class="diff" id="removed">- : 'delete' postfixExpression -> ^('delete' postfixExpression)
- | 'void' unaryExpression -> ^('void' unaryExpression)
- | 'typeof' unaryExpression -> ^('typeof' unaryExpression)
</pre><pre class="diff" id="added">+ : DELETE postfixExpression -> ^(DELETE postfixExpression)
+ | VOID unaryExpression -> ^(VOID unaryExpression)
+ | TYPEOF unaryExpression -> ^(TYPEOF unaryExpression)
</pre><pre class="diff" id="context"> | LNOT unaryExpression -> ^(LNOT unaryExpression)
| BNOT unaryExpression -> ^(BNOT unaryExpression)
| postfixExpression
</pre><pre class="diff"><small id="info">@@ -1190,6 +1190,10 @@
</small></pre><pre class="diff" id="context"> NULL : 'null';
NEW : 'new';
SUPER : 'super';
</pre><pre class="diff" id="added">+INSTANCEOF : 'instanceof';
+DELETE : 'delete';
+VOID : 'void';
+TYPEOF : 'typeof';
</pre><pre class="diff" id="context">
// OPERATORS
QUESTION : '?'
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTBuilder.java</b></big> <small id="info">522 -> 523</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2007-09-01 23:57:56 UTC (rev 522)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2007-09-02 00:35:23 UTC (rev 523)
@@ -324,6 +324,12 @@
</small></pre><pre class="diff" id="context"> LinkedListTree ast = ASTUtils.newAST(op);
LinkedListTree leftExpr = ((ASTASExpression)left).getAST();
LinkedListTree rightExpr = ((ASTASExpression)right).getAST();
</pre><pre class="diff" id="added">+ if (precidence(ast) < precidence(leftExpr)) {
+ leftExpr = parenthise(leftExpr);
+ }
+ if (precidence(ast) < precidence(rightExpr)) {
+ rightExpr = parenthise(rightExpr);
+ }
</pre><pre class="diff" id="context"> // don't use addChildWithTokens(); special handling below,
ast.addChild(leftExpr);
ast.addChild(rightExpr);
</pre><pre class="diff"><small id="info">@@ -335,4 +341,69 @@
</small></pre><pre class="diff" id="context"> op.afterInsert(TokenBuilder.newSpace());
return new ASTASBinaryExpression(ast);
}
</pre><pre class="diff" id="added">+
+ private static LinkedListTree parenthise(LinkedListTree expr) {
+ LinkedListTree result = ASTUtils.newParentheticAST(AS3Parser.ENCPS_EXPR, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")");
+ result.addChildWithTokens(expr);
+ return result;
+ }
+
+ private static int precidence(LinkedListTree ast) {
+ switch (ast.getType()) {
+ case AS3Parser.ASSIGN:
+ case AS3Parser.STAR_ASSIGN:
+ case AS3Parser.DIV_ASSIGN:
+ case AS3Parser.MOD_ASSIGN:
+ case AS3Parser.PLUS_ASSIGN:
+ case AS3Parser.MINUS_ASSIGN:
+ case AS3Parser.SL_ASSIGN:
+ case AS3Parser.SR_ASSIGN:
+ case AS3Parser.BSR_ASSIGN:
+ case AS3Parser.BAND_ASSIGN:
+ case AS3Parser.BXOR_ASSIGN:
+ case AS3Parser.BOR_ASSIGN:
+ case AS3Parser.LAND_ASSIGN:
+ case AS3Parser.LOR_ASSIGN:
+ return 13;
+ case AS3Parser.QUESTION:
+ return 12;
+ case AS3Parser.LOR:
+ return 11;
+ case AS3Parser.LAND:
+ return 10;
+ case AS3Parser.BOR:
+ return 9;
+ case AS3Parser.BXOR:
+ return 8;
+ case AS3Parser.BAND:
+ return 7;
+ case AS3Parser.STRICT_EQUAL:
+ case AS3Parser.STRICT_NOT_EQUAL:
+ case AS3Parser.NOT_EQUAL:
+ case AS3Parser.EQUAL:
+ return 6;
+ case AS3Parser.IN:
+ case AS3Parser.LT:
+ case AS3Parser.GT:
+ case AS3Parser.LE:
+ case AS3Parser.GE:
+ case AS3Parser.IS:
+ case AS3Parser.AS:
+ case AS3Parser.INSTANCEOF:
+ return 5;
+ case AS3Parser.SL:
+ case AS3Parser.SR:
+ case AS3Parser.BSR:
+ return 4;
+ case AS3Parser.PLUS:
+ case AS3Parser.MINUS:
+ return 3;
+ case AS3Parser.STAR:
+ case AS3Parser.DIV:
+ case AS3Parser.MOD:
+ return 2;
+ default:
+ return 1;
+ }
+ }
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTUtils.java</b></big> <small id="info">522 -> 523</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTUtils.java 2007-09-01 23:57:56 UTC (rev 522)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTUtils.java 2007-09-02 00:35:23 UTC (rev 523)
@@ -52,6 +52,7 @@
</small></pre><pre class="diff" id="context"> case AS3Parser.PARAMS:
case AS3Parser.ANNOTATION_PARAMS:
case AS3Parser.ARGUMENTS:
</pre><pre class="diff" id="added">+ case AS3Parser.ENCPS_EXPR:
</pre><pre class="diff" id="context"> return paramsDelegate;
default:
return basicDelegate;
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname" id="added">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader" id="added"><big><b>OperatorPrecedenceTests.java</b></big> <small id="info">added at 523</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/OperatorPrecedenceTests.java (rev 0)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/OperatorPrecedenceTests.java 2007-09-02 00:35:23 UTC (rev 523)
@@ -0,0 +1,39 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas;
+
+import java.io.StringWriter;
+import uk.co.badgersinfoil.metaas.dom.ASBinaryExpression;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.impl.AS3FragmentParser;
+import uk.co.badgersinfoil.metaas.impl.ASTASExpression;
+import uk.co.badgersinfoil.metaas.impl.ASTPrinter;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+import junit.framework.TestCase;
+
+public class OperatorPrecedenceTests extends TestCase {
+ private ASExpression left;
+ private ASExpression right;
+ private ActionScriptFactory fact = new ActionScriptFactory();
+ private ASBinaryExpression expr;
+
+ public void setUp() {
+ right = fact.newIntegerLiteral(2);
+ expr = null;
+ }
+
+ public void tearDown() {
+ StringWriter buff = new StringWriter();
+ LinkedListTree ast = ((ASTASExpression)expr).getAST();
+ new ASTPrinter(buff).print(ast);
+ LinkedListTree parsed = AS3FragmentParser.parseExpr(buff.toString());
+ CodeMirror.assertASTMatch(ast, parsed);
+ }
+
+ public void testBasic() {
+ left = fact.newAddExpression(fact.newIntegerLiteral(1), fact.newIntegerLiteral(1));
+ // the resulting structure will not be correct unless the
+ // left-hand expression is parenthesised. metaas should add
+ // parenthesis automatically, as required
+ // i.e. (1 + 1) * 2
+ expr = fact.newMultiplyExpression(left, right);
+ }
+}
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>