<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">ASExpressionStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+7</td><td></td><td nowrap="nowrap" align="right">added 408</td></tr>
<tr class="alt"><td><tt> /<a href="#file2">StatementContainer.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="center">407 -> 408</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file3">AS3FragmentParser.java</a></tt> </td><td></td><td align="right" id="added">+10</td><td></td><td nowrap="nowrap" align="center">407 -> 408</td></tr>
<tr class="alt"><td><tt> /<a href="#file4"><span id="added">ASTASExpressionStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+21</td><td></td><td nowrap="nowrap" align="right">added 408</td></tr>
<tr><td><tt> /<a href="#file5">ASTASMethod.java</a></tt> </td><td></td><td align="right" id="added">+6</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">407 -> 408</td></tr>
<tr class="alt"><td><tt> /<a href="#file6">ASTStatementList.java</a></tt> </td><td></td><td align="right" id="added">+12</td><td></td><td nowrap="nowrap" align="center">407 -> 408</td></tr>
<tr><td><tt> /<a href="#file7">ContainerDelegate.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="center">407 -> 408</td></tr>
<tr class="alt"><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file8">StatementTests.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">407 -> 408</td></tr>
<tr><td></td><td></td><td align="right" id="added">+79</td><td align="right" id="removed">-4</td><td></td></tr>
</table>
<small id="info">2 added + 6 modified, total 8 files</small><br />
<div class="tasklist"><ul>
<li><a href="#task1">TODO: make the ASBlock implementation independant of the StatementContainer implementation</a></li>
</ul></div>
<pre class="comment">
enhanced support for expression-statements
</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>ASExpressionStatement.java</b></big> <small id="info">added at 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASExpressionStatement.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASExpressionStatement.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -0,0 +1,7 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASExpressionStatement extends Statement {
+
+ public String getExpressionString();
+ public void setExpression(String expr);
+}
</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>StatementContainer.java</b></big> <small id="info">407 -> 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -22,7 +22,16 @@
</small></pre><pre class="diff" id="context"> */
public void addStmt(String statement);
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> /**
</pre><pre class="diff" id="added">+ * Adds a new expression-statement to the code, and returns a reference
+ * to it. An 'expression-statement' is a statement that just contains
+ * an expression (followed in normal ActionScript by a semicolon, though
+ * that should be omitted from the supplied string).
+ */
+ public ASExpressionStatement newExprStmt(String expr);
+
+ /**
</pre><pre class="diff" id="context"> * Adds a single-line comment to list of statements being generated
*
* @param text the text of the comment (minus the initial '//') which
</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>AS3FragmentParser.java</b></big> <small id="info">407 -> 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/AS3FragmentParser.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -33,6 +33,16 @@
</small></pre><pre class="diff" id="context"> return stmt;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree parseExprStatement(String expr) {
+ AS3Parser parser = ASTUtils.parse(expr + ";");
+ try {
+ return tree(parser.expressionStatement());
+ } catch (RecognitionException e) {
+ throw ASTUtils.buildSyntaxException(expr, parser, e);
+ }
+ }
+
</pre><pre class="diff" id="context"> /**
* Attempts to parse the given string as an AS3 expression for use as
* a parenthesised conditional or with-statement parameter (the
</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>ASTASExpressionStatement.java</b></big> <small id="info">added at 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASExpressionStatement.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASExpressionStatement.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -0,0 +1,21 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASExpressionStatement implements ASExpressionStatement {
+
+ private LinkedListTree ast;
+
+ public ASTASExpressionStatement(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public String getExpressionString() {
+ return ASTUtils.stringifyNode(ast.getFirstChild());
+ }
+
+ public void setExpression(String expr) {
+ ast.setChildWithTokens(0, AS3FragmentParser.parseExpr(expr));
+ }
+}
</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>ASTASMethod.java</b></big> <small id="info">407 -> 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -13,6 +13,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.SyntaxException;
import uk.co.badgersinfoil.metaas.dom.ASArg;
import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForStatement;
</pre><pre class="diff"><small id="info">@@ -84,7 +85,11 @@
</small></pre><pre class="diff" id="context"> public void addStmt(String statement) {
stmtList.addStmt(statement);
}
</pre><pre class="diff" id="removed">-
</pre><pre class="diff" id="added">+
+ public ASExpressionStatement newExprStmt(String expr) {
+ return stmtList.newExprStmt(expr);
+ }
+
</pre><pre class="diff" id="context"> private LinkedListTree findParams() {
return ASTUtils.findChildByType(ast, AS3Parser.PARAMS);
}
</pre></div>
<hr /><a name="file6" /><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">407 -> 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -6,9 +6,13 @@
</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.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForStatement;
</pre><pre class="diff"><small id="info">@@ -18,6 +22,8 @@
</small></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" id="added"><a name="task1" />+// <span class="task">TODO</span>: make the ASBlock implementation independant of the StatementContainer implementation
+
</pre><pre class="diff" id="context"> /**
* Implements the behavior of StatementContainer. May be managing statements
* for either be a block, or a switch-statement label.
</pre><pre class="diff"><small id="info">@@ -36,6 +42,12 @@
</small></pre><pre class="diff" id="context"> addStatement(stmt);
}
</pre><pre class="diff" id="added">+ public ASExpressionStatement newExprStmt(String expr) {
+ LinkedListTree stmt = AS3FragmentParser.parseExprStatement(expr);
+ addStatement(stmt);
+ return new ASTASExpressionStatement(stmt);
+ }
+
</pre><pre class="diff" id="context"> public void addComment(String text) {
LinkedListToken comment = TokenBuilder.newSLComment("//" + text);
String indent = findIndentForComment();
</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>ContainerDelegate.java</b></big> <small id="info">407 -> 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -2,6 +2,7 @@
</small></pre><pre class="diff" id="context">
import java.util.List;
import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForStatement;
</pre><pre class="diff"><small id="info">@@ -18,6 +19,10 @@
</small></pre><pre class="diff" id="context"> getStatementContainer().addStmt(statement);
}
</pre><pre class="diff" id="added">+ public ASExpressionStatement newExprStmt(String expr) {
+ return getStatementContainer().newExprStmt(expr);
+ }
+
</pre><pre class="diff" id="context"> public void addComment(String text) {
getStatementContainer().addComment(text);
}
</pre></div>
<hr /><a name="file8" /><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">407 -> 408</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2007-02-12 00:04:50 UTC (rev 407)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2007-02-12 22:35:50 UTC (rev 408)
@@ -1,12 +1,11 @@
</small></pre><pre class="diff" id="context"> package uk.co.badgersinfoil.metaas;
import java.io.IOException;
</pre><pre class="diff" id="removed">-import java.io.OutputStreamWriter;
-
</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;
import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASForEachInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForInStatement;
import uk.co.badgersinfoil.metaas.dom.ASForStatement;
</pre><pre class="diff"><small id="info">@@ -40,10 +39,17 @@
</small></pre><pre class="diff" id="context"> meth.setDocComment("\n doc\n comment!\n");
}
</pre><pre class="diff" id="removed">- public void test<span id="removedchars">Expression</span>Statement() {
</pre><pre class="diff" id="added">+ public void test<span id="addedchars">Generic</span>Statement() {
</pre><pre class="diff" id="context"> meth.addStmt("a=1");
}
</pre><pre class="diff" id="added">+ public void testExpressionStatement() {
+ ASExpressionStatement exprStmt = meth.newExprStmt("go()");
+ assertEquals("go()", exprStmt.getExpressionString());
+ exprStmt.setExpression("stop()");
+ assertEquals("stop()", exprStmt.getExpressionString());
+ }
+
</pre><pre class="diff" id="context"> public void testIfStatement() {
ASIfStatement ifStmt = meth.newIf("a == b");
ifStmt.addStmt("trace('then true!')");
</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>