<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</tt></b></td></tr>
<tr><td><tt>antlr/org/asdt/core/internal/antlr/<a href="#file1">AS3.g3</a></tt> </td><td></td><td align="right" id="added">+1</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center">504 -> 505</td></tr>
<tr class="alt"><td><tt>java/uk/co/badgersinfoil/metaas/impl/<a href="#file2">ASTASMetaTag.java</a></tt> </td><td></td><td align="right" id="added">+7</td><td align="right" id="removed">-16</td><td nowrap="nowrap" align="center">504 -> 505</td></tr>
<tr><td></td><td></td><td align="right" id="added">+8</td><td align="right" id="removed">-17</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
ANNOTATION_PARAM wasn't actually used by the parser, so don't use it in the Java code either
</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">504 -> 505</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2007-08-12 16:07:01 UTC (rev 504)
+++ trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2007-08-12 16:28:07 UTC (rev 505)
@@ -42,7 +42,7 @@
</small></pre><pre class="diff" id="context"> tokens {
COMPILATION_UNIT;
TYPE_BLOCK; METHOD_DEF; VAR_DEF;
</pre><pre class="diff" id="removed">- ANNOTATIONS; ANNOTATION; ANNOTATION_PARAMS;<span id="removedchars"> ANNOTATION_PARAM;</span>
</pre><pre class="diff" id="added">+ ANNOTATIONS; ANNOTATION; ANNOTATION_PARAMS;
</pre><pre class="diff" id="context"> MODIFIERS; NAMESPACE_DEF;
ACCESSOR_ROLE;
CLASS_DEF; INTERFACE_DEF;
</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>ASTASMetaTag.java</b></big> <small id="info">504 -> 505</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMetaTag.java 2007-08-12 16:07:01 UTC (rev 504)
+++ trunk/src/main/java/uk/co/badgersinfoil/metaas/impl/ASTASMetaTag.java 2007-08-12 16:28:07 UTC (rev 505)
@@ -34,14 +34,12 @@
</small></pre><pre class="diff" id="context"> }
private void addParam(LinkedListTree str) {
</pre><pre class="diff" id="removed">- LinkedListTree param = ASTUtils.newImaginaryAST(AS3Parser.ANNOTATION_PARAM);
- param.addChildWithTokens(str);
</pre><pre class="diff" id="context"> LinkedListTree params = findOrAddParams();
if (params.getChildCount() > 0) {
params.appendToken(TokenBuilder.newComma());
params.appendToken(TokenBuilder.newSpace());
}
</pre><pre class="diff" id="removed">- params.addChildWithTokens(<span id="removedchars">param</span>);
</pre><pre class="diff" id="added">+ params.addChildWithTokens(<span id="addedchars">str</span>);
</pre><pre class="diff" id="context"> }
public void addParam(int constant) {
</pre><pre class="diff"><small id="info">@@ -74,7 +72,9 @@
</small></pre><pre class="diff" id="context"> LinkedListTree assign = ASTUtils.newImaginaryAST(AS3Parser.ASSIGN);
LinkedListTree ident = ASTUtils.newAST(AS3Parser.IDENT, name);
assign.addChildWithTokens(ident);
</pre><pre class="diff" id="removed">- assign.appendToken(new LinkedListToken(AS3Parser.ASSIGN, "="));
</pre><pre class="diff" id="added">+ LinkedListToken assignToken = new LinkedListToken(AS3Parser.ASSIGN, "=");
+ assign.appendToken(assignToken);
+ assign.token = assignToken;
</pre><pre class="diff" id="context"> assign.addChildWithTokens(val);
addParam(assign);
</pre><pre class="diff"><small id="info">@@ -98,8 +98,7 @@
</small></pre><pre class="diff" id="context"> return null;
}
for (ASTIterator i=new ASTIterator(params); i.hasNext(); ) {
</pre><pre class="diff" id="removed">- LinkedListTree param = i.next();
- LinkedListTree child = param.getFirstChild();
</pre><pre class="diff" id="added">+ LinkedListTree child = i.next();
</pre><pre class="diff" id="context"> if (child.getType()==AS3Parser.ASSIGN) {
if (child.getFirstChild().getText().equals(name)) {
return toParamValue(child.getLastChild());
</pre><pre class="diff"><small id="info">@@ -117,19 +116,11 @@
</small></pre><pre class="diff" id="context"> List result = new ArrayList();
for (ASTIterator i=new ASTIterator(params); i.hasNext(); ) {
LinkedListTree param = i.next();
</pre><pre class="diff" id="removed">- result.add(toParam(param));
</pre><pre class="diff" id="added">+ result.add(toParam<span id="addedchars">Value</span>(param));
</pre><pre class="diff" id="context"> }
return result;
}
</pre><pre class="diff" id="removed">- private static Object toParam(LinkedListTree param) {
- if (param.getType() != AS3Parser.ANNOTATION_PARAM) {
- throw new SyntaxException("Expected ANNOTATION_PARAM, got "+ASTUtils.tokenName(param));
- }
- LinkedListTree child = param.getFirstChild();
- return toParamValue(child);
- }
-
</pre><pre class="diff" id="context"> private static Object toParamValue(LinkedListTree child) {
switch (child.getType()) {
case AS3Parser.STRING_LITERAL:
</pre><pre class="diff"><small id="info">@@ -168,7 +159,7 @@
</small></pre><pre class="diff" id="context"> return param.getFirstChild().getText();
}
public Object getValue() {
</pre><pre class="diff" id="removed">- return toParam(param.getLastChild());
</pre><pre class="diff" id="added">+ return toParam<span id="addedchars">Value</span>(param.getLastChild());
</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>