<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/antlr/org/asdt/core/internal/antlr</tt></b></td></tr>
<tr><td><tt><a href="#file1">AS3.g3</a></tt> </td><td></td><td align="right" id="added">+12</td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center">494 -> 495</td></tr>
</table>
<div class="tasklist"><ul>
<li><a href="#task1">TODO: mods?
</a></li>
</ul></div>
<pre class="comment">
Do the placeholder()-dance for ANNOTATIONS AST nodes.
Also, include the ANNOTATIONS node in a few places that where lacking it
</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">494 -> 495</small></div>
<pre class="diff"><small id="info">--- trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2007-07-09 22:35:53 UTC (rev 494)
+++ trunk/src/main/antlr/org/asdt/core/internal/antlr/AS3.g3 2007-07-27 19:14:34 UTC (rev 495)
@@ -182,7 +182,8 @@
</small></pre><pre class="diff" id="context">
as2Type
</pre><pre class="diff" id="removed">- : annos=annotations! mods=modifiers!
</pre><pre class="diff" id="added">+ : annos=annotations! { placeholder($annos.tree); }
+ mods=modifiers!
</pre><pre class="diff" id="context"> ( as2ClassDefinition[$annos.tree,$mods.tree]
| as2InterfaceDefinition[$annos.tree,$mods.tree]
)
</pre><pre class="diff"><small id="info">@@ -209,7 +210,8 @@
</small></pre><pre class="diff" id="context"> packageBlockEntry
: ( importDefinition
// | includeDirective This is in 'annos' instead
</pre><pre class="diff" id="removed">- | annos=annotations! mods=modifiers!
</pre><pre class="diff" id="added">+ | annos=annotations! { placeholder($annos.tree); }
+ mods=modifiers!
</pre><pre class="diff" id="context"> ( classDefinition[$annos.tree,$mods.tree]
| interfaceDefinition[$annos.tree,$mods.tree]
| variableDefinition[$annos.tree,$mods.tree]
</pre><pre class="diff"><small id="info">@@ -240,7 +242,7 @@
</small></pre><pre class="diff" id="context"> classExtendsClause
implementsClause
typeBlock
</pre><pre class="diff" id="removed">- -> ^(CLASS_DEF {$mods} CLASS ident classExtendsClause implementsClause typeBlock)
</pre><pre class="diff" id="added">+ -> ^(CLASS_DEF {$<span id="addedchars">annos} {$</span>mods} CLASS ident classExtendsClause implementsClause typeBlock)
</pre><pre class="diff" id="context">
as2ClassDefinition[LinkedListTree annos, LinkedListTree mods]
</pre><pre class="diff"><small id="info">@@ -248,21 +250,21 @@
</small></pre><pre class="diff" id="context"> classExtendsClause
implementsClause
typeBlock
</pre><pre class="diff" id="removed">- -> ^(CLASS_DEF {$mods} CLASS identifier classExtendsClause implementsClause typeBlock)
</pre><pre class="diff" id="added">+ -> ^(CLASS_DEF {$<span id="addedchars">annos} {$</span>mods} CLASS identifier classExtendsClause implementsClause typeBlock)
</pre><pre class="diff" id="context">
interfaceDefinition[LinkedListTree annos, Tree mods]
: INTERFACE ident
interfaceExtendsClause
typeBlock
</pre><pre class="diff" id="removed">- -> ^(INTERFACE_DEF {$mods} INTERFACE ident interfaceExtendsClause typeBlock)
</pre><pre class="diff" id="added">+ -> ^(INTERFACE_DEF {$<span id="addedchars">annos} {$</span>mods} INTERFACE ident interfaceExtendsClause typeBlock)
</pre><pre class="diff" id="context">
as2InterfaceDefinition[LinkedListTree annos, Tree mods]
: INTERFACE identifier
interfaceExtendsClause
typeBlock
</pre><pre class="diff" id="removed">- -> ^(INTERFACE_DEF INTERFACE identifier interfaceExtendsClause typeBlock) // TODO: mods?
</pre><pre class="diff" id="added"><a name="task1" />+ -> ^(INTERFACE_DEF <span id="addedchars">{$annos} {$mods} </span>INTERFACE identifier interfaceExtendsClause typeBlock) // <span class="task">TODO</span>: mods?
</pre><pre class="diff" id="context">
classExtendsClause
</pre><pre class="diff"><small id="info">@@ -290,7 +292,8 @@
</small></pre><pre class="diff" id="context">
annotatableDirective
</pre><pre class="diff" id="removed">- : a=annotations! m=modifiers!
</pre><pre class="diff" id="added">+ : a=annotations! { placeholder($a.tree); }
+ m=modifiers!
</pre><pre class="diff" id="context"> ( variableDefinition[$a.tree,$m.tree]
| methodDefinition[$a.tree,$m.tree]
)
</pre><pre class="diff"><small id="info">@@ -414,7 +417,8 @@
</small></pre><pre class="diff" id="context"> blockEntry
:
/*options { k=*; }
</pre><pre class="diff" id="removed">- : a=annotations! m=modifiers!
</pre><pre class="diff" id="added">+ : a=annotations! { placeholder($a.tree); }
+ m=modifiers!
</pre><pre class="diff" id="context"> ( variableDefinition[$a.tree,$m.tree]
| methodDefinition[$a.tree,$m.tree]
)
</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>