[as2api-dev] [CVS trunk] Allow a mixture of imports and attributes at the start of
a file.
David Holroyd
dave at badgers-in-foil.co.uk
Thu, 14 Jul 2005 12:22:52 +0000
<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;}
#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 {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="4">Commit in <b><tt>trunk/as2api</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>parse/<a href="#file1">parser.rb</a></tt></td><td align="right" id="added">+10</td><td align="right" id="removed">-5</td><td nowrap="nowrap" align="center"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/parser.rb?rev=198&content-type=text/vnd.viewcvs-markup">198</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/parser.rb.diff?r1=198&r2=199">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/parser.rb?rev=199&content-type=text/vnd.viewcvs-markup">199</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">tc_actionscript_parser.rb</a></tt></td><td align="right" id="added">+6</td><td></td><td nowrap="nowrap" align="center"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_parser.rb?rev=198&content-type=text/vnd.viewcvs-markup">198</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_parser.rb.diff?r1=198&r2=199">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_parser.rb?rev=199&content-type=text/vnd.viewcvs-markup">199</a></td></tr>
<tr><td></td><td align="right" id="added">+16</td><td align="right" id="removed">-5</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Allow a mixture of imports and attributes at the start of a file.
Previously, attributes were only allowed just before the type definition (i.e.
after the end of any list of import statements).
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk">trunk</a>/<a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api">as2api</a>/<a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse">parse</a></span><br />
<div class="fileheader"><big><b>parser.rb</b></big> <small id="info"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/parser.rb?rev=198&content-type=text/vnd.viewcvs-markup">198</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/parser.rb.diff?r1=198&r2=199">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/parser.rb?rev=199&content-type=text/vnd.viewcvs-markup">199</a></small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/parser.rb 2005-07-14 12:16:15 UTC (rev 198)
+++ trunk/as2api/parse/parser.rb 2005-07-14 12:22:50 UTC (rev 199)
@@ -50,15 +50,21 @@
</small></pre><pre class="diff" id="context">
def parse_compilation_unit
@handler.compilation_unit_start
</pre><pre class="diff" id="removed">- parse_imports
</pre><pre class="diff" id="added">+ parse_imports_and_attributes
</pre><pre class="diff" id="context"> parse_type_definition
@handler.compilation_unit_end
end
</pre><pre class="diff" id="removed">- def parse_imports
- while lookahead?(ImportToken)
- parse_import
</pre><pre class="diff" id="added">+ def parse_imports_and_attributes
+ while true
+ if lookahead?(ImportToken)
+ parse_import
+ elsif lookahead?(LBracketToken)
+ eat_attribute
+ else
+ break
+ end
</pre><pre class="diff" id="context"> end
end
</pre><pre class="diff"><small id="info">@@ -86,7 +92,6 @@
</small></pre><pre class="diff" id="context"> end
def parse_type_definition
</pre><pre class="diff" id="removed">- parse_attribute_list
</pre><pre class="diff" id="context"> if lookahead?(ClassToken) || lookahead?(DynamicToken) || lookahead?(IntrinsicToken)
type = parse_class_or_intrinsic_definition
elsif lookahead?(InterfaceToken)
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk">trunk</a>/<a
href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api">as2api</a></span><br />
<div class="fileheader"><big><b>tc_actionscript_parser.rb</b></big> <small id="info"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_parser.rb?rev=198&content-type=text/vnd.viewcvs-markup">198</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_parser.rb.diff?r1=198&r2=199">-></a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_parser.rb?rev=199&content-type=text/vnd.viewcvs-markup">199</a></small></div>
<pre class="diff"><small id="info">--- trunk/as2api/tc_actionscript_parser.rb 2005-07-14 12:16:15 UTC (rev 198)
+++ trunk/as2api/tc_actionscript_parser.rb 2005-07-14 12:22:50 UTC (rev 199)
@@ -13,6 +13,12 @@
</small></pre><pre class="diff" id="context"> end
end
</pre><pre class="diff" id="added">+ def test_imports_and_attributes
+ simple_parse("[foo=bar]\nimport foo;[bar=foo]\nclass Foo {}") do |parse|
+ parse.parse_compilation_unit
+ end
+ end
+
</pre><pre class="diff" id="context"> def test_access_modifier
simple_parse("") do |parse|
access = parse.parse_access_modifier
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.11</small></center>
</body></html>