<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/main/java/uk/co/badgersinfoil/metaas/impl</tt></b></td></tr>
<tr><td><tt><a href="#file1">ASTFactory.java</a></tt> </td><td></td><td align="right" id="added">+101</td><td></td><td nowrap="nowrap" align="center">367 -> 368</td></tr>
<tr class="alt"><td><tt><a href="#file2">ASTStatementList.java</a></tt> </td><td></td><td align="right" id="added">+31</td><td align="right" id="removed">-85</td><td nowrap="nowrap" align="center">367 -> 368</td></tr>
<tr><td></td><td></td><td align="right" id="added">+132</td><td align="right" id="removed">-85</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
extract lots more AST synthesis code out into ASTFactory
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTFactory.java</b></big> <small id="info">367 -> 368</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java 2007-01-25 20:22:48 UTC (rev 367)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java 2007-01-29 21:44:21 UTC (rev 368)
@@ -14,6 +14,10 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff" id="added">+/**
+ * Utilities to build and assemble Abstract Syntax Tree fragments for inclusion
+ * into the compilation unit being generated.
+ */
</pre><pre class="diff" id="context"> public class ASTFactory {
private ASTFactory() {
</pre><pre class="diff"><small id="info">@@ -173,4 +177,101 @@
</small></pre><pre class="diff" id="context"> ast.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, name));
return ast;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newIf(String condition) {
+ LinkedListTree ifStmt = ASTUtils.newAST(AS3Parser.IF, "if");
+ ifStmt.appendToken(TokenBuilder.newSpace());
+ ifStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
+ ifStmt.appendToken(TokenBuilder.newSpace());
+ ifStmt.addChildWithTokens(ASTFactory.newBlock());
+ return ifStmt;
+ }
+
+ public static LinkedListTree newFor(String init, String condition, String iterate) {
+ LinkedListTree forStmt = ASTUtils.newAST(AS3Parser.FOR, "for");
+ forStmt.appendToken(TokenBuilder.newSpace());
+ forStmt.appendToken(TokenBuilder.newLParen());
+ if (init != null) {
+ forStmt.addChildWithTokens(AS3FragmentParser.parseForInit(init));
+ } else {
+ LinkedListTree initStmt = ASTUtils.newAST(AS3Parser.FOR_INIT);
+ forStmt.addChildWithTokens(initStmt);
+ }
+ forStmt.appendToken(TokenBuilder.newSemi());
+ forStmt.appendToken(TokenBuilder.newSpace());
+ if (condition != null) {
+ forStmt.addChildWithTokens(AS3FragmentParser.parseForCond(condition));
+ } else {
+ LinkedListTree condStmt = ASTUtils.newAST(AS3Parser.FOR_CONDITION);
+ forStmt.addChildWithTokens(condStmt);
+ }
+ forStmt.appendToken(TokenBuilder.newSemi());
+ forStmt.appendToken(TokenBuilder.newSpace());
+ if (iterate != null) {
+ forStmt.addChildWithTokens(AS3FragmentParser.parseForIter(iterate));
+ } else {
+ LinkedListTree iterStmt = ASTUtils.newAST(AS3Parser.FOR_ITERATOR);
+ forStmt.addChildWithTokens(iterStmt);
+ }
+ forStmt.appendToken(TokenBuilder.newRParen());
+ return forStmt;
+ }
+
+ public static LinkedListTree newForIn(String declaration, String expression) {
+ LinkedListTree forStmt = ASTUtils.newAST(AS3Parser.FOR, "for");
+ forStmt.appendToken(TokenBuilder.newSpace());
+ genForInSetup(forStmt, declaration, expression);
+ return forStmt;
+ }
+
+ public static LinkedListTree newForEachIn(String declaration, String expression) {
+ LinkedListTree forStmt = ASTUtils.newAST(AS3Parser.FOR_EACH, "for");
+ forStmt.appendToken(TokenBuilder.newSpace());
+ forStmt.appendToken(TokenBuilder.newEach());
+ genForInSetup(forStmt, declaration, expression);
+ return forStmt;
+ }
+
+ /**
+ * Common code for both for-in and for-each-in loop setup
+ */
+ private static void genForInSetup(LinkedListTree forStmt, String declaration, String expression) {
+ forStmt.appendToken(TokenBuilder.newLParen());
+ forStmt.addChildWithTokens(AS3FragmentParser.parseDeclaration(declaration));
+ forStmt.appendToken(TokenBuilder.newSpace());
+ forStmt.appendToken(TokenBuilder.newIn());
+ forStmt.appendToken(TokenBuilder.newSpace());
+ forStmt.addChildWithTokens(AS3FragmentParser.parseExpr(expression));
+ forStmt.appendToken(TokenBuilder.newRParen());
+ }
+
+ public static LinkedListTree newWhile(String condition) {
+ LinkedListTree whileStmt = ASTUtils.newAST(AS3Parser.WHILE, "while");
+ whileStmt.appendToken(TokenBuilder.newSpace());
+ whileStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
+ return whileStmt;
+ }
+
+ public static LinkedListTree newDoWhile(String condition) {
+ LinkedListTree doWhileStmt = ASTUtils.newAST(AS3Parser.DO, "do");
+ doWhileStmt.appendToken(TokenBuilder.newSpace());
+ LinkedListTree block = ASTFactory.newBlock();
+ doWhileStmt.addChildWithTokens(block);
+ doWhileStmt.appendToken(TokenBuilder.newSpace());
+ doWhileStmt.appendToken(TokenBuilder.newWhile());
+ doWhileStmt.appendToken(TokenBuilder.newSpace());
+ doWhileStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
+ doWhileStmt.appendToken(TokenBuilder.newSemi());
+ return doWhileStmt;
+ }
+
+ public static LinkedListTree newSwitch(String condition) {
+ LinkedListTree switchStmt = ASTUtils.newAST(AS3Parser.SWITCH, "switch");
+ switchStmt.appendToken(TokenBuilder.newSpace());
+ switchStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
+ switchStmt.appendToken(TokenBuilder.newSpace());
+ LinkedListTree block = ASTFactory.newBlock();
+ switchStmt.addChildWithTokens(block);
+ return switchStmt;
+ }
</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">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>ASTStatementList.java</b></big> <small id="info">367 -> 368</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-01-25 20:22:48 UTC (rev 367)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-01-29 21:44:21 UTC (rev 368)
@@ -6,9 +6,7 @@
</small></pre><pre class="diff" id="context">
package uk.co.badgersinfoil.metaas.impl;
</pre><pre class="diff" id="removed">-import org.antlr.runtime.RecognitionException;
</pre><pre class="diff" id="context"> import org.asdt.core.internal.antlr.AS3Parser;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.SyntaxException;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASIfStatement;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff"><small id="info">@@ -54,119 +52,49 @@
</small></pre><pre class="diff" id="context"> }
public ASIfStatement newIf(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree ifStmt = ASTUtils.newAST(AS3Parser.IF, "if");
- ifStmt.appendToken(TokenBuilder.newSpace());
- ifStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
- ifStmt.appendToken(TokenBuilder.newSpace());
- ifStmt.addChildWithTokens(ASTFactory.newBlock());
</pre><pre class="diff" id="added">+ LinkedListTree ifStmt = ASTFactory.newIf(condition);
</pre><pre class="diff" id="context"> addStatement(ifStmt);
return new ASTASIfStatement(ifStmt);
}
public StatementContainer newFor(String init, String condition, String iterate) {
</pre><pre class="diff" id="removed">- LinkedListTree forStmt = ASTUtils.newAST(AS3Parser.FOR, "for");
- forStmt.appendToken(TokenBuilder.newSpace());
- forStmt.appendToken(TokenBuilder.newLParen());
- if (init != null) {
- forStmt.addChildWithTokens(AS3FragmentParser.parseForInit(init));
- } else {
- LinkedListTree initStmt = ASTUtils.newAST(AS3Parser.FOR_INIT);
- forStmt.addChildWithTokens(initStmt);
- }
- forStmt.appendToken(TokenBuilder.newSemi());
- forStmt.appendToken(TokenBuilder.newSpace());
- if (condition != null) {
- forStmt.addChildWithTokens(AS3FragmentParser.parseForCond(condition));
- } else {
- LinkedListTree condStmt = ASTUtils.newAST(AS3Parser.FOR_CONDITION);
- forStmt.addChildWithTokens(condStmt);
- }
- forStmt.appendToken(TokenBuilder.newSemi());
- forStmt.appendToken(TokenBuilder.newSpace());
- if (iterate != null) {
- forStmt.addChildWithTokens(AS3FragmentParser.parseForIter(iterate));
- } else {
- LinkedListTree iterStmt = ASTUtils.newAST(AS3Parser.FOR_ITERATOR);
- forStmt.addChildWithTokens(iterStmt);
- }
- forStmt.appendToken(TokenBuilder.newRParen());
- forStmt.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = ASTFactory.newBlock();
- forStmt.addChildWithTokens(block);
</pre><pre class="diff" id="added">+ LinkedListTree forStmt = ASTFactory.newFor(init, condition, iterate);
</pre><pre class="diff" id="context"> addStatement(forStmt);
</pre><pre class="diff" id="added">+ LinkedListTree block = appendBlock(forStmt);
</pre><pre class="diff" id="context"> return new ASTStatementList(block);
}
public StatementContainer newForIn(String declaration, String expression) {
</pre><pre class="diff" id="removed">- LinkedListTree forStmt = ASTUtils.newAST(AS3Parser.FOR, "for");
- forStmt.appendToken(TokenBuilder.newSpace());
- genForInSetup(forStmt, declaration, expression);
- forStmt.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = ASTFactory.newBlock();
- forStmt.addChildWithTokens(block);
</pre><pre class="diff" id="added">+ LinkedListTree forStmt = ASTFactory.newForIn(declaration, expression);
+ LinkedListTree block = appendBlock(forStmt);
</pre><pre class="diff" id="context"> addStatement(forStmt);
return new ASTStatementList(block);
}
public StatementContainer newForEachIn(String declaration, String expression) {
</pre><pre class="diff" id="removed">- LinkedListTree forStmt = ASTUtils.newAST(AS3Parser.FOR_EACH, "for");
- forStmt.appendToken(TokenBuilder.newSpace());
- forStmt.appendToken(TokenBuilder.newEach());
- genForInSetup(forStmt, declaration, expression);
- forStmt.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = ASTFactory.newBlock();
- forStmt.addChildWithTokens(block);
</pre><pre class="diff" id="added">+ LinkedListTree forStmt = ASTFactory.newForEachIn(declaration, expression);
+ LinkedListTree block = appendBlock(forStmt);
</pre><pre class="diff" id="context"> addStatement(forStmt);
return new ASTStatementList(block);
}
</pre><pre class="diff" id="removed">- /**
- * Common code for both for-in and for-each-in loop setup
- */
- private void genForInSetup(LinkedListTree forStmt, String declaration, String expression) {
- forStmt.appendToken(TokenBuilder.newLParen());
- forStmt.addChildWithTokens(AS3FragmentParser.parseDeclaration(declaration));
- forStmt.appendToken(TokenBuilder.newSpace());
- forStmt.appendToken(TokenBuilder.newIn());
- forStmt.appendToken(TokenBuilder.newSpace());
- forStmt.addChildWithTokens(AS3FragmentParser.parseExpr(expression));
- forStmt.appendToken(TokenBuilder.newRParen());
- }
-
</pre><pre class="diff" id="context"> public StatementContainer newWhile(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree whileStmt = ASTUtils.newAST(AS3Parser.WHILE, "while");
- whileStmt.appendToken(TokenBuilder.newSpace());
- whileStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
- whileStmt.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = ASTFactory.newBlock();
- whileStmt.addChildWithTokens(block);
</pre><pre class="diff" id="added">+ LinkedListTree whileStmt = ASTFactory.newWhile(condition);
+ LinkedListTree block = appendBlock(whileStmt);
</pre><pre class="diff" id="context"> addStatement(whileStmt);
return new ASTStatementList(block);
}
public StatementContainer newDoWhile(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree doWhileStmt = ASTUtils.newAST(AS3Parser.DO, "do");
- doWhileStmt.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = ASTFactory.newBlock();
- doWhileStmt.addChildWithTokens(block);
- doWhileStmt.appendToken(TokenBuilder.newSpace());
- doWhileStmt.appendToken(TokenBuilder.newWhile());
- doWhileStmt.appendToken(TokenBuilder.newSpace());
- doWhileStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
- doWhileStmt.appendToken(TokenBuilder.newSemi());
</pre><pre class="diff" id="added">+ LinkedListTree doWhileStmt = ASTFactory.newDoWhile(condition);
</pre><pre class="diff" id="context"> addStatement(doWhileStmt);
</pre><pre class="diff" id="removed">- return new ASTStatementList(block);
</pre><pre class="diff" id="added">+ return new ASTStatementList(findBlock(doWhileStmt));
</pre><pre class="diff" id="context"> }
public ASSwitchStatement newSwitch(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree switchStmt = ASTUtils.newAST(AS3Parser.SWITCH, "switch");
- switchStmt.appendToken(TokenBuilder.newSpace());
- switchStmt.addChildWithTokens(AS3FragmentParser.parseCondition(condition));
- switchStmt.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = ASTFactory.newBlock();
- switchStmt.addChildWithTokens(block);
</pre><pre class="diff" id="added">+ LinkedListTree switchStmt = ASTFactory.newSwitch(condition);
</pre><pre class="diff" id="context"> addStatement(switchStmt);
</pre><pre class="diff" id="removed">- return new ASTASSwitchStatement(block);
</pre><pre class="diff" id="added">+ return new ASTASSwitchStatement(findBlock(switchStmt));
</pre><pre class="diff" id="context"> }
private void addStatement(LinkedListTree stmt) {
</pre><pre class="diff"><small id="info">@@ -180,4 +108,22 @@
</small></pre><pre class="diff" id="context"> public LinkedListTree getAST() {
return ast;
}
</pre><pre class="diff" id="added">+
+ /**
+ * Appends a block node as a child of the given node (preceeding it
+ * with a space token) and returns a reference to the new block.
+ */
+ private static LinkedListTree appendBlock(LinkedListTree ast) {
+ ast.appendToken(TokenBuilder.newSpace());
+ LinkedListTree block = ASTFactory.newBlock();
+ ast.addChildWithTokens(block);
+ return block;
+ }
+
+ /**
+ * Returns the first BLOCK child of the given node
+ */
+ private static LinkedListTree findBlock(LinkedListTree ast) {
+ return (LinkedListTree)ast.getFirstChildWithType(AS3Parser.BLOCK);
+ }
</pre><pre class="diff" id="context"> }
</pre><pre class="diff"><small id="info">\ No newline at end of file
</small></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>