<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">+12</td><td></td><td nowrap="nowrap" align="center">620 -> 621</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASArrayLiteral.java</span></a></tt> </td><td></td><td align="right" id="added">+15</td><td></td><td nowrap="nowrap" align="right">added 621</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3"><span id="added">ASTASArrayLiteral.java</span></a></tt> </td><td></td><td align="right" id="added">+43</td><td></td><td nowrap="nowrap" align="right">added 621</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="center">620 -> 621</td></tr>
<tr><td><tt> /<a href="#file5">ASTUtils.java</a></tt> </td><td></td><td align="right" id="added">+1</td><td></td><td nowrap="nowrap" align="center">620 -> 621</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file6">LiteralTests.java</a></tt> </td><td></td><td align="right" id="added">+81</td><td></td><td nowrap="nowrap" align="center">620 -> 621</td></tr>
<tr><td></td><td></td><td align="right" id="added">+157</td><td></td><td></td></tr>
</table>
<small id="info">2 added + 4 modified, total 6 files</small><br />
<pre class="comment">
Support for array-literal-expression
</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">620 -> 621</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-20 14:29:00 UTC (rev 620)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2008-01-20 14:30:37 UTC (rev 621)
@@ -6,9 +6,12 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.metaas;
</pre><pre class="diff" id="added">+import java.util.ArrayList;
+import java.util.Iterator;
</pre><pre class="diff" id="context"> import java.util.List;
import org.asdt.core.internal.antlr.AS3Parser;
import uk.co.badgersinfoil.metaas.dom.ASArrayAccessExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASArrayLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASAssignmentExpression;
import uk.co.badgersinfoil.metaas.dom.ASBinaryExpression;
import uk.co.badgersinfoil.metaas.dom.ASBlock;
</pre><pre class="diff"><small id="info">@@ -28,6 +31,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASUndefinedLiteral;
import uk.co.badgersinfoil.metaas.impl.AS3FragmentParser;
import uk.co.badgersinfoil.metaas.impl.ASTASArrayAccessExpression;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTASArrayLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTASBooleanLiteral;
import uk.co.badgersinfoil.metaas.impl.ASTASConditionalExpression;
import uk.co.badgersinfoil.metaas.impl.ASTASExpression;
</pre><pre class="diff"><small id="info">@@ -453,4 +457,12 @@
</small></pre><pre class="diff" id="context"> LinkedListTree ast = ASTBuilder.newFunctionExpression();
return new ASTASFunctionExpression(ast);
}
</pre><pre class="diff" id="added">+
+ /**
+ * @param entries a list of {@link ASExpression} objects.
+ */
+ public ASArrayLiteral newArrayLiteral() {
+ LinkedListTree ast = ASTBuilder.newArrayLiteral();
+ return new ASTASArrayLiteral(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>ASArrayLiteral.java</b></big> <small id="info">added at 621</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASArrayLiteral.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASArrayLiteral.java 2008-01-20 14:30:37 UTC (rev 621)
@@ -0,0 +1,15 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+import java.util.List;
+
+public interface ASArrayLiteral extends ASLiteral {
+
+ /**
+ * Returns a list of {@link ASExpression} objects.
+ */
+ public List getEntries();
+
+ public void add(ASExpression entry);
+
+ public ASExpression remove(int i);
+}
</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>ASTASArrayLiteral.java</b></big> <small id="info">added at 621</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASArrayLiteral.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASArrayLiteral.java 2008-01-20 14:30:37 UTC (rev 621)
@@ -0,0 +1,43 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import uk.co.badgersinfoil.metaas.dom.ASArrayLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASArrayLiteral extends ASTASLiteral implements ASArrayLiteral {
+
+ public ASTASArrayLiteral(LinkedListTree ast) {
+ super(ast);
+ }
+
+ public List getEntries() {
+ List entries = new ArrayList();
+ ASTIterator i = new ASTIterator(ast);
+ while (i.hasNext()) {
+ entries.add(ExpressionBuilder.build(i.next()));
+ }
+ return Collections.unmodifiableList(entries);
+ }
+
+ public void add(ASExpression entry) {
+ if (ast.getChildCount() > 0) {
+ ast.appendToken(TokenBuilder.newComma());
+ ast.appendToken(TokenBuilder.newSpace());
+ }
+ ast.addChildWithTokens(ast(entry));
+ }
+
+ public ASExpression remove(int i) {
+ LinkedListTree old = (LinkedListTree)ast.getChild(i);
+ if (ast.getChildCount()-1 > i) {
+ ASTUtils.removeTrailingWhitespaceAndComma(old.getStopToken());
+ } else if (i > 0) {
+ ASTUtils.removePreceedingWhitespaceAndComma(old.getStartToken());
+ }
+ ast.deleteChild(i);
+ return ExpressionBuilder.build(old);
+ }
+}
</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">620 -> 621</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-20 14:29:00 UTC (rev 620)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-20 14:30:37 UTC (rev 621)
@@ -597,4 +597,9 @@
</small></pre><pre class="diff" id="context"> def.addChildWithTokens(block);
return def;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newArrayLiteral() {
+ LinkedListTree lit = ASTUtils.newParentheticAST(AS3Parser.ARRAY_LITERAL, AS3Parser.LBRACK, "[", AS3Parser.RBRACK, "]");
+ return lit;
+ }
</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>ASTUtils.java</b></big> <small id="info">620 -> 621</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTUtils.java 2008-01-20 14:29:00 UTC (rev 620)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTUtils.java 2008-01-20 14:30:37 UTC (rev 621)
@@ -49,6 +49,7 @@
</small></pre><pre class="diff" id="context"> case AS3Parser.TYPE_BLOCK:
return blockDelegate;
case AS3Parser.ANNOTATION:
</pre><pre class="diff" id="added">+ case AS3Parser.ARRAY_LITERAL:
</pre><pre class="diff" id="context"> return metadataTagDelegate;
case AS3Parser.PARAMS:
case AS3Parser.ANNOTATION_PARAMS:
</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>LiteralTests.java</b></big> <small id="info">620 -> 621</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/LiteralTests.java 2008-01-20 14:29:00 UTC (rev 620)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/LiteralTests.java 2008-01-20 14:30:37 UTC (rev 621)
@@ -1,20 +1,51 @@
</small></pre><pre class="diff" id="context"> package uk.co.badgersinfoil.metaas;
</pre><pre class="diff" id="added">+import java.io.IOException;
+import java.util.List;
+import uk.co.badgersinfoil.metaas.dom.ASArrayLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBooleanLiteral;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASClassType;
+import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
+import uk.co.badgersinfoil.metaas.dom.ASLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASMethod;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASNullLiteral;
import uk.co.badgersinfoil.metaas.dom.ASStringLiteral;
import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
import uk.co.badgersinfoil.metaas.dom.ASUndefinedLiteral;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.Visibility;
</pre><pre class="diff" id="context"> import junit.framework.TestCase;
public class LiteralTests extends TestCase {
private ActionScriptFactory fact = new ActionScriptFactory();
</pre><pre class="diff" id="added">+ private ASCompilationUnit unit;
+ private ASCompilationUnit reflect;
+ private ASLiteral literal = null;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ protected void setUp() {
+ unit = fact.newClass("Test");
+ reflect = null;
+ literal = null;
+ }
+
+ protected void tearDown() throws IOException {
+ if (literal != null && reflect == null) {
+ ASClassType clazz = (ASClassType)unit.getType();
+ ASMethod meth = clazz.newMethod("test", Visibility.PUBLIC, null);
+ meth.newExprStmt(fact.newAssignExpression(fact.newExpression(getName()), literal));
+ reflect = assertReflection();
+ }
+ }
+
+ private ASCompilationUnit assertReflection() throws IOException {
+ return CodeMirror.assertReflection(fact, unit);
+ }
+
</pre><pre class="diff" id="context"> public void testStringLiteral() {
ASStringLiteral lit = fact.newStringLiteral("");
assertEquals("", lit.getValue());
lit.setValue("\"");
assertEquals("\"", lit.getValue());
</pre><pre class="diff" id="added">+ literal = lit;
</pre><pre class="diff" id="context"> }
public void testNumberLiteral() {
</pre><pre class="diff"><small id="info">@@ -22,11 +53,13 @@
</small></pre><pre class="diff" id="context"> assertEquals(123, lit.getValue());
lit.setValue(0);
assertEquals(0, lit.getValue());
</pre><pre class="diff" id="added">+ literal = lit;
</pre><pre class="diff" id="context"> }
public void testNullLiteral() {
ASNullLiteral lit = fact.newNullLiteral();
assertNotNull(lit);
</pre><pre class="diff" id="added">+ literal = lit;
</pre><pre class="diff" id="context"> }
public void testBoolLiteral() {
</pre><pre class="diff"><small id="info">@@ -42,10 +75,58 @@
</small></pre><pre class="diff" id="context">
ExtraAssertions.assertInstanceof(fact.newExpression("true"),
ASBooleanLiteral.class);
</pre><pre class="diff" id="added">+ literal = lit;
</pre><pre class="diff" id="context"> }
public void testUndefinedLiteral() {
ASUndefinedLiteral lit = fact.newUndefinedLiteral();
assertNotNull(lit);
</pre><pre class="diff" id="added">+ literal = lit;
</pre><pre class="diff" id="context"> }
</pre><pre class="diff" id="added">+
+ public void testEmptyArrayLiteral() {
+ ASArrayLiteral lit = fact.newArrayLiteral();
+ assertNotNull(lit);
+ ExtraAssertions.assertSize(0, lit.getEntries());
+ literal = lit;
+ }
+
+ public void testArrayLiteral() {
+ ASArrayLiteral lit = fact.newArrayLiteral();
+ lit.add(fact.newIntegerLiteral(1));
+ ExtraAssertions.assertSize(1, lit.getEntries());
+ ExtraAssertions.assertInstanceof(lit.getEntries().get(0), ASIntegerLiteral.class);
+ lit.add(fact.newStringLiteral("foo"));
+ ExtraAssertions.assertSize(2, lit.getEntries());
+ ExtraAssertions.assertInstanceof(lit.getEntries().get(1), ASStringLiteral.class);
+ literal = lit;
+ }
+
+ public void testArrayLiteralRemoveFirst() {
+ ASArrayLiteral lit = fact.newArrayLiteral();
+ lit.add(fact.newIntegerLiteral(1));
+ lit.add(fact.newStringLiteral("foo"));
+ lit.remove(0);
+ ExtraAssertions.assertSize(1, lit.getEntries());
+ literal = lit;
+ }
+
+ public void testArrayLiteralRemoveLast() {
+ ASArrayLiteral lit = fact.newArrayLiteral();
+ lit.add(fact.newIntegerLiteral(1));
+ lit.add(fact.newStringLiteral("foo"));
+ lit.remove(1);
+ ExtraAssertions.assertSize(1, lit.getEntries());
+ literal = lit;
+ }
+
+ public void testArrayLiteralRemoveMiddle() {
+ ASArrayLiteral lit = fact.newArrayLiteral();
+ lit.add(fact.newIntegerLiteral(1));
+ lit.add(fact.newStringLiteral("foo"));
+ lit.add(fact.newBooleanLiteral(false));
+ lit.remove(1);
+ ExtraAssertions.assertSize(2, lit.getEntries());
+ literal = lit;
+ }
</pre><pre class="diff" id="context"> }
</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>