<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/dom/<a href="#file1">ASDeclarationStatement.java</a></tt> </td><td></td><td align="right" id="added">+13</td><td></td><td nowrap="nowrap" align="center">625 -> 626</td></tr>
<tr class="alt"><td><tt> /<a href="#file2"><span id="added">ASVarDeclarationFragment.java</span></a></tt> </td><td></td><td align="right" id="added">+10</td><td></td><td nowrap="nowrap" align="right">added 626</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3">ASTASDeclarationStatement.java</a></tt> </td><td></td><td align="right" id="added">+33</td><td></td><td nowrap="nowrap" align="center">625 -> 626</td></tr>
<tr class="alt"><td><tt> /<a href="#file4"><span id="added">ASTASVarDeclarationFragment.java</span></a></tt> </td><td></td><td align="right" id="added">+35</td><td></td><td nowrap="nowrap" align="right">added 626</td></tr>
<tr><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file5">StatementTests.java</a></tt> </td><td></td><td align="right" id="added">+30</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">625 -> 626</td></tr>
<tr><td></td><td></td><td align="right" id="added">+121</td><td align="right" id="removed">-2</td><td></td></tr>
</table>
<small id="info">2 added + 3 modified, total 5 files</small><br />
<pre class="comment">
expose information about the variables in a declaration-statement
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader"><big><b>ASDeclarationStatement.java</b></big> <small id="info">625 -> 626</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASDeclarationStatement.java 2008-01-21 22:29:08 UTC (rev 625)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASDeclarationStatement.java 2008-01-21 23:05:56 UTC (rev 626)
@@ -6,6 +6,8 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.metaas.dom;
</pre><pre class="diff" id="added">+import java.util.List;
+
</pre><pre class="diff" id="context"> /**
* Represents a statement that declares a variable.
*/
</pre><pre class="diff"><small id="info">@@ -24,4 +26,15 @@
</small></pre><pre class="diff" id="context"> * <code>var</code> keyword.
*/
public void setConstant(boolean constant);
</pre><pre class="diff" id="added">+
+ /**
+ * Returns a list of {@link ASVarDeclarationFragment} objects.
+ */
+ public List getVars();
+
+ public String getFirstVarName();
+
+ public String getFirstVarTypeName();
+
+ public ASExpression getFirstVarInitializer();
</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>ASVarDeclarationFragment.java</b></big> <small id="info">added at 626</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASVarDeclarationFragment.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASVarDeclarationFragment.java 2008-01-21 23:05:56 UTC (rev 626)
@@ -0,0 +1,10 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASVarDeclarationFragment extends ScriptElement {
+
+ public String getName();
+
+ public String getTypeName();
+
+ public ASExpression getInitializer();
+}
</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>ASTASDeclarationStatement.java</b></big> <small id="info">625 -> 626</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASDeclarationStatement.java 2008-01-21 22:29:08 UTC (rev 625)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASDeclarationStatement.java 2008-01-21 23:05:56 UTC (rev 626)
@@ -1,7 +1,12 @@
</small></pre><pre class="diff" id="context"> package uk.co.badgersinfoil.metaas.impl;
</pre><pre class="diff" id="added">+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
</pre><pre class="diff" id="context"> import org.asdt.core.internal.antlr.AS3Parser;
import uk.co.badgersinfoil.metaas.dom.ASDeclarationStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASVarDeclarationFragment;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff"><small id="info">@@ -26,4 +31,32 @@
</small></pre><pre class="diff" id="context"> ast.token.setText("var");
}
}
</pre><pre class="diff" id="added">+
+ public ASExpression getFirstVarInitializer() {
+ return firstVar().getInitializer();
+ }
+
+ public String getFirstVarName() {
+ return firstVar().getName();
+ }
+
+ public String getFirstVarTypeName() {
+ return firstVar().getTypeName();
+ }
+
+ public List getVars() {
+ List results = new ArrayList();
+ for (ASTIterator i = new ASTIterator(ast); i.hasNext(); ) {
+ results.add(build(i.next()));
+ }
+ return Collections.unmodifiableList(results);
+ }
+
+ private ASVarDeclarationFragment firstVar() {
+ return build(ast.getFirstChild());
+ }
+
+ private ASVarDeclarationFragment build(LinkedListTree varDecl) {
+ return new ASTASVarDeclarationFragment(varDecl);
+ }
</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="file4" /><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>ASTASVarDeclarationFragment.java</b></big> <small id="info">added at 626</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASVarDeclarationFragment.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASVarDeclarationFragment.java 2008-01-21 23:05:56 UTC (rev 626)
@@ -0,0 +1,35 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import org.asdt.core.internal.antlr.AS3Parser;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASVarDeclarationFragment;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASVarDeclarationFragment implements ASVarDeclarationFragment {
+
+ private LinkedListTree ast;
+
+ public ASTASVarDeclarationFragment(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public ASExpression getInitializer() {
+ LinkedListTree init = ASTUtils.findChildByType(ast, AS3Parser.ASSIGN);
+ if (init == null) {
+ return null;
+ }
+ return ExpressionBuilder.build(init.getFirstChild());
+ }
+
+ public String getName() {
+ return ast.getText();
+ }
+
+ public String getTypeName() {
+ LinkedListTree type = ASTUtils.findChildByType(ast, AS3Parser.TYPE_SPEC);
+ if (type == null) {
+ return null;
+ }
+ return ASTUtils.typeSpecText(type);
+ }
+}
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>StatementTests.java</b></big> <small id="info">625 -> 626</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-21 22:29:08 UTC (rev 625)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-21 23:05:56 UTC (rev 626)
@@ -24,7 +24,6 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASIfStatement;
import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.dom.ASLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.ASNewExpression;
import uk.co.badgersinfoil.metaas.dom.ASPostfixExpression;
</pre><pre class="diff"><small id="info">@@ -36,6 +35,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASVarDeclarationFragment;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
import uk.co.badgersinfoil.metaas.dom.Statement;
</pre><pre class="diff"><small id="info">@@ -268,11 +268,36 @@
</small></pre><pre class="diff" id="context"> decl.setConstant(false); // should not change the result
assertFalse(decl.isConstant());
</pre><pre class="diff" id="removed">- // TODO: multiple names in one declaration
</pre><pre class="diff" id="added">+ assertEquals("a", decl.getFirstVarName());
+ assertNull(decl.getFirstVarTypeName());
+ ExtraAssertions.assertInstanceof(decl.getFirstVarInitializer(), ASIntegerLiteral.class);
</pre><pre class="diff" id="context">
decl.setConstant(true);
assertTrue(decl.isConstant());
</pre><pre class="diff" id="added">+
+ List vars = decl.getVars();
+ ExtraAssertions.assertSize(1, vars);
+ ASVarDeclarationFragment var = (ASVarDeclarationFragment)vars.get(0);
+ assertEquals("a", var.getName());
+ assertNull(var.getTypeName());
+ ExtraAssertions.assertInstanceof(var.getInitializer(), ASIntegerLiteral.class);
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="added">+
+ public void testParseDeclaration() {
+ ASDeclarationStatement decl = (ASDeclarationStatement)meth.addStmt("var a=1, b:String='2'");
+ List vars = decl.getVars();
+ ExtraAssertions.assertSize(2, vars);
+
+ ASVarDeclarationFragment a = (ASVarDeclarationFragment)vars.get(0);
+ assertEquals("a", a.getName());
+ assertNull(a.getTypeName());
+ ExtraAssertions.assertInstanceof(a.getInitializer(), ASIntegerLiteral.class);
+
+ ASVarDeclarationFragment b = (ASVarDeclarationFragment)vars.get(1);
+ assertEquals("b", b.getName());
+ assertEquals("String", b.getTypeName());
+ ExtraAssertions.assertInstanceof(b.getInitializer(), ASStringLiteral.class);
+ }
</pre><pre class="diff" id="context">
public void testReturn() throws IOException {
ASReturnStatement returnStmt = meth.newReturn();
</pre><pre class="diff"><small id="info">@@ -291,6 +316,9 @@
</small></pre><pre class="diff" id="context"> returnStmt.setExpression((String)null);
assertNull(returnStmt.getExpressionString());
assertNull(returnStmt.getExpression());
</pre><pre class="diff" id="added">+
+ // test removal when there's already nothing to remove,
+ returnStmt.setExpression((String)null);
</pre><pre class="diff" id="context"> }
public void testBlockEmpty() {
</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>