omghax-einstein 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.1 2008-05-08
+
+* 1 major bugfix:
+  * Fixed incorrect evaluation of left and right shifts.
+
 == 0.1.0 2008-04-30
 
 * 1 major enhancement:

data/Manifest.txt

@@ -21,7 +21,7 @@ tasks/deployment.rake
 tasks/environment.rake
 tasks/website.rake
 test/test_evaluate.rb
-test/test_helper.rb
+test/helper.rb
 test/test_parser.rb
 test/test_pretty_print.rb
 website/index.html

data/lib/einstein/version.rb

@@ -2,7 +2,7 @@ module Einstein #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/einstein/visitors.rb

@@ -96,6 +96,18 @@ module Einstein
         o.left.accept(self) - o.value.accept(self)
       end
 
+      # Performs a bitwise left shift of the left value of +o+ by the number
+      # of bits specified in the right value of +o+.
+      def visit_LeftShiftNode(o)
+        o.left.accept(self) << o.value.accept(self)
+      end
+
+      # Performs a bitwise right shift of the left value of +o+ by the number
+      # of bits specified in the right value of +o+.
+      def visit_RightShiftNode(o)
+        o.left.accept(self) >> o.value.accept(self)
+      end
+
       # Performs a bitwise AND with the left and right values of +o+.
       def visit_BitwiseAndNode(o)
         o.left.accept(self) & o.value.accept(self)

data/test/test_evaluate.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/test_helper"
+require File.dirname(__FILE__) + "/helper"
 require "logger"
 
 class TestEvaluate < Test::Unit::TestCase
@@ -38,6 +38,14 @@ class TestEvaluate < Test::Unit::TestCase
     assert_equal(0b1100 & 0b1111, parse("0b1100 & 0b1111").evaluate)
   end
 
+  def test_rshift
+    assert_equal(10 >> 2, parse("10 >> 2").evaluate)
+  end
+
+  def test_lshift
+    assert_equal(10 << 2, parse("10 << 2").evaluate)
+  end
+
   def test_subtraction
     assert_equal(10 - 5, parse("10 - 5").evaluate)
     assert_equal(5 - 10, parse("5 - 10").evaluate)

data/test/test_parser.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/test_helper"
+require File.dirname(__FILE__) + "/helper"
 require "logger"
 
 class TestParser < Test::Unit::TestCase

data/test/test_pretty_print.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/test_helper"
+require File.dirname(__FILE__) + "/helper"
 require "logger"
 
 class TestPrettyPrint < Test::Unit::TestCase
@@ -34,6 +34,14 @@ class TestPrettyPrint < Test::Unit::TestCase
     assert_equal "(12 & 15)", parse("0b1100 & 0b1111").inspect
   end
 
+  def test_rshift
+    assert_equal("(10 >> 2)", parse("10 >> 2").inspect)
+  end
+
+  def test_lshift
+    assert_equal("(10 << 2)", parse("10 << 2").inspect)
+  end
+
   def test_subtraction
     assert_equal "(10 - 5)", parse("10 - 5").inspect
     assert_equal "(5 - 10)", parse("5 - 10").inspect

data/test/test_tokenizer.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + "/helper"
+
+class TestTokenizer < Test::Unit::TestCase
+  def setup
+    @tokenizer = Einstein::Tokenizer.new
+  end
+
+  def test_rshift
+    assert_equal [[:RSHIFT, ">>"]], tokenize(">>")
+  end
+
+  def test_lshift
+    assert_equal [[:LSHIFT, "<<"]], tokenize("<<")
+  end
+
+  def test_raise
+    assert_equal [[:RAISE, "**"]], tokenize("**")
+  end
+
+  def test_single_char
+    assert_equal [["(", "("]], tokenize("(")
+    assert_equal [["{", "{"]], tokenize("{")
+    assert_equal [["!", "!"]], tokenize("!")
+  end
+
+  def test_comment
+    assert_equal [[:COMMENT, "/* hope this works... */"]], tokenize("/* hope this works... */")
+  end
+
+  def test_whitespace
+    assert_equal [[:WS, " \t\r\n"]], tokenize(" \t\r\n")
+  end
+
+  def test_ident
+    assert_equal [[:IDENT, "x"]], tokenize("x")
+  end
+
+  def test_float_scientific
+    assert_equal [[:NUMBER, 10.10e-3]], tokenize("10.10e-3")
+  end
+
+  def test_float
+    assert_equal [[:NUMBER, 10.10]], tokenize("10.10")
+  end
+
+  def test_number_base2
+    assert_equal [[:NUMBER, 0b1010]], tokenize("0b1010")
+  end
+
+  def test_number_base8
+    assert_equal [[:NUMBER, 011]], tokenize("011")
+  end
+
+  def test_number_base16
+    assert_equal [[:NUMBER, 0xdeadbeef]], tokenize("0xdeadbeef")
+    assert_equal [[:NUMBER, 0xCAFEBABE]], tokenize("0xCAFEBABE")
+  end
+
+  def test_number_base10
+    assert_equal [[:NUMBER, 15]], tokenize("15")
+  end
+
+  private
+
+  def tokenize(stmt)
+    @tokenizer.tokenize(stmt)
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>einstein</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/einstein"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/einstein" class="numbers">0.1.0</a>
+      <a href="http://rubyforge.org/projects/einstein" class="numbers">0.1.1</a>
     </div>
     <h2>What</h2>
 
@@ -109,7 +109,7 @@ offers a .tgz file download for those of you who don&#8217;t have git installed
 Einstein and take it to crazy new places. If I like your changes, I&#8217;ll merge
 them into the master branch.</p>
     <p class="coda">
-      <a href="http://github.com/omghax">Dray Lacy</a>, 29th April 2008<br>
+      <a href="http://github.com/omghax">Dray Lacy</a>, 8th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: omghax-einstein
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dray Lacy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-30 00:00:00 -07:00
+date: 2008-05-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -50,7 +50,7 @@ files:
 - tasks/environment.rake
 - tasks/website.rake
 - test/test_evaluate.rb
-- test/test_helper.rb
+- test/helper.rb
 - test/test_parser.rb
 - test/test_pretty_print.rb
 - website/index.html
@@ -58,6 +58,7 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
+- test/test_tokenizer.rb
 has_rdoc: true
 homepage: http://einstein.rubyforge.org
 post_install_message: 
@@ -87,6 +88,6 @@ specification_version: 2
 summary: Safe arithmetic parser for Ruby apps
 test_files: 
 - test/test_evaluate.rb
-- test/test_helper.rb
 - test/test_parser.rb
 - test/test_pretty_print.rb
+- test/test_tokenizer.rb