<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">+15</td><td></td><td nowrap="nowrap" align="center">475 -> 476</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASInvocationExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+10</td><td></td><td nowrap="nowrap" align="right">added 476</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3"><span id="added">ASTASInvocationExpression.java</span></a></tt> </td><td></td><td align="right" id="added">+45</td><td></td><td nowrap="nowrap" align="right">added 476</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file4"><span id="added">InvocationExpressionTests.java</span></a></tt> </td><td></td><td align="right" id="added">+46</td><td></td><td nowrap="nowrap" align="right">added 476</td></tr>
<tr><td></td><td></td><td align="right" id="added">+116</td><td></td><td></td></tr>
</table>
<small id="info">3 added + 1 modified, total 4 files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO: recursively check the given subexpression</a></li>
</ul></div>
<pre class="comment">
invocation-expression; function/method calls
</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">475 -> 476</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2007-04-03 19:31:31 UTC (rev 475)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2007-04-03 19:39:19 UTC (rev 476)
@@ -12,6 +12,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.dom.ASExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASNewExpression;
import uk.co.badgersinfoil.metaas.dom.ASNullLiteral;
import uk.co.badgersinfoil.metaas.dom.ASPostfixExpression;
</pre><pre class="diff"><small id="info">@@ -21,6 +22,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.AS3FragmentParser;
import uk.co.badgersinfoil.metaas.impl.ASTASBinaryExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASInvocationExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASNewExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASNullLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTASPostfixExpression;
</pre><pre class="diff"><small id="info">@@ -280,4 +282,17 @@
</small></pre><pre class="diff" id="context"> result.setArguments(args);
return result;
}
</pre><pre class="diff" id="added">+
+ public ASInvocationExpression newInvocationExpression(ASExpression sub, List args) {
+ LinkedListTree ast = ASTUtils.newAST(AS3Parser.NEW, "new");
+ ast.appendToken(TokenBuilder.newSpace());
+ LinkedListTree subExpr = ((ASTASExpression)sub).getAST();
<a name="task1" />+ // <span class="task">TODO</span>: recursively check the given subexpression
+ ast.addChildWithTokens(subExpr);
+ LinkedListTree arguments = ASTUtils.newParentheticAST(AS3Parser.ARGUMENTS, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")");
+ ast.addChildWithTokens(arguments);
+ ASTASInvocationExpression result = new ASTASInvocationExpression(ast);
+ result.setArguments(args);
+ return result;
+ }
</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="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>ASInvocationExpression.java</b></big> <small id="info">added at 476</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASInvocationExpression.java 2007-04-03 19:31:31 UTC (rev 475)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASInvocationExpression.java 2007-04-03 19:39:19 UTC (rev 476)
@@ -0,0 +1,10 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+import java.util.List;
+
+public interface ASInvocationExpression extends ASExpression {
+ public ASExpression getExpression();
+ public void setExpression(ASExpression expr);
+ public List getArguments();
+ public void setArguments(List args);
+}
</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>ASTASInvocationExpression.java</b></big> <small id="info">added at 476</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASInvocationExpression.java 2007-04-03 19:31:31 UTC (rev 475)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASInvocationExpression.java 2007-04-03 19:39:19 UTC (rev 476)
@@ -0,0 +1,45 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import org.asdt.core.internal.antlr.AS3Parser;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASInvocationExpression extends ASTASExpression
+ implements ASInvocationExpression
+{
+ public ASTASInvocationExpression(LinkedListTree ast) {
+ super(ast);
+ }
+
+ public List getArguments() {
+ LinkedListTree args = ASTUtils.findChildByType(ast, AS3Parser.ARGUMENTS);
+ ASTIterator i = new ASTIterator(args);
+ List result = new ArrayList(args.getChildCount());
+ while (i.hasNext()) {
+ result.add(ExpressionBuilder.build(i.next()));
+ }
+ return Collections.unmodifiableList(result);
+ }
+
+ public ASExpression getExpression() {
+ return ExpressionBuilder.build(ast.getFirstChild());
+ }
+
+ public void setArguments(List args) {
+ LinkedListTree arguments = ASTUtils.findChildByType(ast, AS3Parser.ARGUMENTS);
+ for (Iterator i=args.iterator(); i.hasNext(); ) {
+ ASTASExpression arg = (ASTASExpression)i.next();
+ arguments.addChildWithTokens(arg.getAST());
+ }
+ }
+
+ public void setExpression(ASExpression expr) {
+ LinkedListTree exprAST = ((ASTASExpression)expr).getAST();
+ ast.setChildWithTokens(0, exprAST);
+ }
+}
</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" id="added">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader" id="added"><big><b>InvocationExpressionTests.java</b></big> <small id="info">added at 476</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/InvocationExpressionTests.java 2007-04-03 19:31:31 UTC (rev 475)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/InvocationExpressionTests.java 2007-04-03 19:39:19 UTC (rev 476)
@@ -0,0 +1,46 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas;
+
+import java.util.ArrayList;
+import java.util.List;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
+import uk.co.badgersinfoil.metaas.dom.ASNewExpression;
+import junit.framework.TestCase;
+
+public class InvocationExpressionTests extends TestCase {
+ private ActionScriptFactory fact = new ActionScriptFactory();
+ private ASExpression sub;
+ private ASInvocationExpression expr;
+ private List args;
+
+ public void setUp() {
+ args = new ArrayList();
+ sub = fact.newExpression("com.example.MyClass");
+ }
+
+ public void testBasic() {
+ args.add(fact.newIntegerLiteral(1));
+ expr = fact.newInvocationExpression(sub, args);
+ assertEquals(sub, expr.getExpression());
+ List actualArgs = expr.getArguments();
+ assertEquals(1, actualArgs.size());
+ }
+
+ public void testSetExpression() {
+ expr = fact.newInvocationExpression(sub, args);
+ sub = fact.newExpression("Replacement");
+ expr.setExpression(sub);
+ assertEquals(sub, expr.getExpression());
+ }
+
+ public void testSetArguments() {
+ expr = fact.newInvocationExpression(sub, args);
+ List newArgs = new ArrayList();
+ ASIntegerLiteral arg = fact.newIntegerLiteral(1);
+ newArgs.add(arg);
+ expr.setArguments(newArgs);
+ assertEquals(1, expr.getArguments().size());
+ assertEquals(arg, expr.getArguments().get(0));
+ }
+}
</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>