<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">ASCatchClause.java</span></a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="right">added 592</td></tr>
<tr class="alt"><td><tt> /<a href="#file2"><span id="added">ASFinallyClause.java</span></a></tt> </td><td></td><td align="right" id="added">+5</td><td></td><td nowrap="nowrap" align="right">added 592</td></tr>
<tr><td><tt> /<a href="#file3"><span id="added">ASTryStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+18</td><td></td><td nowrap="nowrap" align="right">added 592</td></tr>
<tr class="alt"><td><tt> /<a href="#file4">StatementContainer.java</a></tt> </td><td></td><td align="right" id="added">+4</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr><td><tt>main/java/uk/co/badgersinfoil/metaas/impl/<a href="#file5"><span id="added">ASTASCatchClause.java</span></a></tt> </td><td></td><td align="right" id="added">+35</td><td></td><td nowrap="nowrap" align="right">added 592</td></tr>
<tr class="alt"><td><tt> /<a href="#file6"><span id="added">ASTASFinallyClause.java</span></a></tt> </td><td></td><td align="right" id="added">+18</td><td></td><td nowrap="nowrap" align="right">added 592</td></tr>
<tr><td><tt> /<a href="#file7">ASTASMethod.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr class="alt"><td><tt> /<a href="#file8"><span id="added">ASTASTryStatement.java</span></a></tt> </td><td></td><td align="right" id="added">+73</td><td></td><td nowrap="nowrap" align="right">added 592</td></tr>
<tr><td><tt> /<a href="#file9">ASTBuilder.java</a></tt> </td><td></td><td align="right" id="added">+28</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr class="alt"><td><tt> /<a href="#file10">ASTStatementList.java</a></tt> </td><td></td><td align="right" id="added">+17</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr><td><tt> /<a href="#file11">ContainerDelegate.java</a></tt> </td><td></td><td align="right" id="added">+9</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr class="alt"><td><tt> /<a href="#file12">StatementBuilder.java</a></tt> </td><td></td><td align="right" id="added">+2</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr><td><tt>test/java/uk/co/badgersinfoil/metaas/<a href="#file13">StatementTests.java</a></tt> </td><td></td><td align="right" id="added">+50</td><td></td><td nowrap="nowrap" align="center">591 -> 592</td></tr>
<tr><td></td><td></td><td align="right" id="added">+277</td><td></td><td></td></tr>
</table>
<small id="info">6 added + 7 modified, total 13 files</small><br />
<pre class="comment">
Support in the DOM for handling try-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>ASCatchClause.java</b></big> <small id="info">added at 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASCatchClause.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASCatchClause.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -0,0 +1,9 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASCatchClause extends StatementContainer {
+
+ public String getParamName();
+
+ public String getTypeName();
+
+}
</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>ASFinallyClause.java</b></big> <small id="info">added at 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASFinallyClause.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASFinallyClause.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -0,0 +1,5 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+public interface ASFinallyClause extends StatementContainer {
+
+}
</pre></div>
<hr /><a name="file3" /><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>ASTryStatement.java</b></big> <small id="info">added at 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASTryStatement.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/ASTryStatement.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -0,0 +1,18 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.dom;
+
+import java.util.List;
+
+public interface ASTryStatement extends StatementContainer, Statement {
+
+ public ASCatchClause newCatchClause(String var, String type);
+
+ /**
+ * Returns a list of {@link ASCatchClause}.
+ */
+ public List getCatchClauses();
+
+ public ASFinallyClause getFinallyClause();
+
+ public ASFinallyClause newFinallyClause();
+
+}
</pre></div>
<hr /><a name="file4" /><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">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/dom/StatementContainer.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -159,7 +159,11 @@
</small></pre><pre class="diff" id="context"> * Creates a new <code>break</code> statement.
*/
public ASBreakStatement newBreak();
</pre><pre class="diff" id="added">+
+ public ASTryStatement newTryCatch(String var, String type);
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ public ASTryStatement newTryFinally();
+
</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="file5" /><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>ASTASCatchClause.java</b></big> <small id="info">added at 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASCatchClause.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASCatchClause.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -0,0 +1,35 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import org.asdt.core.internal.antlr.AS3Parser;
+import uk.co.badgersinfoil.metaas.dom.ASCatchClause;
+import uk.co.badgersinfoil.metaas.dom.StatementContainer;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASCatchClause extends ContainerDelegate implements ASCatchClause {
+
+ private LinkedListTree ast;
+
+ public ASTASCatchClause(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public String getParamName() {
+ return ast.getFirstChild().getText();
+ }
+
+ public String getTypeName() {
+ LinkedListTree type = ASTUtils.findChildByType(ast, AS3Parser.TYPE_SPEC);
+ if (type == null) {
+ return null;
+ }
+ return ASTUtils.identText(type.getFirstChild());
+ }
+
+ private LinkedListTree block() {
+ return ASTUtils.findChildByType(ast, AS3Parser.BLOCK);
+ }
+
+ protected StatementContainer getStatementContainer() {
+ return new ASTStatementList(block());
+ }
+}
</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>ASTASFinallyClause.java</b></big> <small id="info">added at 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASFinallyClause.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASFinallyClause.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -0,0 +1,18 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import uk.co.badgersinfoil.metaas.dom.ASFinallyClause;
+import uk.co.badgersinfoil.metaas.dom.StatementContainer;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASFinallyClause extends ContainerDelegate implements ASFinallyClause {
+
+ private LinkedListTree ast;
+
+ public ASTASFinallyClause(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ protected StatementContainer getStatementContainer() {
+ return new ASTStatementList(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>ASTASMethod.java</b></big> <small id="info">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMethod.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -26,6 +26,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.ASTryStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
import uk.co.badgersinfoil.metaas.dom.DocComment;
</pre><pre class="diff"><small id="info">@@ -298,6 +299,14 @@
</small></pre><pre class="diff" id="context"> return stmtList.newBreak();
}
</pre><pre class="diff" id="added">+ public ASTryStatement newTryCatch(String var, String type) {
+ return stmtList.newTryCatch(var, type);
+ }
+
+ public ASTryStatement newTryFinally() {
+ return stmtList.newTryFinally();
+ }
+
</pre><pre class="diff" id="context"> public boolean containsCode() {
return stmtList.containsCode();
}
</pre></div>
<hr /><a name="file8" /><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>ASTASTryStatement.java</b></big> <small id="info">added at 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASTryStatement.java (rev 0)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASTryStatement.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -0,0 +1,73 @@
</small></pre><pre class="diff" id="added">+package uk.co.badgersinfoil.metaas.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.asdt.core.internal.antlr.AS3Parser;
+import uk.co.badgersinfoil.metaas.SyntaxException;
+import uk.co.badgersinfoil.metaas.dom.ASCatchClause;
+import uk.co.badgersinfoil.metaas.dom.ASFinallyClause;
+import uk.co.badgersinfoil.metaas.dom.ASTryStatement;
+import uk.co.badgersinfoil.metaas.dom.StatementContainer;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListToken;
+import uk.co.badgersinfoil.metaas.impl.antlr.LinkedListTree;
+
+public class ASTASTryStatement extends ContainerDelegate implements ASTryStatement {
+
+ private LinkedListTree ast;
+
+ public ASTASTryStatement(LinkedListTree ast) {
+ this.ast = ast;
+ }
+
+ public List getCatchClauses() {
+ List results = new ArrayList();
+ ASTIterator i = new ASTIterator(ast);
+ LinkedListTree catchClause;
+ while ((catchClause = i.search(AS3Parser.CATCH)) != null) {
+ results.add(new ASTASCatchClause(catchClause));
+ }
+ return Collections.unmodifiableList(results);
+ }
+
+ private LinkedListTree finallyClause() {
+ return ASTUtils.findChildByType(ast, AS3Parser.FINALLY);
+ }
+
+ public ASFinallyClause getFinallyClause() {
+ LinkedListTree finallyClause = finallyClause();
+ if (finallyClause == null) {
+ return null;
+ }
+ return new ASTASFinallyClause(finallyClause);
+ }
+
+ public ASFinallyClause newFinallyClause() {
+ LinkedListTree finallyClause = finallyClause();
+ if (finallyClause != null) {
+ throw new SyntaxException("only one finally-clause allowed");
+ }
+ finallyClause = ASTBuilder.newFinallyClause();
+ ast.addChildWithTokens(finallyClause);
+ return new ASTASFinallyClause(finallyClause);
+ }
+
+ protected StatementContainer getStatementContainer() {
+ return new ASTStatementList(ast.getFirstChild());
+ }
+
+ public ASCatchClause newCatchClause(String var, String type) {
+ LinkedListTree catchClause = ASTBuilder.newCatchClause(var, type);
+ LinkedListToken space = TokenBuilder.newSpace();
+ catchClause.getStartToken().beforeInsert(space);
+ catchClause.setStartToken(space);
+ if (finallyClause() == null) {
+ ast.addChildWithTokens(catchClause);
+ } else {
+ ast.addChildWithTokens(ast.getChildCount()-1, catchClause);
+ }
+ String indent = ASTUtils.findIndent(ast);
+ ASTUtils.increaseIndentAfterFirstLine(catchClause, indent);
+ return new ASTASCatchClause(catchClause);
+ }
+}
</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>ASTBuilder.java</b></big> <small id="info">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTBuilder.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -395,6 +395,34 @@
</small></pre><pre class="diff" id="context"> return breakStmt;
}
</pre><pre class="diff" id="added">+ public static LinkedListTree newTryStatement() {
+ LinkedListTree tryStmt = ASTUtils.newAST(AS3Parser.TRY, "try");
+ tryStmt.appendToken(TokenBuilder.newSpace());
+ tryStmt.addChildWithTokens(newBlock());
+ return tryStmt;
+ }
+
+ public static LinkedListTree newCatchClause(String var, String type) {
+ LinkedListTree tryStmt = ASTUtils.newAST(AS3Parser.CATCH, "catch");
+ tryStmt.appendToken(TokenBuilder.newSpace());
+ tryStmt.appendToken(TokenBuilder.newLParen());
+ tryStmt.addChildWithTokens(AS3FragmentParser.parseSimpleIdent(var));
+ if (type != null) {
+ tryStmt.addChildWithTokens(AS3FragmentParser.parseTypeSpec(type));
+ }
+ tryStmt.appendToken(TokenBuilder.newRParen());
+ tryStmt.appendToken(TokenBuilder.newSpace());
+ tryStmt.addChildWithTokens(newBlock());
+ return tryStmt;
+ }
+
+ public static LinkedListTree newFinallyClause() {
+ LinkedListTree tryStmt = ASTUtils.newAST(AS3Parser.FINALLY, "finally");
+ tryStmt.appendToken(TokenBuilder.newSpace());
+ tryStmt.addChildWithTokens(newBlock());
+ return tryStmt;
+ }
+
</pre><pre class="diff" id="context"> public static ASBinaryExpression newBinaryExpression(LinkedListToken op, ASExpression left, ASExpression right) {
LinkedListTree ast = ASTUtils.newAST(op);
LinkedListTree leftExpr = ((ASTASExpression)left).getAST();
</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>ASTStatementList.java</b></big> <small id="info">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTStatementList.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -23,6 +23,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.ASTryStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
import uk.co.badgersinfoil.metaas.dom.Statement;
</pre><pre class="diff"><small id="info">@@ -221,6 +222,22 @@
</small></pre><pre class="diff" id="context"> return new ASTASBreakStatement(breakStmt);
}
</pre><pre class="diff" id="added">+ public ASTryStatement newTryCatch(String var, String type) {
+ LinkedListTree tryStmt = ASTBuilder.newTryStatement();
+ tryStmt.appendToken(TokenBuilder.newSpace());
+ tryStmt.addChildWithTokens(ASTBuilder.newCatchClause(var, type));
+ addStatement(tryStmt);
+ return new ASTASTryStatement(tryStmt);
+ }
+
+ public ASTryStatement newTryFinally() {
+ LinkedListTree tryStmt = ASTBuilder.newTryStatement();
+ tryStmt.appendToken(TokenBuilder.newSpace());
+ tryStmt.addChildWithTokens(ASTBuilder.newFinallyClause());
+ addStatement(tryStmt);
+ return new ASTASTryStatement(tryStmt);
+ }
+
</pre><pre class="diff" id="context"> private void addStatement(LinkedListTree stmt) {
ASTUtils.addChildWithIndentation(ast, stmt);
}
</pre></div>
<hr /><a name="file11" /><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">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ContainerDelegate.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -13,6 +13,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.ASTryStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
import uk.co.badgersinfoil.metaas.dom.Statement;
</pre><pre class="diff"><small id="info">@@ -119,6 +120,14 @@
</small></pre><pre class="diff" id="context"> return getStatementContainer().newBreak();
}
</pre><pre class="diff" id="added">+ public ASTryStatement newTryCatch(String var, String type) {
+ return getStatementContainer().newTryCatch(var, type);
+ }
+
+ public ASTryStatement newTryFinally() {
+ return getStatementContainer().newTryFinally();
+ }
+
</pre><pre class="diff" id="context"> public boolean containsCode() {
return getStatementContainer().containsCode();
}
</pre></div>
<hr /><a name="file12" /><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">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/StatementBuilder.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/StatementBuilder.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -55,6 +55,8 @@
</small></pre><pre class="diff" id="context"> return new ASTASSuperStatement(ast);
case AS3Parser.BREAK:
return new ASTASBreakStatement(ast);
</pre><pre class="diff" id="added">+ case AS3Parser.TRY:
+ return new ASTASTryStatement(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="file13" /><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">591 -> 592</small></div>
<pre class="diff"><small id="info">--- trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-16 22:31:22 UTC (rev 591)
+++ trunk/src/test/java/uk/co/badgersinfoil/metaas/StatementTests.java 2008-01-16 22:32:40 UTC (rev 592)
@@ -8,12 +8,14 @@
</small></pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASBlock;
import uk.co.badgersinfoil.metaas.dom.ASBooleanLiteral;
import uk.co.badgersinfoil.metaas.dom.ASBreakStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASCatchClause;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASClassType;
import uk.co.badgersinfoil.metaas.dom.ASCompilationUnit;
import uk.co.badgersinfoil.metaas.dom.ASDeclarationStatement;
import uk.co.badgersinfoil.metaas.dom.ASDoWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASExpression;
import uk.co.badgersinfoil.metaas.dom.ASExpressionStatement;
</pre><pre class="diff" id="added">+import uk.co.badgersinfoil.metaas.dom.ASFinallyClause;
</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">@@ -26,6 +28,7 @@
</small></pre><pre class="diff" id="context"> 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.ASTryStatement;
</pre><pre class="diff" id="context"> import uk.co.badgersinfoil.metaas.dom.ASWhileStatement;
import uk.co.badgersinfoil.metaas.dom.ASWithStatement;
import uk.co.badgersinfoil.metaas.dom.Statement;
</pre><pre class="diff"><small id="info">@@ -309,4 +312,51 @@
</small></pre><pre class="diff" id="context"> ExtraAssertions.assertInstanceof(brk, ASBreakStatement.class);
meth.newBreak();
}
</pre><pre class="diff" id="added">+
+ public void testTryCatch() {
+ ASTryStatement tryStmt = meth.newTryCatch("e", "Exception");
+ tryStmt.addStmt("trace('trying')");
+ List catches = tryStmt.getCatchClauses();
+ ExtraAssertions.assertSize(1, catches);
+ assertEquals(1, catches.size());
+ ASCatchClause eCatch = (ASCatchClause)catches.get(0);
+ eCatch.addStmt("trace('catching e')");
+ assertEquals("e", eCatch.getParamName());
+ assertEquals("Exception", eCatch.getTypeName());
+ assertNull(tryStmt.getFinallyClause());
+ ASCatchClause fCatch = tryStmt.newCatchClause("f", "Error");
+ fCatch.addStmt("trace('catching f')");
+ }
+
+ public void testTryFinally() {
+ ASTryStatement tryStmt = meth.newTryFinally();
+ ASFinallyClause finallyClause = tryStmt.getFinallyClause();
+ assertNotNull(finallyClause);
+ try {
+ finallyClause = tryStmt.newFinallyClause();
+ fail("shouldn't be able to add another finally-clause");
+ } catch (SyntaxException e) {
+ // expected
+ }
+ }
+
+ public void testParseTrayCatchFinally() {
+ ASTryStatement tryStmt = (ASTryStatement)meth.addStmt("try {" +
+ "} catch (e) {" +
+ "} catch (f:Exception) {" +
+ "} finally {" +
+ "}");
+ List catches = tryStmt.getCatchClauses();
+ ExtraAssertions.assertSize(2, catches);
+
+ ASCatchClause catch0 = (ASCatchClause)catches.get(0);
+ assertEquals("e", catch0.getParamName());
+ assertNull(catch0.getTypeName());
+
+ ASCatchClause catch1 = (ASCatchClause)catches.get(1);
+ assertEquals("f", catch1.getParamName());
+ assertEquals("Exception", catch1.getTypeName());
+
+ assertNotNull(tryStmt.getFinallyClause());
+ }
</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>