<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</tt></b></td></tr>
<tr><td><tt><a href="#file1">ActionScriptFactory.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center">384 -> 385</td></tr>
<tr class="alt"><td><tt>impl/<a href="#file2">ASTASClassType.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">384 -> 385</td></tr>
<tr><td><tt> /<a href="#file3">ASTASIfStatement.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">384 -> 385</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">ASTASInterfaceType.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">384 -> 385</td></tr>
<tr><td><tt> /<a href="#file5"><span id="copied">ASTBuilder.java</span></a></tt> </td><td colspan="3" align="center"><small id="info">[copied]</small></td><td nowrap="nowrap" align="center">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java:384 -> 385</td></tr>
<tr class="alt"><td><tt> /<a href="#file6"><span id="removed">ASTFactory.java</span></a></tt> </td><td></td><td></td><td align="right" id="removed">-290</td><td nowrap="nowrap">384 removed</td></tr>
<tr><td><tt> /<a href="#file7">ASTStatementList.java</a></tt> </td><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center">384 -> 385</td></tr>
<tr class="alt"><td><tt> /<a href="#file8">TagUtils.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">384 -> 385</td></tr>
<tr><td></td><td></td><td align="right" id="added">+17</td><td align="right" id="removed">-307</td><td></td></tr>
</table>
<small id="info">1 removed + 1 copied + 6 modified, total 8 files</small><br />
<pre class="comment">
renamed 'ASTFactory' to 'ASTBuilder', reflecting the design pattern actually implemented by the class
</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">384 -> 385</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -11,7 +11,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTActionScriptParser;
import uk.co.badgersinfoil.metaas.impl.ASTActionScriptProject;
import uk.co.badgersinfoil.metaas.impl.ASTActionScriptWriter;
</pre><pre class="diff" id="removed">-import uk.co.badgersinfoil.metaas.impl.AST<span id="removedchars">Factory</span>;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.AST<span id="addedchars">Builder</span>;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.ASTStatementList;
import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
</pre><pre class="diff"><small id="info">@@ -32,7 +32,7 @@
</small></pre><pre class="diff" id="context"> * </pre>
*/
public ASCompilationUnit newClass(String qualifiedClassName) {
</pre><pre class="diff" id="removed">- return AST<span id="removedchars">Factory</span>.synthesizeClass(qualifiedClassName);
</pre><pre class="diff" id="added">+ return AST<span id="addedchars">Builder</span>.synthesizeClass(qualifiedClassName);
</pre><pre class="diff" id="context"> }
/**
</pre><pre class="diff"><small id="info">@@ -46,7 +46,7 @@
</small></pre><pre class="diff" id="context"> * </pre>
*/
public ASCompilationUnit newInterface(String qualifiedInterfaceName) {
</pre><pre class="diff" id="removed">- return AST<span id="removedchars">Factory</span>.synthesizeInterface(qualifiedInterfaceName);
</pre><pre class="diff" id="added">+ return AST<span id="addedchars">Builder</span>.synthesizeInterface(qualifiedInterfaceName);
</pre><pre class="diff" id="context"> }
public ActionScriptWriter newWriter() {
</pre><pre class="diff"><small id="info">@@ -94,7 +94,7 @@
</small></pre><pre class="diff" id="context"> * {@link uk.co.badgersinfoil.metaas.dom.ASIfStatement}, for instance.
*/
public ASBlock newBlock() {
</pre><pre class="diff" id="removed">- LinkedListTree block = AST<span id="removedchars">Factory</span>.newBlock();
</pre><pre class="diff" id="added">+ LinkedListTree block = AST<span id="addedchars">Builder</span>.newBlock();
</pre><pre class="diff" id="context"> return new ASTStatementList(block);
}
</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>ASTASClassType.java</b></big> <small id="info">384 -> 385</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASClassType.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASClassType.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -26,7 +26,7 @@
</small></pre><pre class="diff" id="context"> }
public ASMethod newMethod(String name, Visibility visibility, String returnType) {
</pre><pre class="diff" id="removed">- ASTASMethod method = AST<span id="removedchars">Factory</span>.newClassMethod(name, visibility, returnType);
</pre><pre class="diff" id="added">+ ASTASMethod method = AST<span id="addedchars">Builder</span>.newClassMethod(name, visibility, returnType);
</pre><pre class="diff" id="context"> addMethod(method);
return method;
}
</pre><pre class="diff"><small id="info">@@ -124,7 +124,7 @@
</small></pre><pre class="diff" id="context"> }
public ASField newField(String name, Visibility visibility, String type) {
</pre><pre class="diff" id="removed">- ASTASField field = AST<span id="removedchars">Factory</span>.newField(name, visibility, type);
</pre><pre class="diff" id="added">+ ASTASField field = AST<span id="addedchars">Builder</span>.newField(name, visibility, type);
</pre><pre class="diff" id="context"> addField(field);
return field;
}
</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>ASTASIfStatement.java</b></big> <small id="info">384 -> 385</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASIfStatement.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASIfStatement.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -36,7 +36,7 @@
</small></pre><pre class="diff" id="context"> ast.appendToken(TokenBuilder.newSpace());
ast.addChildWithTokens(elseStmt);
elseStmt.appendToken(TokenBuilder.newSpace());
</pre><pre class="diff" id="removed">- LinkedListTree block = AST<span id="removedchars">Factory</span>.newBlock();
</pre><pre class="diff" id="added">+ LinkedListTree block = AST<span id="addedchars">Builder</span>.newBlock();
</pre><pre class="diff" id="context"> elseStmt.addChildWithTokens(block);
ASTUtils.increaseIndentAfterFirstLine(block, indent);
}
</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>ASTASInterfaceType.java</b></big> <small id="info">384 -> 385</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASInterfaceType.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASInterfaceType.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -80,7 +80,7 @@
</small></pre><pre class="diff" id="context"> }
public ASMethod newMethod(String name, Visibility visibility, String returnType) {
</pre><pre class="diff" id="removed">- ASTASMethod meth = AST<span id="removedchars">Factory</span>.newInterfaceMethod(name, visibility, returnType);
</pre><pre class="diff" id="added">+ ASTASMethod meth = AST<span id="addedchars">Builder</span>.newInterfaceMethod(name, visibility, returnType);
</pre><pre class="diff" id="context"> addMethod(meth);
return meth;
}
</pre></div>
<hr /><a name="file5" /><div class="file">
<span class="pathname" id="copied">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader" id="copied"><big><b>ASTBuilder.java</b></big> <small id="info">copied from metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java:384</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java 2007-02-04 22:54:55 UTC (rev 382)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -0,0 +1,290 @@
</small></pre><pre class="diff" id="added">+/**
+ * ASTFactory.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.SyntaxException;
+import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
+import uk.co.badgersinfoil.metaas.dom.Visibility;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+
+/**
+ * Utilities to build and assemble Abstract Syntax Tree fragments for inclusion
+ * into the compilation unit being generated.
+ */
+public class ASTBuilder {
+
+ private ASTBuilder() {
+ // hide default ctor
+ }
+
+ public static AS3ASTCompilationUnit synthesizeClass(String qualifiedName) {
+ LinkedListTree unit = ASTUtils.newImaginaryAST(AS3Parser.COMPILATION_UNIT);
+ LinkedListTree pkg = ASTUtils.newAST(AS3Parser.PACKAGE, "package");
+ pkg.appendToken(TokenBuilder.newSpace());
+ unit.addChildWithTokens(pkg);
+ String packageName = packageNameFrom(qualifiedName);
+ if (packageName != null) {
+ pkg.addChildWithTokens(AS3FragmentParser.parseIdent(packageName));
+ }
+ LinkedListTree packageBlock = newBlock();
+ pkg.addChildWithTokens(packageBlock);
+ String className = typeNameFrom(qualifiedName);
+
+ LinkedListTree clazz = synthesizeAS3Class(className);
+ ASTUtils.addChildWithIndentation(packageBlock, clazz);
+ return new AS3ASTCompilationUnit(unit);
+ }
+
+ public static ASCompilationUnit synthesizeInterface(String qualifiedName) {
+ LinkedListTree unit = ASTUtils.newImaginaryAST(AS3Parser.COMPILATION_UNIT);
+ LinkedListTree pkg = ASTUtils.newAST(AS3Parser.PACKAGE, "package");
+ unit.addChildWithTokens(pkg);
+ String packageName = packageNameFrom(qualifiedName);
+ if (packageName != null) {
+ pkg.addChildWithTokens(AS3FragmentParser.parseIdent(packageName));
+ }
+ LinkedListTree packageBlock = newBlock();
+ pkg.addChildWithTokens(packageBlock);
+
+ LinkedListTree iface = synthesizeAS3Interface(qualifiedName);
+ packageBlock.addChildWithTokens(iface);
+ return new AS3ASTCompilationUnit(unit);
+ }
+
+ private static LinkedListTree synthesizeAS3Interface(String qualifiedName) {
+ LinkedListTree iface = ASTUtils.newImaginaryAST(AS3Parser.INTERFACE_DEF);
+ LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
+ annos.appendToken(TokenBuilder.newNewline());
+ iface.addChildWithTokens(annos);
+ LinkedListTree modifiers = ASTUtils.newImaginaryAST(AS3Parser.MODIFIERS);
+ iface.addChildWithTokens(modifiers);
+ modifiers.addChildWithTokens(ASTUtils.newAST(AS3Parser.PUBLIC, "public"));
+ modifiers.appendToken(TokenBuilder.newSpace());
+ iface.appendToken(TokenBuilder.newInterface());
+ iface.appendToken(TokenBuilder.newSpace());
+ iface.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, typeNameFrom(qualifiedName)));
+ iface.appendToken(TokenBuilder.newSpace());
+ LinkedListTree typeBlock = ASTUtils.newParentheticAST(AS3Parser.TYPE_BLOCK, AS3Parser.LCURLY, "{", AS3Parser.RCURLY, "}");
+ iface.addChildWithTokens(typeBlock);
+ return iface;
+ }
+
+ private static String typeNameFrom(String qualifiedName) {
+ int p = qualifiedName.lastIndexOf('.');
+ if (p == -1) {
+ return qualifiedName;
+ }
+ return qualifiedName.substring(p+1);
+ }
+
+ private static LinkedListTree synthesizeAS3Class(String className) {
+ LinkedListTree clazz = ASTUtils.newImaginaryAST(AS3Parser.CLASS_DEF);
+ LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
+ annos.appendToken(TokenBuilder.newNewline());
+ clazz.addChildWithTokens(annos);
+ LinkedListTree modifiers = ASTUtils.newImaginaryAST(AS3Parser.MODIFIERS);
+ clazz.addChildWithTokens(modifiers);
+ LinkedListTree modPublic = ASTUtils.newAST(AS3Parser.PUBLIC, "public");
+ modifiers.addChildWithTokens(modPublic);
+ modifiers.appendToken(TokenBuilder.newSpace());
+ clazz.appendToken(TokenBuilder.newClass());
+ clazz.appendToken(TokenBuilder.newSpace());
+ clazz.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, className));
+ clazz.appendToken(TokenBuilder.newSpace());
+ LinkedListTree typeBlock = ASTUtils.newParentheticAST(AS3Parser.TYPE_BLOCK, AS3Parser.LCURLY, "{", AS3Parser.RCURLY, "}");
+ LinkedListToken typeBlockNL = TokenBuilder.newNewline();
+ typeBlock.getInitialInsertionAfter().afterInsert(typeBlockNL);
+ typeBlock.setInitialInsertionAfter(typeBlockNL);
+ clazz.addChildWithTokens(typeBlock);
+ return clazz;
+ }
+
+ private static String packageNameFrom(String qualifiedName) {
+ int p = qualifiedName.lastIndexOf('.');
+ if (p == -1) {
+ return null;
+ }
+ return qualifiedName.substring(0, p);
+ }
+
+ public static ASTASMethod newClassMethod(String name, Visibility visibility, String returnType) {
+ LinkedListTree def = ASTUtils.newImaginaryAST(AS3Parser.METHOD_DEF);
+ LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
+ def.addChildWithTokens(annos);
+ def.addChildWithTokens(ASTUtils.toModifiers(visibility));
+ LinkedListTree decl = ASTUtils.newAST(AS3Parser.FUNCTION, "function");
+ def.addChildWithTokens(decl);
+ decl.appendToken(TokenBuilder.newSpace());
+ LinkedListTree methName = ASTUtils.newAST(AS3Parser.IDENT, name);
+ def.addChildWithTokens(methName);
+ def.addChildWithTokens(ASTUtils.newParentheticAST(AS3Parser.PARAMS, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")"));
+ if (returnType != null) {
+ def.addChildWithTokens(AS3FragmentParser.parseTypeSpec(returnType));
+ }
+ def.appendToken(TokenBuilder.newSpace());
+ LinkedListTree block = newBlock();
+ def.addChildWithTokens(block);
+
+ return new ASTASMethod(def);
+ }
+
+ public static ASTASField newField(String name, Visibility visibility, String type) {
+ if (name.indexOf('.') != -1) {
+ throw new SyntaxException("field name must not contain '.'");
+ }
+ LinkedListTree decl = ASTUtils.newImaginaryAST(AS3Parser.VAR_DEF);
+ LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
+ decl.addChildWithTokens(annos);
+ decl.addChildWithTokens(ASTUtils.toModifiers(visibility));
+ decl.addChildWithTokens(ASTUtils.newAST(AS3Parser.VAR, "var"));
+ decl.appendToken(TokenBuilder.newSpace());
+ LinkedListTree def = ASTUtils.newAST(AS3Parser.IDENT, name);
+ decl.addChildWithTokens(def);
+ if (type != null) {
+ def.addChildWithTokens(AS3FragmentParser.parseTypeSpec(type));
+ }
+ decl.appendToken(TokenBuilder.newSemi());
+ return new ASTASField(decl);
+ }
+
+ public static ASTASMethod newInterfaceMethod(String name, Visibility visibility, String returnType) {
+ LinkedListTree def = ASTUtils.newImaginaryAST(AS3Parser.METHOD_DEF);
+ LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
+ def.addChildWithTokens(annos);
+ def.addChildWithTokens(ASTUtils.toModifiers(visibility));
+ LinkedListTree decl = ASTUtils.newAST(AS3Parser.FUNCTION, "function");
+ def.addChildWithTokens(decl);
+ decl.appendToken(TokenBuilder.newSpace());
+ LinkedListTree methName = ASTUtils.newAST(AS3Parser.IDENT, name);
+ def.addChildWithTokens(methName);
+ def.addChildWithTokens(ASTUtils.newParentheticAST(AS3Parser.PARAMS, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")"));
+ if (returnType != null) {
+ def.addChildWithTokens(AS3FragmentParser.parseTypeSpec(returnType));
+ }
+ def.appendToken(TokenBuilder.newSemi());
+
+ return new ASTASMethod(def);
+ }
+
+ public static LinkedListTree newBlock() {
+ LinkedListTree ast = ASTUtils.newParentheticAST(AS3Parser.BLOCK,
+ AS3Parser.LCURLY, "{",
+ AS3Parser.RCURLY, "}");
+ LinkedListToken nl = TokenBuilder.newNewline();
+ ast.getInitialInsertionAfter().afterInsert(nl);
+ ast.setInitialInsertionAfter(nl);
+ return ast;
+ }
+
+ public static LinkedListTree newMetadataTag(String name) {
+ LinkedListTree ast = ASTUtils.newParentheticAST(AS3Parser.ANNOTATION,
+ AS3Parser.LBRACK, "[",
+ AS3Parser.RBRACK, "]");
+ ast.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, name));
+ return ast;
+ }
+
+ 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(ASTBuilder.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.newPlaceholderAST(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.newPlaceholderAST(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.newPlaceholderAST(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 = ASTBuilder.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 = ASTBuilder.newBlock();
+ switchStmt.addChildWithTokens(block);
+ return switchStmt;
+ }
+}
</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="removed">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader" id="removed"><big><b>ASTFactory.java</b></big> <small id="info">removed after 384</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTFactory.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -1,290 +0,0 @@
</small></pre><pre class="diff" id="removed">-/**
- * ASTFactory.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.SyntaxException;
-import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
-import uk.co.badgersinfoil.metaas.dom.Visibility;
-import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
-import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
-
-
-/**
- * Utilities to build and assemble Abstract Syntax Tree fragments for inclusion
- * into the compilation unit being generated.
- */
-public class ASTFactory {
-
- private ASTFactory() {
- // hide default ctor
- }
-
- public static AS3ASTCompilationUnit synthesizeClass(String qualifiedName) {
- LinkedListTree unit = ASTUtils.newImaginaryAST(AS3Parser.COMPILATION_UNIT);
- LinkedListTree pkg = ASTUtils.newAST(AS3Parser.PACKAGE, "package");
- pkg.appendToken(TokenBuilder.newSpace());
- unit.addChildWithTokens(pkg);
- String packageName = packageNameFrom(qualifiedName);
- if (packageName != null) {
- pkg.addChildWithTokens(AS3FragmentParser.parseIdent(packageName));
- }
- LinkedListTree packageBlock = newBlock();
- pkg.addChildWithTokens(packageBlock);
- String className = typeNameFrom(qualifiedName);
-
- LinkedListTree clazz = synthesizeAS3Class(className);
- ASTUtils.addChildWithIndentation(packageBlock, clazz);
- return new AS3ASTCompilationUnit(unit);
- }
-
- public static ASCompilationUnit synthesizeInterface(String qualifiedName) {
- LinkedListTree unit = ASTUtils.newImaginaryAST(AS3Parser.COMPILATION_UNIT);
- LinkedListTree pkg = ASTUtils.newAST(AS3Parser.PACKAGE, "package");
- unit.addChildWithTokens(pkg);
- String packageName = packageNameFrom(qualifiedName);
- if (packageName != null) {
- pkg.addChildWithTokens(AS3FragmentParser.parseIdent(packageName));
- }
- LinkedListTree packageBlock = newBlock();
- pkg.addChildWithTokens(packageBlock);
-
- LinkedListTree iface = synthesizeAS3Interface(qualifiedName);
- packageBlock.addChildWithTokens(iface);
- return new AS3ASTCompilationUnit(unit);
- }
-
- private static LinkedListTree synthesizeAS3Interface(String qualifiedName) {
- LinkedListTree iface = ASTUtils.newImaginaryAST(AS3Parser.INTERFACE_DEF);
- LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
- annos.appendToken(TokenBuilder.newNewline());
- iface.addChildWithTokens(annos);
- LinkedListTree modifiers = ASTUtils.newImaginaryAST(AS3Parser.MODIFIERS);
- iface.addChildWithTokens(modifiers);
- modifiers.addChildWithTokens(ASTUtils.newAST(AS3Parser.PUBLIC, "public"));
- modifiers.appendToken(TokenBuilder.newSpace());
- iface.appendToken(TokenBuilder.newInterface());
- iface.appendToken(TokenBuilder.newSpace());
- iface.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, typeNameFrom(qualifiedName)));
- iface.appendToken(TokenBuilder.newSpace());
- LinkedListTree typeBlock = ASTUtils.newParentheticAST(AS3Parser.TYPE_BLOCK, AS3Parser.LCURLY, "{", AS3Parser.RCURLY, "}");
- iface.addChildWithTokens(typeBlock);
- return iface;
- }
-
- private static String typeNameFrom(String qualifiedName) {
- int p = qualifiedName.lastIndexOf('.');
- if (p == -1) {
- return qualifiedName;
- }
- return qualifiedName.substring(p+1);
- }
-
- private static LinkedListTree synthesizeAS3Class(String className) {
- LinkedListTree clazz = ASTUtils.newImaginaryAST(AS3Parser.CLASS_DEF);
- LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
- annos.appendToken(TokenBuilder.newNewline());
- clazz.addChildWithTokens(annos);
- LinkedListTree modifiers = ASTUtils.newImaginaryAST(AS3Parser.MODIFIERS);
- clazz.addChildWithTokens(modifiers);
- LinkedListTree modPublic = ASTUtils.newAST(AS3Parser.PUBLIC, "public");
- modifiers.addChildWithTokens(modPublic);
- modifiers.appendToken(TokenBuilder.newSpace());
- clazz.appendToken(TokenBuilder.newClass());
- clazz.appendToken(TokenBuilder.newSpace());
- clazz.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, className));
- clazz.appendToken(TokenBuilder.newSpace());
- LinkedListTree typeBlock = ASTUtils.newParentheticAST(AS3Parser.TYPE_BLOCK, AS3Parser.LCURLY, "{", AS3Parser.RCURLY, "}");
- LinkedListToken typeBlockNL = TokenBuilder.newNewline();
- typeBlock.getInitialInsertionAfter().afterInsert(typeBlockNL);
- typeBlock.setInitialInsertionAfter(typeBlockNL);
- clazz.addChildWithTokens(typeBlock);
- return clazz;
- }
-
- private static String packageNameFrom(String qualifiedName) {
- int p = qualifiedName.lastIndexOf('.');
- if (p == -1) {
- return null;
- }
- return qualifiedName.substring(0, p);
- }
-
- public static ASTASMethod newClassMethod(String name, Visibility visibility, String returnType) {
- LinkedListTree def = ASTUtils.newImaginaryAST(AS3Parser.METHOD_DEF);
- LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
- def.addChildWithTokens(annos);
- def.addChildWithTokens(ASTUtils.toModifiers(visibility));
- LinkedListTree decl = ASTUtils.newAST(AS3Parser.FUNCTION, "function");
- def.addChildWithTokens(decl);
- decl.appendToken(TokenBuilder.newSpace());
- LinkedListTree methName = ASTUtils.newAST(AS3Parser.IDENT, name);
- def.addChildWithTokens(methName);
- def.addChildWithTokens(ASTUtils.newParentheticAST(AS3Parser.PARAMS, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")"));
- if (returnType != null) {
- def.addChildWithTokens(AS3FragmentParser.parseTypeSpec(returnType));
- }
- def.appendToken(TokenBuilder.newSpace());
- LinkedListTree block = newBlock();
- def.addChildWithTokens(block);
-
- return new ASTASMethod(def);
- }
-
- public static ASTASField newField(String name, Visibility visibility, String type) {
- if (name.indexOf('.') != -1) {
- throw new SyntaxException("field name must not contain '.'");
- }
- LinkedListTree decl = ASTUtils.newImaginaryAST(AS3Parser.VAR_DEF);
- LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
- decl.addChildWithTokens(annos);
- decl.addChildWithTokens(ASTUtils.toModifiers(visibility));
- decl.addChildWithTokens(ASTUtils.newAST(AS3Parser.VAR, "var"));
- decl.appendToken(TokenBuilder.newSpace());
- LinkedListTree def = ASTUtils.newAST(AS3Parser.IDENT, name);
- decl.addChildWithTokens(def);
- if (type != null) {
- def.addChildWithTokens(AS3FragmentParser.parseTypeSpec(type));
- }
- decl.appendToken(TokenBuilder.newSemi());
- return new ASTASField(decl);
- }
-
- public static ASTASMethod newInterfaceMethod(String name, Visibility visibility, String returnType) {
- LinkedListTree def = ASTUtils.newImaginaryAST(AS3Parser.METHOD_DEF);
- LinkedListTree annos = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATIONS);
- def.addChildWithTokens(annos);
- def.addChildWithTokens(ASTUtils.toModifiers(visibility));
- LinkedListTree decl = ASTUtils.newAST(AS3Parser.FUNCTION, "function");
- def.addChildWithTokens(decl);
- decl.appendToken(TokenBuilder.newSpace());
- LinkedListTree methName = ASTUtils.newAST(AS3Parser.IDENT, name);
- def.addChildWithTokens(methName);
- def.addChildWithTokens(ASTUtils.newParentheticAST(AS3Parser.PARAMS, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")"));
- if (returnType != null) {
- def.addChildWithTokens(AS3FragmentParser.parseTypeSpec(returnType));
- }
- def.appendToken(TokenBuilder.newSemi());
-
- return new ASTASMethod(def);
- }
-
- public static LinkedListTree newBlock() {
- LinkedListTree ast = ASTUtils.newParentheticAST(AS3Parser.BLOCK,
- AS3Parser.LCURLY, "{",
- AS3Parser.RCURLY, "}");
- LinkedListToken nl = TokenBuilder.newNewline();
- ast.getInitialInsertionAfter().afterInsert(nl);
- ast.setInitialInsertionAfter(nl);
- return ast;
- }
-
- public static LinkedListTree newMetadataTag(String name) {
- LinkedListTree ast = ASTUtils.newParentheticAST(AS3Parser.ANNOTATION,
- AS3Parser.LBRACK, "[",
- AS3Parser.RBRACK, "]");
- ast.addChildWithTokens(ASTUtils.newAST(AS3Parser.IDENT, name));
- return ast;
- }
-
- 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.newPlaceholderAST(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.newPlaceholderAST(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.newPlaceholderAST(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"><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>ASTStatementList.java</b></big> <small id="info">384 -> 385</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -53,47 +53,47 @@
</small></pre><pre class="diff" id="context"> }
public ASIfStatement newIf(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree ifStmt = AST<span id="removedchars">Factory</span>.newIf(condition);
</pre><pre class="diff" id="added">+ LinkedListTree ifStmt = AST<span id="addedchars">Builder</span>.newIf(condition);
</pre><pre class="diff" id="context"> addStatement(ifStmt);
return new ASTASIfStatement(ifStmt);
}
public ASForStatement newFor(String init, String condition, String iterate) {
</pre><pre class="diff" id="removed">- LinkedListTree forStmt = AST<span id="removedchars">Factory</span>.newFor(init, condition, iterate);
</pre><pre class="diff" id="added">+ LinkedListTree forStmt = AST<span id="addedchars">Builder</span>.newFor(init, condition, iterate);
</pre><pre class="diff" id="context"> addStatement(forStmt);
LinkedListTree block = appendBlock(forStmt);
return new ASTASForStatement(forStmt);
}
public StatementContainer newForIn(String declaration, String expression) {
</pre><pre class="diff" id="removed">- LinkedListTree forStmt = AST<span id="removedchars">Factory</span>.newForIn(declaration, expression);
</pre><pre class="diff" id="added">+ LinkedListTree forStmt = AST<span id="addedchars">Builder</span>.newForIn(declaration, expression);
</pre><pre class="diff" id="context"> LinkedListTree block = appendBlock(forStmt);
addStatement(forStmt);
return new ASTStatementList(block);
}
public StatementContainer newForEachIn(String declaration, String expression) {
</pre><pre class="diff" id="removed">- LinkedListTree forStmt = AST<span id="removedchars">Factory</span>.newForEachIn(declaration, expression);
</pre><pre class="diff" id="added">+ LinkedListTree forStmt = AST<span id="addedchars">Builder</span>.newForEachIn(declaration, expression);
</pre><pre class="diff" id="context"> LinkedListTree block = appendBlock(forStmt);
addStatement(forStmt);
return new ASTStatementList(block);
}
public StatementContainer newWhile(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree whileStmt = AST<span id="removedchars">Factory</span>.newWhile(condition);
</pre><pre class="diff" id="added">+ LinkedListTree whileStmt = AST<span id="addedchars">Builder</span>.newWhile(condition);
</pre><pre class="diff" id="context"> LinkedListTree block = appendBlock(whileStmt);
addStatement(whileStmt);
return new ASTStatementList(block);
}
public StatementContainer newDoWhile(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree doWhileStmt = AST<span id="removedchars">Factory</span>.newDoWhile(condition);
</pre><pre class="diff" id="added">+ LinkedListTree doWhileStmt = AST<span id="addedchars">Builder</span>.newDoWhile(condition);
</pre><pre class="diff" id="context"> addStatement(doWhileStmt);
return new ASTStatementList(findBlock(doWhileStmt));
}
public ASSwitchStatement newSwitch(String condition) {
</pre><pre class="diff" id="removed">- LinkedListTree switchStmt = AST<span id="removedchars">Factory</span>.newSwitch(condition);
</pre><pre class="diff" id="added">+ LinkedListTree switchStmt = AST<span id="addedchars">Builder</span>.newSwitch(condition);
</pre><pre class="diff" id="context"> addStatement(switchStmt);
return new ASTASSwitchStatement(findBlock(switchStmt));
}
</pre><pre class="diff"><small id="info">@@ -116,7 +116,7 @@
</small></pre><pre class="diff" id="context"> */
private static LinkedListTree appendBlock(LinkedListTree ast) {
ast.appendToken(TokenBuilder.newSpace());
</pre><pre class="diff" id="removed">- LinkedListTree block = AST<span id="removedchars">Factory</span>.newBlock();
</pre><pre class="diff" id="added">+ LinkedListTree block = AST<span id="addedchars">Builder</span>.newBlock();
</pre><pre class="diff" id="context"> ast.addChildWithTokens(block);
return block;
}
</pre></div>
<hr /><a name="file8" /><div class="file">
<span class="pathname">metaas/trunk/src/main/java/uk/co/badgersinfoil/metaas/impl</span><br />
<div class="fileheader"><big><b>TagUtils.java</b></big> <small id="info">384 -> 385</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/TagUtils.java 2007-02-04 22:58:02 UTC (rev 384)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/TagUtils.java 2007-02-04 23:08:07 UTC (rev 385)
@@ -56,7 +56,7 @@
</small></pre><pre class="diff" id="context"> // handling of AST nodes with no start/stop token is broken in
// many situations), this code is inserting a NL at a different
// point than expected:
</pre><pre class="diff" id="removed">- LinkedListTree tag = AST<span id="removedchars">Factory</span>.newMetadataTag(name);
</pre><pre class="diff" id="added">+ LinkedListTree tag = AST<span id="addedchars">Builder</span>.newMetadataTag(name);
</pre><pre class="diff" id="context"> LinkedListToken trailingnl = TokenBuilder.newNewline();
tag.getStopToken().afterInsert(trailingnl);
tag.setStopToken(trailingnl);
</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>