[as2api-dev] [CVS trunk] Add back missing error handling (got dropped during earlier optimisation).

David Holroyd dave at badgers-in-foil.co.uk
Mon, 04 Jul 2005 22:31:49 +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">lexer.rb</a></tt></td><td align="right" id="added">+6</td><td align="right" id="removed">-1</td><td nowrap="nowrap" align="center"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=184&amp;content-type=text/vnd.viewcvs-markup">184</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb.diff?r1=184&amp;r2=185">-&gt;</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=185&amp;content-type=text/vnd.viewcvs-markup">185</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">tc_actionscript_lexer.rb</a></tt></td><td align="right" id="added">+8</td><td></td><td nowrap="nowrap" align="center"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=184&amp;content-type=text/vnd.viewcvs-markup">184</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb.diff?r1=184&amp;r2=185">-&gt;</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=185&amp;content-type=text/vnd.viewcvs-markup">185</a></td></tr>
<tr><td></td><td align="right" id="added">+14</td><td align="right" id="removed">-1</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Add back missing error handling (got dropped during earlier optimisation).

There was an infinate loop when no lexer rule matched input :(
</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>lexer.rb</b></big> <small id="info"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=184&amp;content-type=text/vnd.viewcvs-markup">184</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb.diff?r1=184&amp;r2=185">-&gt;</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/parse/lexer.rb?rev=185&amp;content-type=text/vnd.viewcvs-markup">185</a></small></div>
<pre class="diff"><small id="info">--- trunk/as2api/parse/lexer.rb	2005-07-04 00:20:55 UTC (rev 184)
+++ trunk/as2api/parse/lexer.rb	2005-07-04 22:31:48 UTC (rev 185)
@@ -385,7 +385,12 @@
</small></pre><pre class="diff" id="context">       text &lt;&lt; "  next\n"
       text &lt;&lt; "end\n"
     end
</pre><pre class="diff" id="removed">-    text &lt;&lt; "        end\n      end\n"
</pre><pre class="diff" id="added">+    text &lt;&lt; &lt;&lt;-EOS
+          # no previous regexp matched,
+          parse_error(line.rest)
+        end
+      end
+    EOS
</pre><pre class="diff" id="context">     class_eval(text)
   end
 
</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_lexer.rb</b></big> <small id="info"><a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=184&amp;content-type=text/vnd.viewcvs-markup">184</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb.diff?r1=184&amp;r2=185">-&gt;</a> <a href="http://svn.badgers-in-foil.co.uk/viewcvs.cgi/as2api/trunk/as2api/tc_actionscript_lexer.rb?rev=185&amp;content-type=text/vnd.viewcvs-markup">185</a></small></div>
<pre class="diff"><small id="info">--- trunk/as2api/tc_actionscript_lexer.rb	2005-07-04 00:20:55 UTC (rev 184)
+++ trunk/as2api/tc_actionscript_lexer.rb	2005-07-04 22:31:48 UTC (rev 185)
@@ -5,6 +5,14 @@
</small></pre><pre class="diff" id="context"> 
   include ActionScript::Parse
 
</pre><pre class="diff" id="added">+  def test_lex_error
+    begin
+      assert_lex_to("@")
+      flunk("should be exception on invalid input")
+    rescue
+    end
+  end
+
</pre><pre class="diff" id="context">   def test_simple_string
     assert_lex_to("'test'", StringToken.new("test", 1))
     assert_lex_to("\"test\"", StringToken.new("test", 1))
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -&gt; email">CVSspam</a> 0.2.11</small></center>
</body></html>