<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/antlr/org/asdt/core/internal/antlr/<a href="#file1">AS3.g3</a></tt> </td><td></td><td align="right" id="added">+2</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/dom/<a href="#file2"><span id="added">ASThrowStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+7</td><td></td><td nowrap="nowrap" align="right">added 625</td></tr>
<tr><td><tt> /<a href="#file3">StatementContainer.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr class="alt"><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file4">ASTASFunctionExpression.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr><td><tt> /<a href="#file5">ASTASMethod.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr class="alt"><td><tt> /<a href="#file6"><span id="added">ASTASThrowStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+18</td><td></td><td nowrap="nowrap" align="right">added 625</td></tr>
<tr><td><tt> /<a href="#file7">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+8</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr class="alt"><td><tt> /<a href="#file8">ASTStatementList.java</a></tt> </td><td></td><td align="right" id="added">+7</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr><td><tt> /<a href="#file9">ContainerDelegate.java</a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr class="alt"><td><tt> /<a href="#file10">StatementBuilder.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file11">StatementTests.java</a></tt> </td><td></td><td align="right" id="added">+14</td><td></td><td nowrap="nowrap" align="center">624 -> 625</td></tr>
<tr><td></td><td></td><td align="right" id="added">+75</td><td align="right" id="removed">-1</td><td></td></tr>
</table>
<small id="info">2 added + 9 modified, total 11 files</small><br />
<pre class="comment">
simple throw-statement support
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">metaas/trunk/src/main/antlr/org/asdt/core/internal/antlr</span><br />
<div class="fileheader"><big><b>AS3.g3</b></big> <small id="info">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2008-01-21 22:29:08 UTC (rev 625)
@@ -512,7 +512,7 @@
</small></pre><pre class="diff" id="context">
throwStatement
</pre><pre class="diff" id="removed">- : 'throw'^ expression semi
</pre><pre class="diff" id="added">+ : THROW^ expression semi!
</pre><pre class="diff" id="context">
tryStatement
</pre><pre class="diff"><small id="info">@@ -1215,6 +1215,7 @@
</small></pre><pre class="diff" id="context"> CATCH : 'catch';
FINALLY : 'finally';
UNDEFINED : 'undefined';
</pre><pre class="diff" id="added">+THROW : 'throw';
</pre><pre class="diff" id="context">
// OPERATORS
QUESTION : '?'
</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>ASThrowStatement.java</b></big> <small id="info">added at 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASThrowStatement.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASThrowStatement.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -0,0 +1,7 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASThrowStatement extends Statement {
+
+ public ASExpression getExpression();
+
+}
</pre></div>
<hr /><a name="file3" /><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">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -166,6 +166,8 @@
</small></pre><pre class="diff" id="context">
public ASContinueStatement newContinue();
</pre><pre class="diff" id="added">+ public ASThrowStatement newThrow(ASExpression t);
+
</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
</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>ASTASFunctionExpression.java</b></big> <small id="info">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASFunctionExpression.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASFunctionExpression.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -18,6 +18,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
import uk.co.badgersinfoil.metaas.dom.ASSuperStatement;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff"><small id="info">@@ -168,6 +169,10 @@
</small></pre><pre class="diff" id="context"> return stmtListMixin.newSwitch(condition);
}
</pre><pre class="diff" id="added">+ public ASThrowStatement newThrow(ASExpression t) {
+ return stmtListMixin.newThrow(t);
+ }
+
</pre><pre class="diff" id="context"> public ASTryStatement newTryCatch(String var, String type) {
return stmtListMixin.newTryCatch(var, type);
}
</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">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -24,6 +24,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
import uk.co.badgersinfoil.metaas.dom.ASSuperStatement;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff"><small id="info">@@ -243,6 +244,10 @@
</small></pre><pre class="diff" id="context"> return stmtList().newContinue();
}
</pre><pre class="diff" id="added">+ public ASThrowStatement newThrow(ASExpression t) {
+ return stmtList().newThrow(t);
+ }
+
</pre><pre class="diff" id="context"> public boolean containsCode() {
return stmtList().containsCode();
}
</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>ASTASThrowStatement.java</b></big> <small id="info">added at 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASThrowStatement.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASThrowStatement.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -0,0 +1,18 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASExpression;
+import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASThrowStatement implements ASThrowStatement {
+
+ private LinkedListTree ast;
+
+ public ASTASThrowStatement(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public ASExpression getExpression() {
+ return ExpressionBuilder.build(ast.getFirstChild());
+ }
+}
</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>ASTBuilder.java</b></big> <small id="info">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -618,4 +618,12 @@
</small></pre><pre class="diff" id="context"> field.addChildWithTokens(value);
return field;
}
</pre><pre class="diff" id="added">+
+ public static LinkedListTree newThrowStatement(LinkedListTree ast) {
+ LinkedListTree thrw = ASTUtils.newAST(AS3Parser.THROW, "throw");
+ thrw.appendToken(TokenBuilder.newSpace());
+ thrw.addChildWithTokens(ast);
+ thrw.appendToken(TokenBuilder.newSemi());
+ return thrw;
+ }
</pre><pre class="diff" id="context"> }
</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>ASTStatementList.java</b></big> <small id="info">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -24,6 +24,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
import uk.co.badgersinfoil.metaas.dom.ASSuperStatement;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff"><small id="info">@@ -256,6 +257,12 @@
</small></pre><pre class="diff" id="context"> return new ASTASContinueStatement(breakStmt);
}
</pre><pre class="diff" id="added">+ public ASThrowStatement newThrow(ASExpression t) {
+ LinkedListTree throwStmt = ASTBuilder.newThrowStatement(ast(t));
+ addStatement(throwStmt);
+ return new ASTASThrowStatement(throwStmt);
+ }
+
</pre><pre class="diff" id="context"> private void addStatement(LinkedListTree stmt) {
ASTUtils.addChildWithIndentation(ast, stmt);
}
</pre></div>
<hr /><a name="file9" /><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">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -14,6 +14,7 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
import uk.co.badgersinfoil.metaas.dom.ASSuperStatement;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff"><small id="info">@@ -134,6 +135,10 @@
</small></pre><pre class="diff" id="context"> return getStatementContainer().newContinue();
}
</pre><pre class="diff" id="added">+ public ASThrowStatement newThrow(ASExpression t) {
+ return getStatementContainer().newThrow(t);
+ }
+
</pre><pre class="diff" id="context"> public boolean containsCode() {
return getStatementContainer().containsCode();
}
</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>StatementBuilder.java</b></big> <small id="info">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/StatementBuilder.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/StatementBuilder.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -61,6 +61,8 @@
</small></pre><pre class="diff" id="context"> return new ASTASDefaultXMLNamespaceStatement(ast);
case AS3Parser.CONTINUE:
return new ASTASContinueStatement(ast);
</pre><pre class="diff" id="added">+ case AS3Parser.THROW:
+ return new ASTASThrowStatement(ast);
</pre><pre class="diff" id="context"> default:
throw new SyntaxException("Unsupported statement node type: "+ASTUtils.tokenName(ast)+" in "+ActionScriptFactory.str(ASTUtils.stringifyNode(ast)));
}
</pre></div>
<hr /><a name="file11" /><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">624 -> 625</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-21 22:12:25 UTC (rev 624)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-21 22:29:08 UTC (rev 625)
@@ -26,12 +26,15 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASInvocationExpression;
import uk.co.badgersinfoil.metaas.dom.ASLiteral;
import uk.co.badgersinfoil.metaas.dom.ASMethod;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASNewExpression;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASPostfixExpression;
import uk.co.badgersinfoil.metaas.dom.ASReturnStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASStringLiteral;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASSuperStatement;
import uk.co.badgersinfoil.metaas.dom.ASSwitchCase;
import uk.co.badgersinfoil.metaas.dom.ASSwitchDefault;
import uk.co.badgersinfoil.metaas.dom.ASSwitchStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASThrowStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
</pre><pre class="diff"><small id="info">@@ -396,4 +399,15 @@
</small></pre><pre class="diff" id="context"> assertNotNull(continueStmt);
ExtraAssertions.assertInstanceof(meth.addStmt("continue"), ASContinueStatement.class);
}
</pre><pre class="diff" id="added">+
+ public void testThrow() {
+ ASExpression t = fact.newExpression("new Error()");
+ ASThrowStatement throwStmt = meth.newThrow(t);
+ ExtraAssertions.assertInstanceof(throwStmt.getExpression(), ASNewExpression.class);
+ }
+
+ public void testParseThrow() {
+ ASThrowStatement throwStmt = (ASThrowStatement)meth.addStmt("throw \"oops\"");
+ ExtraAssertions.assertInstanceof(throwStmt.getExpression(), ASStringLiteral.class);
+ }
</pre><pre class="diff" id="context"> }
</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>