wirb 0.2.0 → 0.2.1

data/CHANGELOG.rdoc

@@ -1,2 +1,6 @@
+== 0.2.1
+* Fix 1.8 Rational after requiring 'mathn'
+* Return of string if tokenizer throws an error
+
 == 0.2.0
 * Initial release.

data/lib/wirb.rb

@@ -1,5 +1,5 @@
 module Wirb
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end
 
 require File.dirname(__FILE__) + '/wirb/colors'

data/lib/wirb/tokenizer.rb

@@ -8,11 +8,12 @@ class << Wirb
 
     chars = str.split(//)
 
-    @state, @token, i = [], '', 0
+    @state, @token, @passed, i  =  [], '', '', 0
 
     # helpers
     pass_custom_state = lambda{ |kind, *options|
       yield kind, @token  unless @token.empty?
+      @passed << @token
       @state.pop          if     options.include?(:remove)
       @token  = ''        unless options.include?(:keep_token)
       @repeat = true      if     options.include?(:repeat)
@@ -20,7 +21,7 @@ class << Wirb
 
     pass_state  = lambda{ |*options| pass_custom_state[ @state[-1], *options ] }
 
-    pass        = lambda{ |kind, string| yield kind, string }
+    pass        = lambda{ |kind, string| @passed << string; yield kind, string }
     
     set_state   = lambda{ |state| @state[-1] = state }
 
@@ -174,6 +175,9 @@ class << Wirb
       when :number
         if c =~ /[0-9e+.-]/ && !(c == '.' && nc == '.')
           @token << c
+        elsif c == '/' # ruby 1.8 mathn
+          pass_state[]
+          pass[:rational_separator, '/']
         else
           pass_state[:remove, :repeat]
         end
@@ -189,7 +193,7 @@ class << Wirb
         case c
         when '('
           pass[:open_rational, '(']
-        when /[0-9e-]/
+        when /[0-9-]/
           push_state[:number, :repeat]
         when '/', ','
           pass[:rational_separator, c]
@@ -296,11 +300,14 @@ class << Wirb
       #   raise "unknown state #{@state[-1]} #{@state.inspect}"
       end
 
-      # TODO infinite recursion detection and catch errors?
+      # TODO infinite recursion detection
 
       # next round :)
       i += 1 unless @repeat
     end
+  rescue
+    # p$!
+    pass[:default, str.gsub(/^#{@passed}/, '')]
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: []