lxl 0.1.0 → 0.1.1

data/CHANGES

@@ -0,0 +1,9 @@
+0.1.1
+
+  - String tokens s/S => '/"
+  - :SYMBOL recognition (s token)
+  - register_constant, register_function
+
+0.1.0
+
+  - Initial release

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/lxl.rb

@@ -43,17 +43,19 @@
 #
 #  * The number zero is interpereted as FALSE
 #  * Return multiple results in an array by separating formulas with a semi-colon (;)
+#  * A :SYMBOL token is recognized as a ruby symbol
 #
 # =Lexical Types
 #
 #  w  Whitespace (includes Commas)
 #  ;  Semi-Colon (statement separator)
 #  o  Operator
-#  i  Integer
 #  f  Float
+#  i  Integer
+#  '  String (single quoted)
+#  "  String (double quoted)
+#  s  Symbol
 #  t  Token
-#  s  String (single quoted)
-#  S  String (double quoted)
 #  (  Open (
 #  )  Close )
 #  C  Constant
@@ -89,26 +91,25 @@ class LXL::Parser
   def initialize
 
     # Constants
-    @constants = {
-      :TRUE  => true,
-      :FALSE => false,
-      :NULL  => nil,
-    }
+    @constants = Hash.new
+    register_constant(:TRUE, true)
+    register_constant(:FALSE, false)
+    register_constant(:NULL, nil)
     
     # Functions
     @functions = Hash.new
-    register(:AND)   { |a,b| to_b(a) && to_b(b) }
-    register(:OR)    { |a,b| to_b(a) || to_b(b) }
-    register(:IF)    { |v,a,b| to_b(v) ? a : b }
-    register(:LIST)  { |*args| args }
-    register(:IN)    { |n,h| h.respond_to?(:include?) ? h.include?(n) : false }
-    register(:TODAY) { Date.today.ajd.to_f }
-    register(:NOW)   { DateTime.now.ajd.to_f }
-    register(:DATE)  { |y,m,d| Date.new(y,m,d).ajd.to_f }
-    register(:TIME)  { |h,m,s|
+    register_function(:AND)      { |a,b| to_b(a) && to_b(b) }
+    register_function(:OR)       { |a,b| to_b(a) || to_b(b) }
+    register_function(:IF)       { |v,a,b| to_b(v) ? a : b }
+    register_function(:LIST)     { |*args| args }
+    register_function(:IN)       { |n,h| h.respond_to?(:include?) ? h.include?(n) : false }
+    register_function(:TODAY)    { Date.today.ajd.to_f }
+    register_function(:NOW)      { DateTime.now.ajd.to_f }
+    register_function(:DATE)     { |y,m,d| Date.new(y,m,d).ajd.to_f }
+    register_function(:DATETIME) { |value| DateTime.parse(value).ajd.to_f }
+    register_function(:TIME)     { |h,m,s|
       DateTime.valid_time?(h,m,s) ? DateTime.valid_time?(h,m,s).to_f : raise(ArgumentError, 'invalid time')
     }
-    register(:DATETIME) { |value| DateTime.parse(value).ajd.to_f }
 
     # Lexer
     ops = EXCEL_OPERATORS.collect { |v| Regexp.quote(v) }.join('|')
@@ -119,8 +120,9 @@ class LXL::Parser
                         [/\A(#{ops})/,?o],       # Operator
                         [/\A[0-9]+\.[0-9]+/,?f], # Float
                         [/\A[0-9]+/,?i],         # Integer
-                        [/\A("[^\"]*")/m,?s],    # String (single quoted)
-                        [/\A('[^\']*')/m,?S],    # String (double quoted)
+                        [/\A("[^\"]*")/m,?'],    # String (single quoted)
+                        [/\A('[^\']*')/m,?"],    # String (double quoted)
+                        [/\A:\w+/,?s],           # Symbol
                         [/\A\w+/,?t],            # Token
                         [/\A\(/,?(],             # Open (
                         [/\A\)/,?)],             # Close )
@@ -153,12 +155,20 @@ class LXL::Parser
 
   protected
   
+  # Register a constant
+  #
+  # * Converts name to symbol
+  #
+  def register_constant(name, value)
+    @constants[name.to_sym] = value
+  end
+
   # Register a function
   #
   # * Converts name to symbol
   # * Wraps function with a debugging procedure
   #
-  def register(name, &block)
+  def register_function(name, &block)
     @functions[name.to_sym] = debug(name.to_sym, &block)
   end
 
@@ -166,13 +176,13 @@ class LXL::Parser
   #
   # * Raise an error unless given the correct number of arguments
   #
-  def debug(name, &func)
+  def debug(name, &block)
     raise ArgumentError, 'block not given to debug' unless block_given?
     Proc.new { |*args|
-      if func.arity >= 0 and func.arity != args.size
-        raise ArgumentError, "wrong number of arguments (#{args.size} for #{func.arity}) for #{name}"
+      if block.arity >= 0 and block.arity != args.size
+        raise ArgumentError, "wrong number of arguments (#{args.size} for #{block.arity}) for #{name}"
       end
-      func.call(*args)
+      block.call(*args)
     }
   end
   
@@ -185,12 +195,13 @@ class LXL::Parser
     types, @tokens = @lexer.scan(formula)
     @types = types.split(//)
     raise SyntaxError, 'unbalanced parentheses' unless balanced?
-
+    
     # Parse tokens
     @tokens.each_index do |i|
       type, token = @types[i], @tokens[i]
       token = token.to_i if type == 'i'
       token = token.to_f if type == 'f'
+      token = token.to_sym if type == 's'
       if type == 't'
         token = token.to_sym
         if @functions.key?(token)
@@ -300,7 +311,6 @@ if $0 == __FILE__
     IF(1+1=2, "yes", "no");
   }
   
-  # single formula
   puts LXL.eval('5+5').inspect # => 10
 
   # multiple formulas separated by semi-colon

data/test/lxl_test.rb

@@ -10,6 +10,7 @@ class LXLTest < Test::Unit::TestCase
 
   def test_multiple_formula
     formulas = %{
+      :SYMBOL;
       ((1+2)*(10-6))/2;
       DATETIME("2004-11-22 11:11:00")=DATE(2004,11,22)+TIME(11,11,00);
       IN(" is ", "this is a string");
@@ -19,7 +20,7 @@ class LXLTest < Test::Unit::TestCase
       OR(TRUE, FALSE);
       IF(1+1=2, "yes", "no");
     }
-    expected = [6, true, true, [1, "two", 3.0], true, false, true, "yes"]
+    expected = [:SYMBOL, 6, true, true, [1, "two", 3.0], true, false, true, "yes"]
     results = LXL.eval(formulas)
     expected.each_index { |i| assert_equal(expected[i], results[i]) }
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: lxl
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 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: 
@@ -29,6 +29,7 @@ authors:
 files: 
   - lib
   - test
+  - CHANGES
   - README
   - VERSION
   - lib/lxl.rb