<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/java/uk/co/badgersinfoil/metaas/<a href="#file1">ActionScriptFactory.java</a></tt> </td><td></td><td align="right" id="added">+24</td><td align="right" id="removed">-7</td><td nowrap="nowrap" align="center">596 -> 597</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASConditionalExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+16</td><td></td><td nowrap="nowrap" align="right">added 597</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3"><span id="added">ASTASConditionalExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+40</td><td></td><td nowrap="nowrap" align="right">added 597</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">ASTASExpression.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td></td><td nowrap="nowrap" align="center">596 -> 597</td></tr>
<tr><td><tt> /<a href="#file5">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+27</td><td></td><td nowrap="nowrap" align="center">596 -> 597</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">ExpressionBuilder.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center">596 -> 597</td></tr>
<tr><td><tt> /<a href="#file7">TokenBuilder.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td></td><td nowrap="nowrap" align="center">596 -> 597</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file8"><span id="added">ConditionalExpressionTests.java</span></a></tt> </td><td></td><td align="right" id="added">+65</td><td></td><td nowrap="nowrap" align="right">added 597</td></tr>
<tr><td></td><td></td><td align="right" id="added">+182</td><td align="right" id="removed">-7</td><td></td></tr>
</table>
<small id="info">3 added + 5 modified, total 8 files</small><br />
<pre class="comment">
support for conditional-expressions
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>ActionScriptFactory.java</b></big> <small id="info">596 -> 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-17 21:18:20 UTC (rev 596)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -14,6 +14,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASBooleanLiteral;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASConditionalExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASExpression;
import uk.co.badgersinfoil.metaas.dom.ASFieldAccessExpression;
import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
</pre><pre class="diff"><small id="info">@@ -26,6 +27,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.AS3FragmentParser;
import uk.co.badgersinfoil.metaas.impl.ASTASArrayAccessExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASBooleanLiteral;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASConditionalExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASFieldAccessExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASInvocationExpression;
</pre><pre class="diff"><small id="info">@@ -246,7 +248,7 @@
</small></pre><pre class="diff" id="context">
private ASPrefixExpression newPrefixExpression(LinkedListToken op, ASExpression sub) {
LinkedListTree ast = ASTUtils.newAST(op);
</pre><pre class="diff" id="removed">- LinkedListTree subExpr = ((ASTASExpression)sub).getAST();
</pre><pre class="diff" id="added">+ LinkedListTree subExpr = ast(sub);
</pre><pre class="diff" id="context"> ASTBuilder.assertNoParent("sub-expression", subExpr);
ast.addChildWithTokens(subExpr);
return new ASTASPrefixExpression(ast);
</pre><pre class="diff"><small id="info">@@ -274,7 +276,7 @@
</small></pre><pre class="diff" id="context">
private ASPostfixExpression newPostfixExpression(LinkedListToken op, ASExpression sub) {
LinkedListTree ast = ASTUtils.newAST(op);
</pre><pre class="diff" id="removed">- LinkedListTree subExpr = ((ASTASExpression)sub).getAST();
</pre><pre class="diff" id="added">+ LinkedListTree subExpr = ast(sub);
</pre><pre class="diff" id="context"> ASTBuilder.assertNoParent("sub-expression", subExpr);
ast.addChild(subExpr);
ast.setStartToken(subExpr.getStartToken());
</pre><pre class="diff"><small id="info">@@ -293,7 +295,7 @@
</small></pre><pre class="diff" id="context"> public ASNewExpression newNewExpression(ASExpression subexpression, List args) {
LinkedListTree ast = ASTUtils.newAST(AS3Parser.NEW, "new");
ast.appendToken(TokenBuilder.newSpace());
</pre><pre class="diff" id="removed">- LinkedListTree subExpr = ((ASTASExpression)subexpression).getAST();
</pre><pre class="diff" id="added">+ LinkedListTree subExpr = ast(subexpression);
</pre><pre class="diff" id="context"> ASTBuilder.assertNoParent("sub-expression", subExpr);
// TODO: recursively check the given subexpression
ast.addChildWithTokens(subExpr);
</pre><pre class="diff"><small id="info">@@ -306,7 +308,7 @@
</small></pre><pre class="diff" id="context">
public ASInvocationExpression newInvocationExpression(ASExpression sub, List args) {
LinkedListTree ast = ASTUtils.newImaginaryAST(AS3Parser.METHOD_CALL);
</pre><pre class="diff" id="removed">- LinkedListTree subExpr = ((ASTASExpression)sub).getAST();
</pre><pre class="diff" id="added">+ LinkedListTree subExpr = ast(sub);
</pre><pre class="diff" id="context"> ASTBuilder.assertNoParent("sub-expression", subExpr);
// TODO: recursively check the given subexpression
ast.addChildWithTokens(subExpr);
</pre><pre class="diff"><small id="info">@@ -321,12 +323,12 @@
</small></pre><pre class="diff" id="context"> ASExpression subscript)
{
LinkedListTree ast = ASTUtils.newImaginaryAST(AS3Parser.ARRAY_ACC);
</pre><pre class="diff" id="removed">- LinkedListTree targetExpr = ((ASTASExpression)target).getAST();
</pre><pre class="diff" id="added">+ LinkedListTree targetExpr = ast(target);
</pre><pre class="diff" id="context"> ASTBuilder.assertNoParent("target expression", targetExpr);
// TODO: recursively check the given subexpression
ast.addChildWithTokens(targetExpr);
ast.appendToken(TokenBuilder.newLBrack());
</pre><pre class="diff" id="removed">- LinkedListTree subscriptExpr = ((ASTASExpression)subscript).getAST();
</pre><pre class="diff" id="added">+ LinkedListTree subscriptExpr = ast(subscript);
</pre><pre class="diff" id="context"> ASTBuilder.assertNoParent("subscript expression", subscriptExpr);
ast.addChildWithTokens(subscriptExpr);
ast.appendToken(TokenBuilder.newRBrack());
</pre><pre class="diff"><small id="info">@@ -420,8 +422,23 @@
</small></pre><pre class="diff" id="context">
public ASFieldAccessExpression newFieldAccessExpression(ASExpression target, String name) {
LinkedListTree ast
</pre><pre class="diff" id="removed">- = ASTBuilder.newFieldAccessExpression(((ASTASExpression)target).getAST(),
</pre><pre class="diff" id="added">+ = ASTBuilder.newFieldAccessExpression(ast(target),
</pre><pre class="diff" id="context"> ASTUtils.newAST(AS3Parser.IDENT, name));
return new ASTASFieldAccessExpression(ast);
}
</pre><pre class="diff" id="added">+
+ public ASConditionalExpression newConditionalExpression(ASExpression conditionExpr,
+ ASExpression thenExpr,
+ ASExpression elseExpr)
+ {
+ LinkedListTree ast
+ = ASTBuilder.newConditionalExpression(ast(conditionExpr),
+ ast(thenExpr),
+ ast(elseExpr));
+ return new ASTASConditionalExpression(ast);
+ }
+
+ private LinkedListTree ast(ASExpression expr) {
+ return ((ASTASExpression)expr).getAST();
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname" id="added">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader" id="added"><big><b>ASConditionalExpression.java</b></big> <small id="info">added at 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASConditionalExpression.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASConditionalExpression.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -0,0 +1,16 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASConditionalExpression extends ASExpression {
+
+ public ASExpression getConditionExpression();
+
+ public ASExpression getThenExpression();
+
+ public ASExpression getElseExpression();
+
+ public void setConditionExpression(ASExpression expr);
+
+ public void setThenExpression(ASExpression expr);
+
+ public void setElseExpression(ASExpression expr);
+}
</pre></div>
<hr /><a name="file3" /><div class="file">
<span class="pathname" id="added">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader" id="added"><big><b>ASTASConditionalExpression.java</b></big> <small id="info">added at 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASConditionalExpression.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASConditionalExpression.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -0,0 +1,40 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASConditionalExpression;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASConditionalExpression extends ASTASExpression implements ASConditionalExpression {
+
+ private static final int INDEX_COND = 0;
+ private static final int INDEX_THEN = 1;
+ private static final int INDEX_ELSE = 2;
+
+ public ASTASConditionalExpression(LinkedListTree ast) {
+ super(ast);
+ }
+
+ public ASExpression getConditionExpression() {
+ return ExpressionBuilder.build(ast.getFirstChild());
+ }
+
+ public ASExpression getThenExpression() {
+ return ExpressionBuilder.build((LinkedListTree)ast.getChild(INDEX_THEN));
+ }
+
+ public ASExpression getElseExpression() {
+ return ExpressionBuilder.build(ast.getLastChild());
+ }
+
+ public void setConditionExpression(ASExpression expr) {
+ ast.setChildWithTokens(INDEX_COND, ast(expr));
+ }
+
+ public void setThenExpression(ASExpression expr) {
+ ast.setChildWithTokens(INDEX_THEN, ast(expr));
+ }
+
+ public void setElseExpression(ASExpression expr) {
+ ast.setChildWithTokens(INDEX_ELSE, ast(expr));
+ }
+}
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTASExpression.java</b></big> <small id="info">596 -> 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASExpression.java 2008-01-17 21:18:20 UTC (rev 596)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASExpression.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -28,4 +28,8 @@
</small></pre><pre class="diff" id="context"> public int hashCode() {
return ast.hashCode();
}
</pre><pre class="diff" id="added">+
+ protected static LinkedListTree ast(ASExpression expr) {
+ return ((ASTASExpression)expr).getAST();
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file5" /><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">596 -> 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-17 21:18:20 UTC (rev 596)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -554,4 +554,31 @@
</small></pre><pre class="diff" id="context"> ast.setStopToken(name.getStopToken());
return ast;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newConditionalExpression(LinkedListTree conditionExpr,
+ LinkedListTree thenExpr,
+ LinkedListTree elseExpr)
+ {
+ LinkedListToken op = TokenBuilder.newQuestion();
+ LinkedListToken colon = TokenBuilder.newColon();
+ LinkedListTree ast = ASTUtils.newAST(op);
+ // don't use addChildWithTokens(); special handling below,
+ ast.addChild(conditionExpr);
+ conditionExpr.getStopToken().setNext(op);
+ ast.addChild(thenExpr);
+ thenExpr.getStartToken().setPrev(op);
+ thenExpr.getStopToken().setNext(colon);
+ ast.addChild(elseExpr);
+ elseExpr.getStartToken().setPrev(colon);
+ ast.setStartToken(conditionExpr.getStartToken());
+ ast.setStopToken(elseExpr.getStopToken());
+ spaceEitherSide(op);
+ spaceEitherSide(colon);
+ return ast;
+ }
+
+ private static void spaceEitherSide(LinkedListToken token) {
+ token.beforeInsert(TokenBuilder.newSpace());
+ token.afterInsert(TokenBuilder.newSpace());
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file6" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ExpressionBuilder.java</b></big> <small id="info">596 -> 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-17 21:18:20 UTC (rev 596)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -72,6 +72,8 @@
</small></pre><pre class="diff" id="context"> return new ASTASArrayAccessExpression(ast);
case AS3Parser.NEW:
return new ASTASNewExpression(ast);
</pre><pre class="diff" id="added">+ case AS3Parser.QUESTION:
+ return new ASTASConditionalExpression(ast);
</pre><pre class="diff" id="context"> default:
throw new IllegalArgumentException("unhandled expression node type: "+ASTUtils.tokenName(ast));
}
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>TokenBuilder.java</b></big> <small id="info">596 -> 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/TokenBuilder.java 2008-01-17 21:18:20 UTC (rev 596)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/TokenBuilder.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -257,4 +257,8 @@
</small></pre><pre class="diff" id="context"> public static LinkedListToken newDot() {
return newToken(AS3Parser.DOT, ".");
}
</pre><pre class="diff" id="added">+
+ public static LinkedListToken newQuestion() {
+ return newToken(AS3Parser.QUESTION, "?");
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file8" /><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>ConditionalExpressionTests.java</b></big> <small id="info">added at 597</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/ConditionalExpressionTests.java (rev 0)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/ConditionalExpressionTests.java 2008-01-17 21:23:15 UTC (rev 597)
@@ -0,0 +1,65 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas;
+
+import java.io.IOException;
+import uk.co.badgersinfoil.metaas.dom.ASClassType;
+import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
+import uk.co.badgersinfoil.metaas.dom.ASConditionalExpression;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASFieldAccessExpression;
+import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASMethod;
+import uk.co.badgersinfoil.metaas.dom.Visibility;
+import junit.framework.TestCase;
+
+public class ConditionalExpressionTests extends TestCase {
+ private ASConditionalExpression conditionalExpr = null;
+ private ActionScriptFactory fact = new ActionScriptFactory();
+ private ASCompilationUnit unit;
+ private ASCompilationUnit reflect;
+
+ protected void setUp() {
+ unit = fact.newClass("Test");
+ reflect = null;
+ conditionalExpr = null;
+ }
+
+ protected void tearDown() throws IOException {
+ if (reflect == null) {
+ ASClassType clazz = (ASClassType)unit.getType();
+ ASMethod meth = clazz.newMethod("test", Visibility.PUBLIC, null);
+ meth.newExprStmt(conditionalExpr);
+ reflect = assertReflection();
+ }
+ }
+
+ private ASCompilationUnit assertReflection() throws IOException {
+ return CodeMirror.assertReflection(fact, unit);
+ }
+
+ public void testBasic() {
+ ASExpression conditionExpr = fact.newExpression("a.b");
+ ASExpression thenExpr = fact.newExpression("1");
+ ASExpression elseExpr = fact.newExpression("2");
+ conditionalExpr = fact.newConditionalExpression(conditionExpr, thenExpr, elseExpr);
+ ExtraAssertions.assertInstanceof(conditionalExpr.getConditionExpression(), ASFieldAccessExpression.class);
+ ExtraAssertions.assertInstanceof(conditionalExpr.getThenExpression(), ASIntegerLiteral.class);
+ ExtraAssertions.assertInstanceof(conditionalExpr.getElseExpression(), ASIntegerLiteral.class);
+ }
+
+ public void testParse() {
+ conditionalExpr = (ASConditionalExpression)fact.newExpression("a.b ? 1 : 2");
+ ExtraAssertions.assertInstanceof(conditionalExpr.getConditionExpression(), ASFieldAccessExpression.class);
+ ExtraAssertions.assertInstanceof(conditionalExpr.getThenExpression(), ASIntegerLiteral.class);
+ ExtraAssertions.assertInstanceof(conditionalExpr.getElseExpression(), ASIntegerLiteral.class);
+ }
+
+ public void testSetters() {
+ ASExpression conditionExpr = fact.newExpression("a.b");
+ ASExpression thenExpr = fact.newExpression("1");
+ ASExpression elseExpr = fact.newExpression("2");
+ conditionalExpr = fact.newConditionalExpression(conditionExpr, thenExpr, elseExpr);
+ conditionalExpr.setConditionExpression(fact.newBooleanLiteral(true));
+ conditionalExpr.setThenExpression(fact.newIntegerLiteral(3));
+ conditionalExpr.setElseExpression(fact.newIntegerLiteral(4));
+ }
+}
</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>