<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">+11</td><td></td><td nowrap="nowrap" align="center">633 -> 634</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASDescendantExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+8</td><td></td><td nowrap="nowrap" align="right">added 634</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3"><span id="added">ASTASDescendantExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+20</td><td></td><td nowrap="nowrap" align="right">added 634</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+26</td><td></td><td nowrap="nowrap" align="center">633 -> 634</td></tr>
<tr><td><tt> /<a href="#file5">ExpressionBuilder.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center">633 -> 634</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">TokenBuilder.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td></td><td nowrap="nowrap" align="center">633 -> 634</td></tr>
<tr><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file7">E4XTests.java</a></tt> </td><td></td><td align="right" id="added">+21</td><td></td><td nowrap="nowrap" align="center">633 -> 634</td></tr>
<tr><td></td><td></td><td align="right" id="added">+92</td><td></td><td></td></tr>
</table>
<small id="info">2 added + 5 modified, total 7 files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO: is this needed..?</a></li>
</ul></div>
<pre class="comment">
simple support for the E4X descendant accessor operator
</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">633 -> 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-27 18:14:56 UTC (rev 633)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -18,6 +18,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBooleanLiteral;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.dom.ASConditionalExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASDescendantExpression;
</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.ASFunctionExpression;
</pre><pre class="diff"><small id="info">@@ -37,6 +38,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASArrayLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTASBooleanLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTASConditionalExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASDescendantExpression;
</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.ASTASFunctionExpression;
</pre><pre class="diff"><small id="info">@@ -512,4 +514,13 @@
</small></pre><pre class="diff" id="context"> }
return result.toString();
}
</pre><pre class="diff" id="added">+
+ public ASDescendantExpression newDescendantExpression(ASExpression target,
+ ASExpression selector)
+ {
+ LinkedListTree ast
+ = ASTBuilder.newDescendantExpression(ast(target),
+ ast(selector));
+ return new ASTASDescendantExpression(ast);
+ }
</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>ASDescendantExpression.java</b></big> <small id="info">added at 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASDescendantExpression.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASDescendantExpression.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -0,0 +1,8 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASDescendantExpression extends ASExpression {
+
+ public ASExpression getTarget();
+
+ public ASExpression getQuery();
+}
</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>ASTASDescendantExpression.java</b></big> <small id="info">added at 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASDescendantExpression.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASDescendantExpression.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -0,0 +1,20 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASDescendantExpression;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASDescendantExpression extends ASTASExpression implements ASDescendantExpression {
+
+ public ASTASDescendantExpression(LinkedListTree ast) {
+ super(ast);
+ }
+
+ public ASExpression getTarget() {
+ return ExpressionBuilder.build(ast.getFirstChild());
+ }
+
+ public ASExpression getQuery() {
+ return ExpressionBuilder.build(ast.getLastChild());
+ }
+}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></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>ASTBuilder.java</b></big> <small id="info">633 -> 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-27 18:14:56 UTC (rev 633)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -6,7 +6,9 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.metaas.impl;
</pre><pre class="diff" id="added">+import java.util.HashMap;
</pre><pre class="diff" id="context"> import java.util.List;
</pre><pre class="diff" id="added">+import java.util.Map;
</pre><pre class="diff" id="context"> import org.asdt.core.internal.antlr.AS3Parser;
import uk.co.badgersinfoil.metaas.SyntaxException;
import uk.co.badgersinfoil.metaas.dom.ASAssignmentExpression;
</pre><pre class="diff"><small id="info">@@ -16,6 +18,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.Visibility;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.antlr.PlaceholderLinkedListToken;
</pre><pre class="diff" id="context">
/**
</pre><pre class="diff"><small id="info">@@ -626,4 +629,27 @@
</small></pre><pre class="diff" id="context"> thrw.appendToken(TokenBuilder.newSemi());
return thrw;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newDescendantExpression(LinkedListTree target,
+ LinkedListTree selector)
+ {
+ LinkedListToken op = TokenBuilder.newE4XDescendant();
+ LinkedListTree ast = ASTUtils.newAST(op);
+ assertNoParent("left-hand expression", target);
<a name="task1" />+ // <span class="task">TODO</span>: is this needed..?
+ if (precidence(ast) < precidence(target)) {
+ target = parenthise(target);
+ }
+ if (precidence(ast) < precidence(selector)) {
+ selector = parenthise(selector);
+ }
+ // don't use addChildWithTokens(); special handling below,
+ ast.addChild(target);
+ ast.addChild(selector);
+ target.getStopToken().setNext(op);
+ selector.getStartToken().setPrev(op);
+ ast.setStartToken(target.getStartToken());
+ ast.setStopToken(selector.getStopToken());
+ return ast;
+ }
</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>ExpressionBuilder.java</b></big> <small id="info">633 -> 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-27 18:14:56 UTC (rev 633)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -86,6 +86,8 @@
</small></pre><pre class="diff" id="context"> return new ASTASXMLLiteral(ast);
case AS3Parser.REGEXP_LITERAL:
return new ASTASRegexpLiteral(ast);
</pre><pre class="diff" id="added">+ case AS3Parser.E4X_DESC:
+ return new ASTASDescendantExpression(ast);
</pre><pre class="diff" id="context"> default:
throw new IllegalArgumentException("unhandled expression node type: "+ASTUtils.tokenName(ast));
}
</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>TokenBuilder.java</b></big> <small id="info">633 -> 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/TokenBuilder.java 2008-01-27 18:14:56 UTC (rev 633)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/TokenBuilder.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -261,4 +261,8 @@
</small></pre><pre class="diff" id="context"> public static LinkedListToken newQuestion() {
return newToken(AS3Parser.QUESTION, "?");
}
</pre><pre class="diff" id="added">+
+ public static LinkedListToken newE4XDescendant() {
+ return newToken(AS3Parser.E4X_DESC, "..");
+ }
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>E4XTests.java</b></big> <small id="info">633 -> 634</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/E4XTests.java 2008-01-27 18:14:56 UTC (rev 633)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/E4XTests.java 2008-01-27 18:21:13 UTC (rev 634)
@@ -5,7 +5,10 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.dom.ASDefaultXMLNamespaceStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASDescendantExpression;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASSimpleNameExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.Visibility;
import junit.framework.TestCase;
</pre><pre class="diff"><small id="info">@@ -34,4 +37,22 @@
</small></pre><pre class="diff" id="context"> = (ASDefaultXMLNamespaceStatement)meth.addStmt("default xml namespace = \"http://example.com\\\\\"");
assertEquals("http://example.com\\", stmt.getNamespace());
}
</pre><pre class="diff" id="added">+
+ public void testDescendant() {
+ ASExpression target = fact.newExpression("a");
+ ASExpression selector = fact.newExpression("b");
+ ASDescendantExpression expr = fact.newDescendantExpression(target, selector);
+ assertNotNull(expr);
+ meth.newExprStmt(expr);
+ }
+
+ public void testParseDescendant() {
+ ASDescendantExpression expr = (ASDescendantExpression)fact.newExpression("a..b");
+ ASExpression target = expr.getTarget();
+ ExtraAssertions.assertInstanceof(target, ASSimpleNameExpression.class);
+ assertEquals("a", ((ASSimpleNameExpression)target).getName());
+ ASExpression query = expr.getQuery();
+ ExtraAssertions.assertInstanceof(query, ASSimpleNameExpression.class);
+ assertEquals("b", ((ASSimpleNameExpression)query).getName());
+ }
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></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>