<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">ASSwitchCase.java</a></tt> </td><td></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">608 -> 609</td></tr>
<tr class="alt"><td><tt> /<a href="#file2">ASSwitchDefault.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">608 -> 609</td></tr>
<tr><td><tt> /<a href="#file3">ASSwitchStatement.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">608 -> 609</td></tr>
<tr class="alt"><td><tt> /<a href="#file4"><span id="added">SwitchLabel.java</span></a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="right">added 609</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file5">ASTASSwitchStatement.java</a></tt> </td><td></td><td align="right" id="added">+24</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">608 -> 609</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file6">StatementTests.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td></td><td nowrap="nowrap" align="center">608 -> 609</td></tr>
<tr><td></td><td></td><td align="right" id="added">+49</td><td align="right" id="removed">-5</td><td></td></tr>
</table>
<small id="info">1 added + 5 modified, total 6 files</small><br />
<pre class="comment">
allow access to the list of entries in a switch-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>ASSwitchCase.java</b></big> <small id="info">608 -> 609</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASSwitchCase.java 2008-01-19 14:22:57 UTC (rev 608)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASSwitchCase.java 2008-01-19 14:31:27 UTC (rev 609)
@@ -13,7 +13,7 @@
</small></pre><pre class="diff" id="context"> *
* @see ASSwitchStatement
*/
</pre><pre class="diff" id="removed">-public interface ASSwitchCase extends ScriptElement, StatementContainer {
</pre><pre class="diff" id="added">+public interface ASSwitchCase extends SwitchLabel {
</pre><pre class="diff" id="context">
/**
* Returns a string representation of the value expression for this
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader"><big><b>ASSwitchDefault.java</b></big> <small id="info">608 -> 609</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASSwitchDefault.java 2008-01-19 14:22:57 UTC (rev 608)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASSwitchDefault.java 2008-01-19 14:31:27 UTC (rev 609)
@@ -13,6 +13,6 @@
</small></pre><pre class="diff" id="context"> *
* @see ASSwitchStatement
*/
</pre><pre class="diff" id="removed">-public interface ASSwitchDefault extends ScriptElement, StatementContainer {
-
</pre><pre class="diff" id="added">+public interface ASSwitchDefault extends SwitchLabel {
+ // no methods
</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="file3" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader"><big><b>ASSwitchStatement.java</b></big> <small id="info">608 -> 609</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASSwitchStatement.java 2008-01-19 14:22:57 UTC (rev 608)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASSwitchStatement.java 2008-01-19 14:31:27 UTC (rev 609)
@@ -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"> /**
* Obtained from {@link StatementContainer#newSwitch(String)}, an
* ASSwitchStatement allows 'case' and 'default' statements to be added to
</pre><pre class="diff"><small id="info">@@ -47,7 +49,13 @@
</small></pre><pre class="diff" id="context"> * which other statements can be added.
*/
ASSwitchDefault newDefault();
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> ASExpression getCondition();
public void setCondition(ASExpression expr);
</pre><pre class="diff" id="added">+
+ /**
+ * Returns a list of {@link SwitchLabel} elements (i.e. either
+ * {@link ASSwitchCase} or {@link ASSwitchDefault}).
+ */
+ public List getLabels();
</pre><pre class="diff" id="context"> }
</pre></div>
<hr /><a name="file4" /><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>SwitchLabel.java</b></big> <small id="info">added at 609</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/SwitchLabel.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/SwitchLabel.java 2008-01-19 14:31:27 UTC (rev 609)
@@ -0,0 +1,9 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+/**
+ * Common super-type for entries that may appear in {@link ASSwitchStatement}:
+ * {@link ASSwitchCase} and {@link ASSwitchLabel}.
+ */
+public interface SwitchLabel extends ScriptElement, StatementContainer {
+ // no methods
+}
</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>ASTASSwitchStatement.java</b></big> <small id="info">608 -> 609</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASSwitchStatement.java 2008-01-19 14:22:57 UTC (rev 608)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASSwitchStatement.java 2008-01-19 14:31:27 UTC (rev 609)
@@ -6,14 +6,17 @@
</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.ASExpression;
import uk.co.badgersinfoil.metaas.dom.ASSwitchCase;
import uk.co.badgersinfoil.metaas.dom.ASSwitchDefault;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.SwitchLabel;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff" id="removed">-// TODO: add access to the 'switch condition'
</pre><pre class="diff" id="context">
public class ASTASSwitchStatement implements ASSwitchStatement {
</pre><pre class="diff"><small id="info">@@ -58,4 +61,24 @@
</small></pre><pre class="diff" id="context"> public void setCondition(ASExpression expr) {
cond().setChildWithTokens(0, ((ASTASExpression)expr).getAST());
}
</pre><pre class="diff" id="added">+
+ public List getLabels() {
+ List results = new ArrayList();
+ ASTIterator i = new ASTIterator(block());
+ while (i.hasNext()) {
+ results.add(buildLabel(i.next()));
+ }
+ return Collections.unmodifiableList(results);
+ }
+
+ private SwitchLabel buildLabel(LinkedListTree lab) {
+ switch (lab.getType()) {
+ case AS3Parser.CASE:
+ return new ASTASSwitchCase(lab);
+ case AS3Parser.DEFAULT:
+ return new ASTASSwitchDefault(lab);
+ default:
+ throw new IllegalArgumentException("unhandled node type "+ASTUtils.tokenName(lab));
+ }
+ }
</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="file6" /><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">608 -> 609</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-19 14:22:57 UTC (rev 608)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-19 14:31:27 UTC (rev 609)
@@ -233,6 +233,10 @@
</small></pre><pre class="diff" id="context"> assertEquals("2", cas.getLabelValueString());
ASSwitchDefault def= swtch.newDefault();
def.addStmt("trace('default')");
</pre><pre class="diff" id="added">+ List labels = swtch.getLabels();
+ ExtraAssertions.assertSize(2, labels);
+ ExtraAssertions.assertInstanceof(labels.get(0), ASSwitchCase.class);
+ ExtraAssertions.assertInstanceof(labels.get(1), ASSwitchDefault.class);
</pre><pre class="diff" id="context">
// condition tests,
assertNotNull(swtch.getCondition());
</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>