lxl 0.2.2 → 0.2.3

data/CHANGES

@@ -1,3 +1,8 @@
+0.2.3
+
+- tokenize now returns [TypesArray, TokensArray]
+- F and C types reintroduced
+
 0.2.2
 
 - Seperated tokenize's text=>formula into tokenize_text

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/lxl.rb

@@ -48,13 +48,16 @@
 #
 #  w  Whitespace (includes Commas)
 #  o  Operator
+#  s  String
 #  f  Float
 #  i  Integer
-#  s  String
 #  t  Token
 #  (  Open (
 #  )  Close )
 #
+#  F Function
+#  C Constant
+#
 module LXL
 
   module_function
@@ -124,7 +127,7 @@ class LXL::Parser
   #
   def eval(formula)
     formulas = formula.to_s.split(';').collect { |f| f.strip }.find_all { |f| ! f.empty? }
-    formulas.collect! { |f| Kernel.eval(tokenize_text(f).join, binding) }
+    formulas.collect! { |f| Kernel.eval(tokenize_text(f).last.join, binding) }
     formulas.size == 1 ? formulas.first : formulas
   end
   
@@ -182,41 +185,43 @@ class LXL::Parser
     tokenize(formula)
   end
 
-  # Tokenize formula (String => Array)
+  # Tokenize formula into [TypesArray, TokensArray]
   #
   def tokenize(formula)
     ops = Hash[*EXCEL_OPERATORS.zip(RUBY_OPERATORS).flatten]
 
     # Parse formula
-    types, tokens = @lexer.scan(formula.gsub(/^=/,''))
+    types,tokens = @lexer.scan(formula.gsub(/^=/,''))
     raise SyntaxError, 'unbalanced parentheses' unless balanced?(tokens)
     
     # Parse tokens
     tokens.each_index do |i|
       type, token = types[i], tokens[i]
       tokens[i] = case type
-        when :i then token.to_i
-        when :f then token.to_f
+        when :o then ops[token]
         when :s then token.gsub(/([^\\])""/,'\1\"') # "" to \"
+        when :f then token.to_f
+        when :i then token.to_i
         when :t then
           name = name(token)
           if @functions.key?(name)
             if tokens[i+1] != '('
               raise ArgumentError, "wrong number of arguments for #{token}"
             else
+              types[i] = :F
               "@functions[:#{name}].call"
             end
           elsif @constants.key?(name)
+            types[i] = :C
             "@constants[:#{name}]"
           else
             raise NameError, "unknown constant #{token}"
           end
-        else
-          EXCEL_OPERATORS.include?(token) ? ops[token] : token
+        else token
       end
     end
 
-    tokens
+    [types,tokens]
   end
   
   # Check that parentheses are balanced

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: lxl
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 date: 2005-02-08
 summary: LXL (Like Excel) is a mini-language that mimics Microsoft Excel formulas. Easily extended with new constants and functions.
 require_paths: 
@@ -28,10 +28,10 @@ authors:
   - Kevin Howe
 files: 
   - lib
+  - VERSION
+  - README
   - test
   - CHANGES
-  - README
-  - VERSION
   - lib/lxl.rb
   - test/lxl_test.rb
 test_files: []