<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">634 -> 635</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASFilterExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+8</td><td></td><td nowrap="nowrap" align="right">added 635</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3"><span id="added">ASTASFilterExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+20</td><td></td><td nowrap="nowrap" align="right">added 635</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+15</td><td></td><td nowrap="nowrap" align="center">634 -> 635</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">634 -> 635</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file6">E4XTests.java</a></tt> </td><td></td><td align="right" id="added">+21</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">634 -> 635</td></tr>
<tr><td></td><td></td><td align="right" id="added">+77</td><td align="right" id="removed">-3</td><td></td></tr>
</table>
<small id="info">2 added + 4 modified, total 6 files</small><br />
<pre class="comment">
simple support for E4X filter predicate query expression syntax
</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">634 -> 635</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-27 18:21:13 UTC (rev 634)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-27 18:50:29 UTC (rev 635)
@@ -21,6 +21,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASDescendantExpression;
import uk.co.badgersinfoil.metaas.dom.ASExpression;
import uk.co.badgersinfoil.metaas.dom.ASFieldAccessExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASFilterExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASFunctionExpression;
import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
import uk.co.badgersinfoil.metaas.dom.ASNewExpression;
</pre><pre class="diff"><small id="info">@@ -41,6 +42,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASDescendantExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASFieldAccessExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASFilterExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASFunctionExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASInvocationExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASNewExpression;
</pre><pre class="diff"><small id="info">@@ -523,4 +525,13 @@
</small></pre><pre class="diff" id="context"> ast(selector));
return new ASTASDescendantExpression(ast);
}
</pre><pre class="diff" id="added">+
+ public ASFilterExpression newFilterExpression(ASExpression target,
+ ASExpression selector)
+ {
+ LinkedListTree ast
+ = ASTBuilder.newFilterExpression(ast(target),
+ ast(selector));
+ return new ASTASFilterExpression(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>ASFilterExpression.java</b></big> <small id="info">added at 635</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASFilterExpression.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASFilterExpression.java 2008-01-27 18:50:29 UTC (rev 635)
@@ -0,0 +1,8 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASFilterExpression 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>ASTASFilterExpression.java</b></big> <small id="info">added at 635</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASFilterExpression.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASFilterExpression.java 2008-01-27 18:50:29 UTC (rev 635)
@@ -0,0 +1,20 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASFilterExpression;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASFilterExpression extends ASTASExpression implements ASFilterExpression {
+
+ public ASTASFilterExpression(LinkedListTree ast) {
+ super(ast);
+ }
+
+ public ASExpression getQuery() {
+ return ExpressionBuilder.build(ast.getLastChild());
+ }
+
+ public ASExpression getTarget() {
+ return ExpressionBuilder.build(ast.getFirstChild());
+ }
+}
</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">634 -> 635</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-27 18:21:13 UTC (rev 634)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-27 18:50:29 UTC (rev 635)
@@ -652,4 +652,19 @@
</small></pre><pre class="diff" id="context"> ast.setStopToken(selector.getStopToken());
return ast;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newFilterExpression(LinkedListTree target,
+ LinkedListTree selector)
+ {
+ LinkedListTree ast = ASTUtils.newImaginaryAST(AS3Parser.E4X_FILTER);
+ assertNoParent("target expression", target);
+ assertNoParent("query expression", target);
+ // don't use addChildWithTokens(); special handling below,
+ ast.addChildWithTokens(target);
+ ast.appendToken(TokenBuilder.newDot());
+ ast.appendToken(TokenBuilder.newLParen());
+ ast.addChildWithTokens(selector);
+ ast.appendToken(TokenBuilder.newRParen());
+ 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">634 -> 635</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-27 18:21:13 UTC (rev 634)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ExpressionBuilder.java 2008-01-27 18:50:29 UTC (rev 635)
@@ -88,6 +88,8 @@
</small></pre><pre class="diff" id="context"> return new ASTASRegexpLiteral(ast);
case AS3Parser.E4X_DESC:
return new ASTASDescendantExpression(ast);
</pre><pre class="diff" id="added">+ case AS3Parser.E4X_FILTER:
+ return new ASTASFilterExpression(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/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>E4XTests.java</b></big> <small id="info">634 -> 635</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/E4XTests.java 2008-01-27 18:21:13 UTC (rev 634)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/E4XTests.java 2008-01-27 18:50:29 UTC (rev 635)
@@ -1,18 +1,18 @@
</small></pre><pre class="diff" id="context"> package uk.co.badgersinfoil.metaas;
import java.io.IOException;
</pre><pre class="diff" id="removed">-
</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;
import uk.co.badgersinfoil.metaas.dom.ASDescendantExpression;
import uk.co.badgersinfoil.metaas.dom.ASExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASFilterExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.ASSimpleNameExpression;
import uk.co.badgersinfoil.metaas.dom.Visibility;
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> import junit.framework.TestCase;
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> public class E4XTests extends TestCase {
private ActionScriptFactory fact = new ActionScriptFactory();
private ASCompilationUnit unit;
</pre><pre class="diff"><small id="info">@@ -37,7 +37,7 @@
</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="removed">-
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> public void testDescendant() {
ASExpression target = fact.newExpression("a");
ASExpression selector = fact.newExpression("b");
</pre><pre class="diff"><small id="info">@@ -55,4 +55,22 @@
</small></pre><pre class="diff" id="context"> ExtraAssertions.assertInstanceof(query, ASSimpleNameExpression.class);
assertEquals("b", ((ASSimpleNameExpression)query).getName());
}
</pre><pre class="diff" id="added">+
+ public void testFilterPredicate() {
+ ASExpression target = fact.newExpression("a");
+ ASExpression selector = fact.newExpression("b");
+ ASFilterExpression expr = fact.newFilterExpression(target, selector);
+ assertNotNull(expr);
+ meth.newExprStmt(expr);
+ }
+
+ public void testParseFilterPredicate() {
+ ASFilterExpression expr = (ASFilterExpression)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>