<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"><span id="added">ASDeclarationStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+27</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr class="alt"><td><tt> /<a href="#file2"><span id="added">ASReturnStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+13</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr><td><tt> /<a href="#file3"><span id="added">ASWithStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+7</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">StatementContainer.java</a></tt> </td><td></td><td align="right" id="added">+42</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file5">AS3FragmentParser.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr class="alt"><td><tt> /<a href="#file6"><span id="added">ASTASDeclarationStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+29</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr><td><tt> /<a href="#file7">ASTASMethod.java</a></tt> </td><td></td><td align="right" id="added">+19</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr class="alt"><td><tt> /<a href="#file8"><span id="added">ASTASReturnStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+48</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr><td><tt> /<a href="#file9"><span id="added">ASTASWithStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+28</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr class="alt"><td><tt> /<a href="#file10">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+25</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr><td><tt> /<a href="#file11">ASTStatementList.java</a></tt> </td><td></td><td align="right" id="added">+31</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr class="alt"><td><tt> /<a href="#file12">ContainerDelegate.java</a></tt> </td><td></td><td align="right" id="added">+19</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr><td><tt> /<a href="#file13"><span id="added">StatementBuilder.java</span></a></tt> </td><td></td><td align="right" id="added">+58</td><td></td><td nowrap="nowrap" align="right">added 415</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file14">BasicTests.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr><td><tt> /<a href="#file15">StatementTests.java</a></tt> </td><td></td><td align="right" id="added">+35</td><td></td><td nowrap="nowrap" align="center">414 -> 415</td></tr>
<tr><td></td><td></td><td align="right" id="added">+395</td><td align="right" id="removed">-1</td><td></td></tr>
</table>
<small id="info">7 added + 8 modified, total 15 files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO: multiple names in one declaration</a></li>
</ul></div>
<pre class="comment">
enhanced support for 'declaration', 'return' and 'with' statements, and the ability to list the statements in a StatementContainer
</pre>
<hr /><a name="file1" /><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>ASDeclarationStatement.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASDeclarationStatement.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASDeclarationStatement.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,27 @@
</small></pre><pre class="diff" id="added">+/**
+ * ASDeclarationStatement.java
+ *
+ * Copyright (c) 2006-2007 David Holroyd
+ */
+
+package uk.co.badgersinfoil.metaas.dom;
+
+/**
+ * Represents a statement that declares a variable.
+ */
+public interface ASDeclarationStatement extends Statement {
+
+ /**
+ * Returns false if this is a declaration using the <code>var</code>
+ * keyword (the default), and true is this is a declaration using the
+ * <code>const</code> keyword.
+ */
+ public boolean isConstant();
+
+ /**
+ * If given true, this declaration will use the <code>const</code>
+ * keyword, if given false, this declaration will use the
+ * <code>var</code> keyword.
+ */
+ public void setContant(boolean constant);
+}
</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>ASReturnStatement.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASReturnStatement.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASReturnStatement.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,13 @@
</small></pre><pre class="diff" id="added">+/**
+ * ASReturnStatement.java
+ *
+ * Copyright (c) 2007 David Holroyd
+ */
+
+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASReturnStatement extends Statement {
+
+ public String getExpressionString();
+ public void setExpression(String expr);
+}
</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" id="added">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader" id="added"><big><b>ASWithStatement.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASWithStatement.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASWithStatement.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,7 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASWithStatement extends Statement, StatementContainer {
+
+ public String getConditionString();
+ public void setCondition(String string);
+}
</pre></div>
<hr /><a name="file4" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/dom</span><br />
<div class="fileheader"><big><b>StatementContainer.java</b></big> <small id="info">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -6,6 +6,7 @@
</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"> import uk.co.badgersinfoil.metaas.SyntaxException;
/**
</pre><pre class="diff"><small id="info">@@ -103,9 +104,50 @@
</small></pre><pre class="diff" id="context"> public ASSwitchStatement newSwitch(String condition);
/**
</pre><pre class="diff" id="added">+ * Adds a new with-statement to the code, and returns a reference to
+ * it. e.g.
+ * <pre class="eg">method.newWith("value").addStmt("trace(test)");</pre>
+ * <p>results in,</p>
+ * <pre class="eg">with (value) {
+ * trace(test);
+ * }</pre>
+ */
+ public ASWithStatement newWith(String string);
+
+ /**
+ * Adds a new variable declaration to the code, and returns a reference
+ * to it. e.g.
+ * <pre class="eg">method.newDeclaration("a=1");</pre>
+ * <p>results in,</p>
+ * <pre class="eg">var a=1;</pre>
+ */
+ public ASDeclarationStatement newDeclaration(String assignment);
+
+ /**
+ * Adds a new return-statement to the code (with optional return
+ * expression), and returns a reference to it. e.g.
+ * <pre class="eg">method.newReturn(null);</pre>
+ * <p>results in a plain return statement,</p>
+ * <pre class="eg">return;</pre>
+ * <p>Whereas passing an expression,</p>
+ * <pre class="eg">method.newReturn("theVal()");</pre>
+ * <p>results will cause that expression to be returned,</p>
+ * <pre class="eg">return theVal();</pre>
+ */
+ public ASReturnStatement newReturn(String expr);
+
+ /**
</pre><pre class="diff" id="context"> * Returns true if if this container currently contains at
* least one statement, and false if it is empty, or contains only
* comments and whitespace.
*/
public boolean containsCode();
</pre><pre class="diff" id="added">+
+ /**
+ * Returns a list of the statements held in the containing element. The
+ * list is immutable (entries cannnot be added, removed or replaced)
+ * but the objects obtained from the list my be modified via the
+ * methods they provide.
+ */
+ public List getStatementList();
</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="file5" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>AS3FragmentParser.java</b></big> <small id="info">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -188,4 +188,13 @@
</small></pre><pre class="diff" id="context"> throw new SyntaxException(e);
}
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree parseVariableDeclarator(String assignment) {
+ AS3Parser parser = ASTUtils.parse(assignment + ";");
+ try {
+ return tree(parser.variableDeclarator());
+ } catch (RecognitionException e) {
+ throw new SyntaxException(e);
+ }
+ }
</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" id="added">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader" id="added"><big><b>ASTASDeclarationStatement.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASDeclarationStatement.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASDeclarationStatement.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,29 @@
</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.ASDeclarationStatement;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+
+public class ASTASDeclarationStatement implements ASDeclarationStatement {
+
+ private LinkedListTree ast;
+
+ public ASTASDeclarationStatement(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public boolean isConstant() {
+ return ast.getType() == AS3Parser.CONST;
+ }
+
+ public void setContant(boolean constant) {
+ if (constant) {
+ ast.token.setType(AS3Parser.CONST);
+ ast.token.setText("const");
+ } else {
+ ast.token.setType(AS3Parser.VAR);
+ ast.token.setText("var");
+ }
+ }
+}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file7" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTASMethod.java</b></big> <small id="info">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -12,6 +12,7 @@
</small></pre><pre class="diff" id="context"> import org.asdt.core.internal.antlr.AS3Parser;
import uk.co.badgersinfoil.metaas.SyntaxException;
import uk.co.badgersinfoil.metaas.dom.ASArg;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASDeclarationStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
</pre><pre class="diff"><small id="info">@@ -19,8 +20,10 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASForStatement;
import uk.co.badgersinfoil.metaas.dom.ASIfStatement;
import uk.co.badgersinfoil.metaas.dom.ASMethod;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff"><small id="info">@@ -203,10 +206,26 @@
</small></pre><pre class="diff" id="context"> return stmtList.newSwitch(condition);
}
</pre><pre class="diff" id="added">+ public ASWithStatement newWith(String expr) {
+ return stmtList.newWith(expr);
+ }
+
+ public ASDeclarationStatement newDeclaration(String assignment) {
+ return stmtList.newDeclaration(assignment);
+ }
+
+ public ASReturnStatement newReturn(String expr) {
+ return stmtList.newReturn(expr);
+ }
+
</pre><pre class="diff" id="context"> public boolean containsCode() {
return stmtList.containsCode();
}
</pre><pre class="diff" id="added">+ public List getStatementList() {
+ return stmtList.getStatementList();
+ }
+
</pre><pre class="diff" id="context"> public String getDocComment() {
return DocCommentUtils.getDocComment(ast);
}
</pre></div>
<hr /><a name="file8" /><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>ASTASReturnStatement.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASReturnStatement.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASReturnStatement.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,48 @@
</small></pre><pre class="diff" id="added">+/**
+ * ASTASReturnStatement.java
+ *
+ * Copyright (c) 2007 David Holroyd
+ */
+
+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+
+public class ASTASReturnStatement implements ASReturnStatement {
+
+ private LinkedListTree ast;
+
+ public ASTASReturnStatement(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public String getExpressionString() {
+ if (ast.getChildCount() == 0) {
+ return null;
+ }
+ return ASTUtils.stringifyNode(ast.getFirstChild());
+ }
+
+ public void setExpression(String expr) {
+ if (expr == null) {
+ if (ast.getChildCount() == 0) {
+ return;
+ }
+ ast.deleteChild(0);
+ return;
+ }
+ LinkedListTree expression = AS3FragmentParser.parseExpr(expr);
+ if (ast.getChildCount() == 0) {
+ LinkedListToken after = ast.getStopToken();
+ LinkedListToken before = after.getPrev();
+ ast.addChild(expression);
+ before.setNext(expression.getStartToken());
+ after.setPrev(expression.getStopToken());
+ } else {
+ ast.setChildWithTokens(0, expression);
+ }
+ }
+}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file9" /><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>ASTASWithStatement.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASWithStatement.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASWithStatement.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,28 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
+import uk.co.badgersinfoil.metaas.dom.StatementContainer;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASWithStatement extends ContainerDelegate implements ASWithStatement {
+
+ private static final int INDEX_CONDITION = 0;
+ private LinkedListTree ast;
+
+ public ASTASWithStatement(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ protected StatementContainer getStatementContainer() {
+ return new ASTStatementList(ast.getLastChild());
+ }
+
+ public String getConditionString() {
+ return ASTUtils.stringifyNode(ast.getFirstChild().getFirstChild());
+ }
+
+ public void setCondition(String expr) {
+ LinkedListTree cond = AS3FragmentParser.parseCondition(expr);
+ ast.setChildWithTokens(INDEX_CONDITION, cond);
+ }
+}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file10" /><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">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -285,4 +285,29 @@
</small></pre><pre class="diff" id="context"> switchStmt.addChildWithTokens(block);
return switchStmt;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newWith(String expr) {
+ LinkedListTree withStmt = ASTUtils.newAST(AS3Parser.WITH, "with");
+ withStmt.appendToken(TokenBuilder.newSpace());
+ withStmt.addChildWithTokens(AS3FragmentParser.parseCondition(expr));
+ return withStmt;
+ }
+
+ public static LinkedListTree newDeclaration(String assignment) {
+ LinkedListTree declStmt = ASTUtils.newAST(AS3Parser.VAR, "var");
+ declStmt.appendToken(TokenBuilder.newSpace());
+ declStmt.addChildWithTokens(AS3FragmentParser.parseVariableDeclarator(assignment));
+ declStmt.appendToken(TokenBuilder.newSemi());
+ return declStmt;
+ }
+
+ public static LinkedListTree newReturn(String expr) {
+ LinkedListTree returnStmt = ASTUtils.newAST(AS3Parser.RETURN, "return");
+ if (expr != null) {
+ returnStmt.appendToken(TokenBuilder.newSpace());
+ returnStmt.addChildWithTokens(AS3FragmentParser.parseExpr(expr));
+ }
+ returnStmt.appendToken(TokenBuilder.newSemi());
+ return returnStmt;
+ }
</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="file11" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTStatementList.java</b></big> <small id="info">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -11,14 +11,17 @@
</small></pre><pre class="diff" id="context"> import java.util.List;
import org.asdt.core.internal.antlr.AS3Parser;
import uk.co.badgersinfoil.metaas.dom.ASBlock;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASDeclarationStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForStatement;
import uk.co.badgersinfoil.metaas.dom.ASIfStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff"><small id="info">@@ -113,6 +116,25 @@
</small></pre><pre class="diff" id="context"> return new ASTASSwitchStatement(findBlock(switchStmt));
}
</pre><pre class="diff" id="added">+ public ASWithStatement newWith(String expr) {
+ LinkedListTree withStmt = ASTBuilder.newWith(expr);
+ appendBlock(withStmt);
+ addStatement(withStmt);
+ return new ASTASWithStatement(withStmt);
+ }
+
+ public ASDeclarationStatement newDeclaration(String assignment) {
+ LinkedListTree declStmt = ASTBuilder.newDeclaration(assignment);
+ addStatement(declStmt);
+ return new ASTASDeclarationStatement(declStmt);
+ }
+
+ public ASReturnStatement newReturn(String expr) {
+ LinkedListTree returnStmt = ASTBuilder.newReturn(expr);
+ addStatement(returnStmt);
+ return new ASTASReturnStatement(returnStmt);
+ }
+
</pre><pre class="diff" id="context"> private void addStatement(LinkedListTree stmt) {
ASTUtils.addChildWithIndentation(ast, stmt);
}
</pre><pre class="diff"><small id="info">@@ -142,4 +164,13 @@
</small></pre><pre class="diff" id="context"> private static LinkedListTree findBlock(LinkedListTree ast) {
return (LinkedListTree)ast.getFirstChildWithType(AS3Parser.BLOCK);
}
</pre><pre class="diff" id="added">+
+ public List getStatementList() {
+ List result = new ArrayList();
+ ASTIterator i = new ASTIterator(ast);
+ while (i.hasNext()) {
+ result.add(StatementBuilder.build(i.next()));
+ }
+ return Collections.unmodifiableList(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="file12" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ContainerDelegate.java</b></big> <small id="info">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -1,14 +1,17 @@
</small></pre><pre class="diff" id="context"> package uk.co.badgersinfoil.metaas.impl;
import java.util.List;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASDeclarationStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForStatement;
import uk.co.badgersinfoil.metaas.dom.ASIfStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.StatementContainer;
public abstract class ContainerDelegate implements StatementContainer {
</pre><pre class="diff"><small id="info">@@ -55,7 +58,23 @@
</small></pre><pre class="diff" id="context"> return getStatementContainer().newSwitch(condition);
}
</pre><pre class="diff" id="added">+ public ASWithStatement newWith(String expr) {
+ return getStatementContainer().newWith(expr);
+ }
+
+ public ASDeclarationStatement newDeclaration(String assignment) {
+ return getStatementContainer().newDeclaration(assignment);
+ }
+
+ public ASReturnStatement newReturn(String expr) {
+ return getStatementContainer().newReturn(expr);
+ }
+
</pre><pre class="diff" id="context"> public boolean containsCode() {
return getStatementContainer().containsCode();
}
</pre><pre class="diff" id="added">+
+ public List getStatementList() {
+ return getStatementContainer().getStatementList();
+ }
</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="file13" /><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>StatementBuilder.java</b></big> <small id="info">added at 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/StatementBuilder.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/StatementBuilder.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -0,0 +1,58 @@
</small></pre><pre class="diff" id="added">+/**
+ * StatementBuilder.java
+ *
+ * Copyright (c) 2006-2007 David Holroyd
+ */
+
+package uk.co.badgersinfoil.metaas.impl;
+
+import org.asdt.core.internal.antlr.AS3Parser;
+
+import uk.co.badgersinfoil.metaas.ActionScriptFactory;
+import uk.co.badgersinfoil.metaas.SyntaxException;
+import uk.co.badgersinfoil.metaas.dom.Statement;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+
+/**
+ * Utility for building {@link Statement} implementations wrapping statement
+ * nodes in the AST.
+ */
+public class StatementBuilder {
+
+ /**
+ * Build a Statement implementation (ASTAS*Statement) appropriate for
+ * the type of the given AST node.
+ */
+ public static Statement build(LinkedListTree ast) {
+ switch (ast.getType()) {
+ case AS3Parser.BLOCK:
+ return new ASTStatementList(ast);
+ case AS3Parser.DO:
+ return new ASTASDoWhileStatement(ast);
+ case AS3Parser.EXPR_STMNT:
+ return new ASTASExpressionStatement(ast);
+ case AS3Parser.FOR_EACH:
+ return new ASTASForEachInStatement(ast);
+ case AS3Parser.FOR_IN:
+ return new ASTASForInStatement(ast);
+ case AS3Parser.FOR:
+ return new ASTASForStatement(ast);
+ case AS3Parser.IF:
+ return new ASTASIfStatement(ast);
+ case AS3Parser.SWITCH:
+ return new ASTASSwitchStatement(ast);
+ case AS3Parser.CONST:
+ case AS3Parser.VAR:
+ return new ASTASDeclarationStatement(ast);
+ case AS3Parser.WHILE:
+ return new ASTASWhileStatement(ast);
+ case AS3Parser.WITH:
+ return new ASTASWithStatement(ast);
+ case AS3Parser.RETURN:
+ return new ASTASReturnStatement(ast);
+ default:
+ throw new SyntaxException("Unsupported statement node type: "+ASTUtils.tokenName(ast)+" in "+ActionScriptFactory.str(ASTUtils.stringifyNode(ast)));
+ }
+ }
+}
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></pre></div>
<hr /><a name="file14" /><div class="file">
<span class="pathname">metaas/trunk/src/test/java/uk/co/badgersinfoil/metaas</span><br />
<div class="fileheader"><big><b>BasicTests.java</b></big> <small id="info">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/BasicTests.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/BasicTests.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -5,11 +5,11 @@
</small></pre><pre class="diff" id="context"> import java.io.StringWriter;
import java.util.Arrays;
import java.util.List;
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASArg;
import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.dom.ASField;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASForStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASMethod;
import uk.co.badgersinfoil.metaas.dom.ASPackage;
import uk.co.badgersinfoil.metaas.dom.Visibility;
</pre><pre class="diff"><small id="info">@@ -50,6 +50,7 @@
</small></pre><pre class="diff" id="context"> " }" +
" with (scope) foo();" +
" var a=b?(x+y):new Foo();" +
</pre><pre class="diff" id="added">+ " const X=true;" +
</pre><pre class="diff" id="context"> " ff = function(y, z) { };" +
" l=[1,'2'];" +
" xx = doc.ns::name;" +
</pre><pre class="diff"><small id="info">@@ -112,6 +113,9 @@
</small></pre><pre class="diff" id="context"> StringWriter writer = new StringWriter();
fact.newWriter().write(writer, unit);
assertEquals(source.trim(), writer.toString());
</pre><pre class="diff" id="added">+
+ List stats = func.getStatementList();
+ assertTrue(stats.get(0) instanceof ASForStatement);
</pre><pre class="diff" id="context"> }
public void testInvalidInput() {
</pre></div>
<hr /><a name="file15" /><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">414 -> 415</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2007-02-14 00:05:04 UTC (rev 414)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2007-02-14 00:43:48 UTC (rev 415)
@@ -4,6 +4,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASDeclarationStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
</pre><pre class="diff"><small id="info">@@ -11,10 +12,12 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASForStatement;
import uk.co.badgersinfoil.metaas.dom.ASIfStatement;
import uk.co.badgersinfoil.metaas.dom.ASMethod;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASSwitchCase;
import uk.co.badgersinfoil.metaas.dom.ASSwitchDefault;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.Visibility;
import junit.framework.TestCase;
</pre><pre class="diff"><small id="info">@@ -141,7 +144,39 @@
</small></pre><pre class="diff" id="context"> ASSwitchDefault def= swtch.newDefault();
def.addStmt("trace('default')");
}
</pre><pre class="diff" id="added">+
+ public void testWith() {
+ ASWithStatement with = meth.newWith("foo");
+ with.addStmt("trace(test)");
+ assertEquals("foo", with.getConditionString());
+ with.setCondition("bar");
+ assertEquals("bar", with.getConditionString());
+ }
+
+ public void testDeclaration() {
+ ASDeclarationStatement decl = meth.newDeclaration("a=1");
+ assertFalse(decl.isConstant());
+
<a name="task1" />+ // <span class="task">TODO</span>: multiple names in one declaration
+
+ decl.setContant(true);
+ assertTrue(decl.isConstant());
+ }
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ public void testReturn() {
+ ASReturnStatement returnStmt = meth.newReturn(null);
+ assertNull(returnStmt.getExpressionString());
+ returnStmt.setExpression("false");
+ assertEquals("false", returnStmt.getExpressionString());
+ }
+
+ public void testReturnRemoveExpr() {
+ ASReturnStatement returnStmt = meth.newReturn("true");
+ assertEquals("true", returnStmt.getExpressionString());
+ returnStmt.setExpression(null);
+ assertNull(returnStmt.getExpressionString());
+ }
+
</pre><pre class="diff" id="context"> public void testBlockEmpty() {
assertFalse(meth.containsCode());
meth.addComment(" a comment");
</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>