lxl 0.4.0 → 0.4.1

data/CHANGES

@@ -1,3 +1,7 @@
+0.4.1
+
+- LXL::Token, LXL::Parser#token_class, #store, #tokenize updated.
+
 0.4.0
 
 - Tokenizing greatly refactored

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/lxl.rb

@@ -162,6 +162,29 @@ module LXL
 
 end
 
+# Holds the lexical type and value of a parsed token.
+#
+class LXL::Token
+
+  # Lexical type (Fixnum).
+  attr_accessor :type
+
+  # Parsed value.
+  attr_accessor :value
+
+  def initialize(type, value)
+    @type = type
+    @value = value
+  end
+
+  def to_s()
+    "T:#{@type.chr}:#{@value}"
+  end
+
+  alias inspect to_s
+
+end
+
 # =Lexical Types
 #
 #  ;  Statement separator
@@ -183,14 +206,6 @@ end
 #
 class LXL::Parser
 
-  class Token
-    attr_accessor :type, :value
-    def initialize(type, value) @type = type; @value = value end
-    def whitespace?() value.to_s.strip.empty? end
-    def to_s() "T:#{@type.chr}:#{@value}" end
-    alias inspect to_s
-  end
-
   RUBY_OPERATORS  = ['+', '-', '*', '/', '<=', '>=', '==', '!=', '<', '>', '+', '**']
   EXCEL_OPERATORS = ['+', '-', '*', '/', '<=', '>=', '=',  '<>', '<', '>', '&', '^' ]
 
@@ -200,6 +215,12 @@ class LXL::Parser
     self.new.eval(formula)
   end
   
+  # Default token class.
+  #
+  def self.token_class
+    LXL::Token
+  end
+
   # Default lexer class.
   #
   def self.lexer_class
@@ -218,7 +239,7 @@ class LXL::Parser
     LXL::Range
   end
 
-  # Initialize namespace and parser.
+  # Initialize namespace and lexer.
   #
   def initialize(namespace=self.class.namespace_class.new)
     @namespace = namespace
@@ -240,7 +261,7 @@ class LXL::Parser
       [/\A\w+/, ?u],             # Unknown
     ])
   end
-
+  
   # Evaluate a formula.
   #
   def eval(string)
@@ -252,6 +273,12 @@ class LXL::Parser
   
   protected
   
+  # Store parsed token type and value.
+  #
+  def store(type, value)
+    self.class.token_class.new(type, value)
+  end
+
   # Quote a string.
   #
   #  quote('a "quoted" value.')
@@ -310,22 +337,22 @@ class LXL::Parser
           text << tokens.shift
         end
         text = text.join.chomp
-        formulas.last << Token.new(type, translate_quotes(quote(text))) unless text.empty?
+        formulas.last << store(type, translate_quotes(quote(text))) unless text.empty?
       # Formula
       else
-        t = Token.new(type, token)
+        t = store(type, token)
         case type
           when ?; then formulas << []
           when ?= then formulas << []
-          when ?o then formulas.last << Token.new(type, ops[token])
-          when ?s then formulas.last << Token.new(type, translate_quotes(token))
-          when ?p then formulas.last << Token.new(type, token.to_f/100)
-          when ?f then formulas.last << Token.new(type, token.to_f)
-          when ?i then formulas.last << Token.new(type, token.to_i)
+          when ?o then formulas.last << store(type, ops[token])
+          when ?s then formulas.last << store(type, translate_quotes(token))
+          when ?p then formulas.last << store(type, token.to_f/100)
+          when ?f then formulas.last << store(type, token.to_f)
+          when ?i then formulas.last << store(type, token.to_i)
           when ?r then
             range = token.split(/:/)
             range[1] = range[0] if range.size == 1
-            formulas.last << Token.new(type, "self.class.range_class.new(*#{range.inspect})")
+            formulas.last << store(type, "self.class.range_class.new(*#{range.inspect})")
           when ?u then
             upper = token.to_s.upcase
             lower = token.to_s.downcase
@@ -334,12 +361,12 @@ class LXL::Parser
             # Constants
             if tokens.first != '('
               if @namespace.const_defined?(upper) or custom_const_missing
-                formulas.last << Token.new(?C, "@namespace.const_get(:#{upper})")
+                formulas.last << store(?C, "@namespace.const_get(:#{upper})")
               else formulas.last << t end
             # Functions
             else
               if @namespace.respond_to?(lower) or @namespace.respond_to?(:method_missing)
-                formulas.last << Token.new(?F, "@namespace.#{lower}")
+                formulas.last << store(?F, "@namespace.#{lower}")
               else formulas.last << t end
             end
           else formulas.last << t end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: lxl
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 date: 2005-02-16
 summary: LXL (Like Excel) is a mini-language that mimics Microsoft Excel formulas. Easily extended with new constants and functions.
 require_paths: