<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">+178</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">473 -> 474</td></tr>
</table>
<div class="tasklist"><ul>
<li><a href="#task1">TODO: recursively check the given subexpression</a></li>
</ul></div>
<pre class="comment">
Groundwork for a model of expressions. Far from complete or correct.
</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">473 -> 474</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2007-04-02 23:22:43 UTC (rev 473)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/ActionScriptFactory.java 2007-04-03 19:13:08 UTC (rev 474)
@@ -1,18 +1,40 @@
</small></pre><pre class="diff" id="context"> /**
* ASSourceFactory.java
*
</pre><pre class="diff" id="removed">- * Copyright (c) 2006 David Holroyd
</pre><pre class="diff" id="added">+ * Copyright (c) 2006<span id="addedchars">-2007</span> David Holroyd
</pre><pre class="diff" id="context"> */
package uk.co.badgersinfoil.metaas;
</pre><pre class="diff" id="added">+import java.util.List;
+import org.asdt.core.internal.antlr.AS3Parser;
+import uk.co.badgersinfoil.metaas.dom.ASBinaryExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASNewExpression;
+import uk.co.badgersinfoil.metaas.dom.ASNullLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASPostfixExpression;
+import uk.co.badgersinfoil.metaas.dom.ASPrefixExpression;
+import uk.co.badgersinfoil.metaas.dom.ASStringLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASIntegerLiteral;
+import uk.co.badgersinfoil.metaas.dom.ASTASNewExpression;
+import uk.co.badgersinfoil.metaas.impl.AS3FragmentParser;
+import uk.co.badgersinfoil.metaas.impl.ASTASBinaryExpression;
+import uk.co.badgersinfoil.metaas.impl.ASTASExpression;
+import uk.co.badgersinfoil.metaas.impl.ASTASNullLiteral;
+import uk.co.badgersinfoil.metaas.impl.ASTASPostfixExpression;
+import uk.co.badgersinfoil.metaas.impl.ASTASPrefixExpression;
+import uk.co.badgersinfoil.metaas.impl.ASTASStringLiteral;
</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;
import uk.co.badgersinfoil.metaas.impl.ASTBuilder;
import uk.co.badgersinfoil.metaas.impl.ASTStatementList;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.impl.ASTUtils;
+import uk.co.badgersinfoil.metaas.impl.ExpressionBuilder;
+import uk.co.badgersinfoil.metaas.impl.TokenBuilder;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
// TODO: an isKeyword(String) test would be nice
</pre><pre class="diff"><small id="info">@@ -103,4 +125,159 @@
</small></pre><pre class="diff" id="context"> project.setOutputLocation(outputLocation);
return project;
}
</pre><pre class="diff" id="added">+
+ public ASStringLiteral newStringLiteral(String string) {
+ return new ASTASStringLiteral(ASTUtils.newAST(AS3Parser.STRING_LITERAL, str(string)));
+ }
+
+ public ASIntegerLiteral newIntegerLiteral(int i) {
+ return new ASTASIntegerLiteral(ASTUtils.newAST(AS3Parser.DECIMAL_LITERAL, String.valueOf(i)));
+ }
+
+ public ASNullLiteral newNullLiteral() {
+ return new ASTASNullLiteral(ASTUtils.newAST(AS3Parser.NULL, "null"));
+ }
+
+ public ASBinaryExpression newAddExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newPlus(), left, right);
+ }
+
+ public ASBinaryExpression newAndExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newAnd(), left, right);
+ }
+
+ public ASBinaryExpression newBitAndExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newBitAnd(), left, right);
+ }
+
+ public ASBinaryExpression newBitOrExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newBitOr(), left, right);
+ }
+
+ public ASBinaryExpression newBitXorExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newBitXor(), left, right);
+ }
+
+ public ASBinaryExpression newDivisionExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newDiv(), left, right);
+ }
+
+ public ASBinaryExpression newEqualsExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newEquals(), left, right);
+ }
+
+ public ASBinaryExpression newGreaterEqualsExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newGreaterEquals(), left, right);
+ }
+
+ public ASBinaryExpression newGreaterThanExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newGreater(), left, right);
+ }
+
+ public ASBinaryExpression newLessEqualsExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newLessEquals(), left, right);
+ }
+
+ public ASBinaryExpression newLessThanExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newLess(), left, right);
+ }
+
+ public ASBinaryExpression newModuloExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newModulo(), left, right);
+ }
+
+ public ASBinaryExpression newMultiplyExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newStar(), left, right);
+ }
+
+ public ASBinaryExpression newNotEqualsExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newNotEquals(), left, right);
+ }
+
+ public ASBinaryExpression newOrExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newOr(), left, right);
+ }
+
+ public ASBinaryExpression newShiftLeftExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newShiftLeft(), left, right);
+ }
+
+ public ASBinaryExpression newShiftRightExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newShiftRight(), left, right);
+ }
+
+ public ASBinaryExpression newShiftRightUnsignedExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newShiftRightUnsigned(), left, right);
+ }
+
+ public ASBinaryExpression newSubtractExpression(ASExpression left, ASExpression right) {
+ return ASTBuilder.newBinaryExpression(TokenBuilder.newMinus(), left, right);
+ }
+
+ /**
+ *
+ * @throws SyntaxException if the given string is not a vaild
+ * ActionScript 3 expression.
+ */
+ public ASExpression newExpression(String expr) {
+ LinkedListTree ast = AS3FragmentParser.parseExpr(expr);
+ return ExpressionBuilder.build(ast);
+ }
+
+ private ASPrefixExpression newPrefixExpression(LinkedListToken op, ASExpression sub) {
+ LinkedListTree ast = ASTUtils.newAST(op);
+ LinkedListTree subExpr = ((ASTASExpression)sub).getAST();
+ ast.addChildWithTokens(subExpr);
+ return new ASTASPrefixExpression(ast);
+ }
+
+ public ASPrefixExpression newPreDecExpression(ASExpression sub) {
+ return newPrefixExpression(TokenBuilder.newPreDec(), sub);
+ }
+
+ public ASPrefixExpression newPreIncExpression(ASExpression sub) {
+ return newPrefixExpression(TokenBuilder.newPreInc(), sub);
+ }
+
+ public ASPrefixExpression newPositiveExpression(ASExpression sub) {
+ return newPrefixExpression(TokenBuilder.newPlus(), sub);
+ }
+
+ public ASPrefixExpression newNegativeExpression(ASExpression sub) {
+ return newPrefixExpression(TokenBuilder.newMinus(), sub);
+ }
+
+ public ASPrefixExpression newNotExpression(ASExpression sub) {
+ return newPrefixExpression(TokenBuilder.newNot(), sub);
+ }
+
+ private ASPostfixExpression newPostfixExpression(LinkedListToken op, ASExpression sub) {
+ LinkedListTree ast = ASTUtils.newAST(op);
+ LinkedListTree subExpr = ((ASTASExpression)sub).getAST();
+ ast.addChild(subExpr);
+ ast.setStartToken(subExpr.getStartToken());
+ subExpr.getStopToken().setNext(op);
+ return new ASTASPostfixExpression(ast);
+ }
+
+ public ASPostfixExpression newPostDecExpression(ASExpression sub) {
+ return newPostfixExpression(TokenBuilder.newPostDec(), sub);
+ }
+
+ public ASPostfixExpression newPostIncExpression(ASExpression sub) {
+ return newPostfixExpression(TokenBuilder.newPostInc(), sub);
+ }
+
+ public ASNewExpression newNewExpression(ASExpression subexpression, List args) {
+ LinkedListTree ast = ASTUtils.newAST(AS3Parser.NEW, "new");
+ ast.appendToken(TokenBuilder.newSpace());
+ LinkedListTree subExpr = ((ASTASExpression)subexpression).getAST();
<a name="task1" />+ // <span class="task">TODO</span>: recursively check the given subexpression
+ ast.addChildWithTokens(subExpr);
+ LinkedListTree arguments = ASTUtils.newParentheticAST(AS3Parser.ARGUMENTS, AS3Parser.LPAREN, "(", AS3Parser.RPAREN, ")");
+ ast.addChildWithTokens(arguments);
+ ASTASNewExpression result = new ASTASNewExpression(ast);
+ result.setArguments(args);
+ return result;
+ }
</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>