surpass 0.0.9 → 0.1.0

data/.bnsignore

@@ -0,0 +1,26 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   PROJ.ignore_file = '.gitignore'
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg
+.DS_Store
+.bzr
+.bzrignore
+examples
+debug-examples
+webby
+stats
+spec
+*.swp
+

data/Rakefile

@@ -26,3 +26,12 @@ desc "run antlr compiler"
 task :antlr do
   `cd lib/surpass; antlr4ruby ExcelFormula.g`
 end
+
+desc "run examples"
+task :examples do
+  `rm examples/*.xls`
+  `cd examples; ls *.rb`.chomp.split.each do |f|
+      next if f =~ /big/
+     `jruby #{File.expand_path(f, "examples")}`
+  end
+end

data/lib/surpass.rb

@@ -1,7 +1,7 @@
 module Surpass
 
   # :stopdoc:
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -41,6 +41,7 @@ module Surpass
     Dir.glob(search_me).sort.each do |rb|
       next if File.basename(rb) === File.basename(__FILE__) # skip surpass.rb
       next if File.basename(rb) =~ /^ExcelFormula/ unless FORMULAS_AVAILABLE
+      next if File.basename(rb) =~ /^excel_magic/ # already loaded this
       require rb
     end
   end
@@ -56,6 +57,8 @@ rescue Exception => e
   FORMULAS_AVAILABLE = false
 end
 
+require File.join(File.dirname(__FILE__), 'surpass', 'excel_magic')
+include ExcelMagic
 Surpass.require_all_libs_relative_to(__FILE__)
 require 'date'
 

data/lib/surpass/ExcelFormula.g

@@ -1,8 +1,8 @@
 grammar ExcelFormula;
 
 options {
-    language  = Ruby;
-    k = 2;
+  language  = Ruby;
+  k = 2;
 }
 
 @header {
@@ -75,12 +75,12 @@ prec2_expr[arg_type]
     ;
 
 prec3_expr[arg_type]
-    : prec5_expr[arg_type]
+    : prec4_expr[arg_type]
         (
             (
                 POWER { op = [PTGPOWER].pack('C') }
             )
-            prec5_expr[arg_type] { @rpn += op }
+            prec4_expr[arg_type] { @rpn += op }
         )*
     ;
 
@@ -126,31 +126,33 @@ primary[arg_type]
     | ref2d_tok = REF2D
         {
           r, c = Utilities.cell_to_packed_rowcol(ref2d_tok.text) 
-          ptg = PTGREFR + RVA_DELTA[arg_type]
+          ptg = PTGREFR + RVA_DELTA_REF[arg_type]
           @rpn += [ptg, r, c].pack("Cv2")
         }
     | ref2d1_tok = REF2D COLON ref2d2_tok = REF2D
         {
             r1, c1 = Utilities.cell_to_packed_rowcol(ref2d1_tok.text) 
             r2, c2 = Utilities.cell_to_packed_rowcol(ref2d2_tok.text)
-            ptg = PTGAREAR + RVA_DELTA[arg_type]
+            ptg = PTGAREAR + RVA_DELTA_AREA[arg_type]
             @rpn += [ptg, r1, r2, c1, c2].pack("Cv4")
         }
- 
+    | LP expr[arg_type] RP
+        {
+            @rpn += [PTGPAREN].pack('C')
+        } 
     | sheet1 = sheet
         { 
             sheet2 = sheet1
         }
         ( COLON sheet2 = sheet )? BANG ref3d_ref2d=REF2D
         {
-            ptg = PTGREF3DR + RVA_DELTA[arg_type]
-            rpn_ref2d = ""
+            ptg = PTGREF3DR + RVA_DELTA_REF[arg_type]
             r1, c1 = Utilities.cell_to_packed_rowcol(ref3d_ref2d.text)
             rpn_ref2d = [0x0000, r1, c1].pack("v3")
         }
         ( COLON ref3d_ref2d2= REF2D
             {
-                ptg = PTGAREA3DR + RVA_DELTA[arg_type]
+                ptg = PTGAREA3DR + RVA_DELTA_AREA[arg_type]
                 r2, c2 = Utilities.cell_to_packed_rowcol(ref3d_ref2d2.text)
                 rpn_ref2d = [0x0000, r1, r2, c1, c2].pack("v5")
             }
@@ -169,19 +171,17 @@ primary[arg_type]
         expr[arg_type] (SEMICOLON | COMMA)
         {
             @rpn += [PTGATTR, 0x08, 0].pack("C2v") # tAttrSkip
-            pos1 = @rpn.length - 2
+            pos1 = @rpn.size - 2
 
-            rem = @rpn.length - (pos0 + 2)
-            @rpn = @rpn[0..pos0] + [pos1-pos0].pack("v") + @rpn[pos0+2, rem] # TODO Check for OBO
+            @rpn = @rpn[0...pos0] + [pos1-pos0].pack("v") + @rpn[(pos0+2)...(@rpn.size)] 
         }
         expr[arg_type] RP
         {
             @rpn += [PTGATTR, 0x08, 3].pack("C2v") # tAttrSkip
             @rpn += [PTGFUNCVARR, 3, 1].pack("C2v") # 3 = nargs, 1 = IF func
-            pos2 = @rpn.length
+            pos2 = @rpn.size
 
-            rem = @rpn.length - (pos1 + 2)
-            @rpn = @rpn[0..pos1] + [pos2-(pos1+2)-1].pack("v") + @rpn[pos1+2, rem] # TODO Check for OBO
+            @rpn = @rpn[0...pos1] + [pos2-(pos1+2)-1].pack("v") + @rpn[(pos1+2)...(@rpn.size)]
         }
     | FUNC_CHOOSE
         {
@@ -190,39 +190,39 @@ primary[arg_type]
         }
         LP expr["V"]
         {
-            rpn_start = @rpn.length
-            ref_markers = [@sheet_references.length]
+            rpn_start = @rpn.size
+            ref_markers = [@sheet_references.size]
         }
         (
             (SEMICOLON | COMMA)
-                { mark = @rpn.length }
+                { mark = @rpn.size }
                 (
                   expr[arg_type]
                 | { @rpn += [PTGMISSARG].pack("C") }
                 )
                 {
-                    rem = @rpn.length - mark
+                    rem = @rpn.size - mark
                     rpn_chunks << @rpn[mark, rem]
                     ref_markers << @sheet_references.size
                 }
         )*
         RP
         {
-            @rpn = @rpn[0..rpn_start]
+            @rpn = @rpn[0...rpn_start]
             nc = rpn_chunks.length
             chunklens = rpn_chunks.collect {|c| c.length}
             skiplens = [0] * nc
-            skiplens[-1] = 3
+            skiplens[nc-1] = 3
 
             (nc-1).downto(1) do |i|
               skiplens[i-1] = skiplens[i] + chunklens[i] + 4
             end
-            jump_pos = [2 * nc + 2]
+            jump_pos = [2*nc + 2]
 
             (0...nc).each do |i|
-              jump_pos.append(jump_pos[-1] + chunklens[ic] + 4)
+              jump_pos << (jump_pos.last + chunklens[i] + 4)
             end
-            chunk_shift = 2 * nc + 6 # size of tAttrChoose
+            chunk_shift = 2*nc + 6 # size of tAttrChoose
 
             (0...nc).each do |i|
               (ref_markers[i]...ref_markers[i+1]).each do |r|
@@ -266,7 +266,7 @@ primary[arg_type]
         LP arg_count = expr_list[arg_type_list, min_argc, max_argc] RP
         {
           if (arg_count > max_argc) || (arg_count < min_argc)
-             raise "#{arg_count} parameters for function: #{func_tok.text}"
+             raise "incorrect number #{arg_count} of parameters for function: #{func_tok.text}"
           end
 
           if xcall
@@ -275,47 +275,58 @@ primary[arg_type]
           elsif (min_argc == max_argc)
               func_ptg = PTGFUNCR + RVA_DELTA[func_type]
               @rpn += [func_ptg, opcode].pack("Cv") 
-          elsif (arg_count == 1) && (func_tok.text.upcase == "SUM")
+          elsif (arg_count == 1) && (func_tok.text.upcase === "SUM")
               @rpn += [PTGATTR, 0x10, 0].pack("CCv") # tAttrSum
           else
-            func_ptg = PTGFUNCVARR + RVA_DELTA[func_type]
+              func_ptg = PTGFUNCVARR + RVA_DELTA[func_type]
               @rpn += [func_ptg, arg_count, opcode].pack("CCv")
           end
         }
-    | LP expr[arg_type] RP
-        {
-            @rpn += [PTGPAREN].pack('C')
-        }
     ;
-    
 
+// Process arguments to a function.
 expr_list[arg_type_list, min_argc, max_argc] returns [arg_cnt]
-@members{
-    arg_cnt = 0
-    arg_type = arg_type_list[arg_cnt]
+@init
+{
+  arg_cnt = 0
+
+  # Set these for processing first argument, 
+  # it's simpler because first argument type can't be '...'
+  arg_type = arg_type_list.first
+
+  # need to check for '-' for a fn with no arguments
+  arg_cnt += 1 unless arg_type === '-'
 }
-    : expr[arg_type] { arg_cnt += 1 }
-    (
-        {
-            if arg_cnt < arg_type_list.size
-                arg_type = arg_type_list[arg_cnt]
-            else
-                arg_type = arg_type_list[-1]
-            end
-            if arg_type == "+"
-                arg_type = arg_type_list[-2]
-            end
-        }
-        (SEMICOLON | COMMA)
-            (
-                  expr[arg_type]
-                | { @rpn += [PTGMISSARG].pack("B") }
-            )
-            { arg_cnt += 1 }
-    )*
-    |
+    : 
+    (expr[arg_type]
+        (
+             (SEMICOLON | COMMA) { arg_cnt += 1 }
+                ( 
+                 // *either* we find an argument after the comma/semicolon in which case process it...
+                     expr[arg_type]
+                     {
+                        if arg_cnt - 2 < arg_type_list.size
+                           arg_type = arg_type_list[arg_cnt - 2]
+                        else
+                          if arg_type_list.last === "..."
+                             # e.g. "V R ..." arbitrary number of args of type R
+                             # this will always be last element in arg_type_list
+                             # 2nd to last element will provide type
+                             arg_type = arg_type_list[arg_type_list.size - 2]
+                          else
+                            # Just read last element normally.
+                            arg_type = arg_type_list[arg_cnt - 2]
+                          end
+                        end
+                     }
+                     // ... *or* we have a missing argument and need to insert a placeholder
+                | { @rpn += [PTGMISSARG].pack("C") } 
+                )
+         )*
+    )
+    | // Some functions have no arguments e.g. pi()
     ;
-    
+
 sheet returns[ref]
     : sheet_ref_name = NAME
       { ref = sheet_ref_name.text }
@@ -325,7 +336,7 @@ sheet returns[ref]
       { ref = sheet_ref_quote.text[1, len(sheet_ref_quote.text) - 1].replace("''", "'") }
     ;
 
-    
+
 EQ: '=';
 LT: '<';
 GT: '>';
@@ -345,7 +356,7 @@ COMMA: ',';
 LP: '(';
 RP: ')';
 CONCAT: '&';
-PERCENT: '%';
+PERCENT: '\%';
 POWER: '^';
 BANG: '!';
 
@@ -357,8 +368,11 @@ STR_CONST: '"' (~'"')+ '"';
 REF2D: '$'? ('A'..'I')? ('A'..'Z') '$'? DIGIT+;
 TRUE_CONST: ('T'|'t') ('R'|'r') ('U'|'u') ('E'|'e') ;
 FALSE_CONST: ('F'|'f') ('A'|'a') ('L'|'l') ('S'|'s') ('E'|'e') ;
-NAME: '\w[\.\w]*' ;
 QUOTENAME: '\'(?:[^\']|\'\')*\'';
 FUNC_IF: 'IF';
 FUNC_CHOOSE: 'CHOOSE';
 
+fragment ALPHA: 'a'..'z' | 'A'..'Z';
+NAME: ALPHA+ ;
+
+WS: (' ')+ {skip()};

data/lib/surpass/ExcelFormula.tokens

@@ -4,26 +4,28 @@ NUM_CONST=21
 PERCENT=16
 REF2D=22
 CONCAT=10
-RP=29
-LP=26
+RP=25
+LP=24
 INT_CONST=20
 STR_CONST=19
 POWER=15
 SUB=12
 FUNC_CHOOSE=30
-SEMICOLON=27
-BANG=24
+SEMICOLON=28
+BANG=26
 TRUE_CONST=17
 MUL=13
+ALPHA=34
 COLON=23
 NAME=31
 FALSE_CONST=18
-COMMA=28
+WS=35
+COMMA=29
 GT=6
 DIGIT=33
 EQ=4
 DIV=14
-FUNC_IF=25
+FUNC_IF=27
 QUOTENAME=32
 LE=9
 NE=5

data/lib/surpass/ExcelFormulaLexer.rb

@@ -5,7 +5,7 @@
 # Generated using ANTLR version: 3.2.1-SNAPSHOT Dec 18, 2009 04:29:28
 # Ruby runtime library version: 1.3.1
 # Input grammar file: ExcelFormula.g
-# Generated at: 2010-05-03 16:34:32
+# Generated at: 2010-06-13 10:19:27
 # 
 
 # ~~~> start load path setup
@@ -67,13 +67,13 @@ module ExcelFormula
 
     # define the token constants
     define_tokens(:GE => 8, :LT => 7, :NUM_CONST => 21, :PERCENT => 16, 
-                  :REF2D => 22, :CONCAT => 10, :RP => 29, :LP => 26, :INT_CONST => 20, 
+                  :REF2D => 22, :CONCAT => 10, :RP => 25, :LP => 24, :INT_CONST => 20, 
                   :STR_CONST => 19, :POWER => 15, :SUB => 12, :FUNC_CHOOSE => 30, 
-                  :SEMICOLON => 27, :BANG => 24, :TRUE_CONST => 17, :EOF => -1, 
-                  :MUL => 13, :COLON => 23, :FALSE_CONST => 18, :NAME => 31, 
-                  :COMMA => 28, :GT => 6, :DIGIT => 33, :DIV => 14, :EQ => 4, 
-                  :FUNC_IF => 25, :QUOTENAME => 32, :LE => 9, :ADD => 11, 
-                  :NE => 5)
+                  :SEMICOLON => 28, :BANG => 26, :TRUE_CONST => 17, :EOF => -1, 
+                  :MUL => 13, :ALPHA => 34, :COLON => 23, :FALSE_CONST => 18, 
+                  :NAME => 31, :WS => 35, :COMMA => 29, :GT => 6, :DIGIT => 33, 
+                  :DIV => 14, :EQ => 4, :FUNC_IF => 27, :QUOTENAME => 32, 
+                  :LE => 9, :ADD => 11, :NE => 5)
     
   end
 
@@ -91,13 +91,14 @@ module ExcelFormula
     RULE_NAMES   = ["EQ", "LT", "GT", "NE", "LE", "GE", "ADD", "SUB", "MUL", 
                     "DIV", "COLON", "SEMICOLON", "COMMA", "LP", "RP", "CONCAT", 
                     "PERCENT", "POWER", "BANG", "DIGIT", "INT_CONST", "NUM_CONST", 
-                    "STR_CONST", "REF2D", "TRUE_CONST", "FALSE_CONST", "NAME", 
-                    "QUOTENAME", "FUNC_IF", "FUNC_CHOOSE"].freeze
+                    "STR_CONST", "REF2D", "TRUE_CONST", "FALSE_CONST", "QUOTENAME", 
+                    "FUNC_IF", "FUNC_CHOOSE", "ALPHA", "NAME", "WS"].freeze
     RULE_METHODS = [:eq!, :lt!, :gt!, :ne!, :le!, :ge!, :add!, :sub!, :mul!, 
                     :div!, :colon!, :semicolon!, :comma!, :lp!, :rp!, :concat!, 
                     :percent!, :power!, :bang!, :digit!, :int_const!, :num_const!, 
                     :str_const!, :ref_2_d!, :true_const!, :false_const!, 
-                    :name!, :quotename!, :func_if!, :func_choose!].freeze
+                    :quotename!, :func_if!, :func_choose!, :alpha!, :name!, 
+                    :ws!].freeze
 
     
     def initialize(input=nil, options = {})
@@ -117,7 +118,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 329:5: '='
+      # at line 340:5: '='
       match(?=)
 
       
@@ -141,7 +142,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 330:5: '<'
+      # at line 341:5: '<'
       match(?<)
 
       
@@ -165,7 +166,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 331:5: '>'
+      # at line 342:5: '>'
       match(?>)
 
       
@@ -189,7 +190,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 332:5: '<>'
+      # at line 343:5: '<>'
       match("<>")
 
       
@@ -213,7 +214,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 333:5: '<='
+      # at line 344:5: '<='
       match("<=")
 
       
@@ -237,7 +238,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 334:5: '>='
+      # at line 345:5: '>='
       match(">=")
 
       
@@ -261,7 +262,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 336:6: '+'
+      # at line 347:6: '+'
       match(?+)
 
       
@@ -285,7 +286,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 337:6: '-'
+      # at line 348:6: '-'
       match(?-)
 
       
@@ -309,7 +310,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 338:6: '*'
+      # at line 349:6: '*'
       match(?*)
 
       
@@ -333,7 +334,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 339:6: '/'
+      # at line 350:6: '/'
       match(?/)
 
       
@@ -357,7 +358,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 341:8: ':'
+      # at line 352:8: ':'
       match(?:)
 
       
@@ -381,7 +382,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 342:12: ';'
+      # at line 353:12: ';'
       match(?;)
 
       
@@ -405,7 +406,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 343:8: ','
+      # at line 354:8: ','
       match(?,)
 
       
@@ -429,7 +430,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 345:5: '('
+      # at line 356:5: '('
       match(?()
 
       
@@ -453,7 +454,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 346:5: ')'
+      # at line 357:5: ')'
       match(?))
 
       
@@ -477,7 +478,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 347:9: '&'
+      # at line 358:9: '&'
       match(?&)
 
       
@@ -501,8 +502,8 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 348:10: '%'
-      match(?%)
+      # at line 359:10: '\\%'
+      match(?\%)
 
       
       @state.type = type
@@ -525,7 +526,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 349:8: '^'
+      # at line 360:8: '^'
       match(?^)
 
       
@@ -549,7 +550,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 350:7: '!'
+      # at line 361:7: '!'
       match(?!)
 
       
@@ -570,7 +571,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 352:17: '0' .. '9'
+      # at line 363:17: '0' .. '9'
       match_range(?0, ?9)
 
     ensure
@@ -590,8 +591,8 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 354:12: ( DIGIT )+
-      # at file 354:12: ( DIGIT )+
+      # at line 365:12: ( DIGIT )+
+      # at file 365:12: ( DIGIT )+
       match_count_1 = 0
       loop do
         alt_1 = 2
@@ -603,7 +604,7 @@ module ExcelFormula
         end
         case alt_1
         when 1
-          # at line 354:12: DIGIT
+          # at line 365:12: DIGIT
           digit!
 
         else
@@ -638,8 +639,8 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 355:12: ( DIGIT )* '.' ( DIGIT )+ ( ( 'E' | 'e' ) ( '+' | '-' )? ( DIGIT )+ )?
-      # at line 355:12: ( DIGIT )*
+      # at line 366:12: ( DIGIT )* '.' ( DIGIT )+ ( ( 'E' | 'e' ) ( '+' | '-' )? ( DIGIT )+ )?
+      # at line 366:12: ( DIGIT )*
       loop do # decision 2
         alt_2 = 2
         look_2_0 = @input.peek(1)
@@ -650,7 +651,7 @@ module ExcelFormula
         end
         case alt_2
         when 1
-          # at line 355:12: DIGIT
+          # at line 366:12: DIGIT
           digit!
 
         else
@@ -658,7 +659,7 @@ module ExcelFormula
         end
       end # loop for decision 2
       match(?.)
-      # at file 355:23: ( DIGIT )+
+      # at file 366:23: ( DIGIT )+
       match_count_3 = 0
       loop do
         alt_3 = 2
@@ -670,7 +671,7 @@ module ExcelFormula
         end
         case alt_3
         when 1
-          # at line 355:23: DIGIT
+          # at line 366:23: DIGIT
           digit!
 
         else
@@ -683,7 +684,7 @@ module ExcelFormula
         match_count_3 += 1
       end
 
-      # at line 355:30: ( ( 'E' | 'e' ) ( '+' | '-' )? ( DIGIT )+ )?
+      # at line 366:30: ( ( 'E' | 'e' ) ( '+' | '-' )? ( DIGIT )+ )?
       alt_6 = 2
       look_6_0 = @input.peek(1)
 
@@ -692,7 +693,7 @@ module ExcelFormula
       end
       case alt_6
       when 1
-        # at line 355:31: ( 'E' | 'e' ) ( '+' | '-' )? ( DIGIT )+
+        # at line 366:31: ( 'E' | 'e' ) ( '+' | '-' )? ( DIGIT )+
         if @input.peek(1) == ?E || @input.peek(1) == ?e
           @input.consume
         else
@@ -702,7 +703,7 @@ module ExcelFormula
         end
 
 
-        # at line 355:41: ( '+' | '-' )?
+        # at line 366:41: ( '+' | '-' )?
         alt_4 = 2
         look_4_0 = @input.peek(1)
 
@@ -723,7 +724,7 @@ module ExcelFormula
 
 
         end
-        # at file 355:52: ( DIGIT )+
+        # at file 366:52: ( DIGIT )+
         match_count_5 = 0
         loop do
           alt_5 = 2
@@ -735,7 +736,7 @@ module ExcelFormula
           end
           case alt_5
           when 1
-            # at line 355:52: DIGIT
+            # at line 366:52: DIGIT
             digit!
 
           else
@@ -772,9 +773,9 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 356:12: '\"' (~ '\"' )+ '\"'
+      # at line 367:12: '\"' (~ '\"' )+ '\"'
       match(?")
-      # at file 356:16: (~ '\"' )+
+      # at file 367:16: (~ '\"' )+
       match_count_7 = 0
       loop do
         alt_7 = 2
@@ -786,7 +787,7 @@ module ExcelFormula
         end
         case alt_7
         when 1
-          # at line 356:17: ~ '\"'
+          # at line 367:17: ~ '\"'
           if @input.peek(1).between?(0x0000, ?!) || @input.peek(1).between?(?#, 0x00FF)
             @input.consume
           else
@@ -830,8 +831,8 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 357:8: ( '$' )? ( 'A' .. 'I' )? ( 'A' .. 'Z' ) ( '$' )? ( DIGIT )+
-      # at line 357:8: ( '$' )?
+      # at line 368:8: ( '$' )? ( 'A' .. 'I' )? ( 'A' .. 'Z' ) ( '$' )? ( DIGIT )+
+      # at line 368:8: ( '$' )?
       alt_8 = 2
       look_8_0 = @input.peek(1)
 
@@ -840,11 +841,11 @@ module ExcelFormula
       end
       case alt_8
       when 1
-        # at line 357:8: '$'
+        # at line 368:8: '$'
         match(?$)
 
       end
-      # at line 357:13: ( 'A' .. 'I' )?
+      # at line 368:13: ( 'A' .. 'I' )?
       alt_9 = 2
       look_9_0 = @input.peek(1)
 
@@ -857,15 +858,15 @@ module ExcelFormula
       end
       case alt_9
       when 1
-        # at line 357:14: 'A' .. 'I'
+        # at line 368:14: 'A' .. 'I'
         match_range(?A, ?I)
 
       end
-      # at line 357:25: ( 'A' .. 'Z' )
-      # at line 357:26: 'A' .. 'Z'
+      # at line 368:25: ( 'A' .. 'Z' )
+      # at line 368:26: 'A' .. 'Z'
       match_range(?A, ?Z)
 
-      # at line 357:36: ( '$' )?
+      # at line 368:36: ( '$' )?
       alt_10 = 2
       look_10_0 = @input.peek(1)
 
@@ -874,11 +875,11 @@ module ExcelFormula
       end
       case alt_10
       when 1
-        # at line 357:36: '$'
+        # at line 368:36: '$'
         match(?$)
 
       end
-      # at file 357:41: ( DIGIT )+
+      # at file 368:41: ( DIGIT )+
       match_count_11 = 0
       loop do
         alt_11 = 2
@@ -890,7 +891,7 @@ module ExcelFormula
         end
         case alt_11
         when 1
-          # at line 357:41: DIGIT
+          # at line 368:41: DIGIT
           digit!
 
         else
@@ -925,7 +926,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 358:13: ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' )
+      # at line 369:13: ( 'T' | 't' ) ( 'R' | 'r' ) ( 'U' | 'u' ) ( 'E' | 'e' )
       if @input.peek(1) == ?T || @input.peek(1) == ?t
         @input.consume
       else
@@ -984,7 +985,7 @@ module ExcelFormula
 
       
       # - - - - main rule block - - - -
-      # at line 359:14: ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' )
+      # at line 370:14: ( 'F' | 'f' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'S' | 's' ) ( 'E' | 'e' )
       if @input.peek(1) == ?F || @input.peek(1) == ?f
         @input.consume
       else
@@ -1041,19 +1042,19 @@ module ExcelFormula
 
     end
 
-    # lexer rule name! (NAME)
+    # lexer rule quotename! (QUOTENAME)
     # (in ExcelFormula.g)
-    def name!
+    def quotename!
       # -> uncomment the next line to manually enable rule tracing
       # trace_in(__method__, 27)
 
-      type = NAME
+      type = QUOTENAME
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 360:7: '\\w[\\.\\w]*'
-      match("w[.w]*")
+      # at line 371:12: '\\'(?:[^\\']|\\'\\')*\\''
+      match("'(?:[^']|'')*'")
 
       
       @state.type = type
@@ -1065,19 +1066,19 @@ module ExcelFormula
 
     end
 
-    # lexer rule quotename! (QUOTENAME)
+    # lexer rule func_if! (FUNC_IF)
     # (in ExcelFormula.g)
-    def quotename!
+    def func_if!
       # -> uncomment the next line to manually enable rule tracing
       # trace_in(__method__, 28)
 
-      type = QUOTENAME
+      type = FUNC_IF
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 361:12: '\\'(?:[^\\']|\\'\\')*\\''
-      match("'(?:[^']|'')*'")
+      # at line 372:10: 'IF'
+      match("IF")
 
       
       @state.type = type
@@ -1089,19 +1090,19 @@ module ExcelFormula
 
     end
 
-    # lexer rule func_if! (FUNC_IF)
+    # lexer rule func_choose! (FUNC_CHOOSE)
     # (in ExcelFormula.g)
-    def func_if!
+    def func_choose!
       # -> uncomment the next line to manually enable rule tracing
       # trace_in(__method__, 29)
 
-      type = FUNC_IF
+      type = FUNC_CHOOSE
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 362:10: 'IF'
-      match("IF")
+      # at line 373:14: 'CHOOSE'
+      match("CHOOSE")
 
       
       @state.type = type
@@ -1113,19 +1114,68 @@ module ExcelFormula
 
     end
 
-    # lexer rule func_choose! (FUNC_CHOOSE)
+    # lexer rule alpha! (ALPHA)
     # (in ExcelFormula.g)
-    def func_choose!
+    def alpha!
       # -> uncomment the next line to manually enable rule tracing
       # trace_in(__method__, 30)
 
-      type = FUNC_CHOOSE
+      
+      # - - - - main rule block - - - -
+      # at line 
+      if @input.peek(1).between?(?A, ?Z) || @input.peek(1).between?(?a, ?z)
+        @input.consume
+      else
+        mse = MismatchedSet(nil)
+        recover(mse)
+        raise mse
+      end
+
+
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out(__method__, 30)
+
+    end
+
+    # lexer rule name! (NAME)
+    # (in ExcelFormula.g)
+    def name!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in(__method__, 31)
+
+      type = NAME
       channel = ANTLR3::DEFAULT_CHANNEL
 
       
       # - - - - main rule block - - - -
-      # at line 363:14: 'CHOOSE'
-      match("CHOOSE")
+      # at line 376:7: ( ALPHA )+
+      # at file 376:7: ( ALPHA )+
+      match_count_12 = 0
+      loop do
+        alt_12 = 2
+        look_12_0 = @input.peek(1)
+
+        if (look_12_0.between?(?A, ?Z) || look_12_0.between?(?a, ?z)) 
+          alt_12 = 1
+
+        end
+        case alt_12
+        when 1
+          # at line 376:7: ALPHA
+          alpha!
+
+        else
+          match_count_12 > 0 and break
+          eee = EarlyExit(12)
+
+
+          raise eee
+        end
+        match_count_12 += 1
+      end
+
 
       
       @state.type = type
@@ -1133,7 +1183,58 @@ module ExcelFormula
 
     ensure
       # -> uncomment the next line to manually enable rule tracing
-      # trace_out(__method__, 30)
+      # trace_out(__method__, 31)
+
+    end
+
+    # lexer rule ws! (WS)
+    # (in ExcelFormula.g)
+    def ws!
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_in(__method__, 32)
+
+      type = WS
+      channel = ANTLR3::DEFAULT_CHANNEL
+
+      
+      # - - - - main rule block - - - -
+      # at line 378:5: ( ' ' )+
+      # at file 378:5: ( ' ' )+
+      match_count_13 = 0
+      loop do
+        alt_13 = 2
+        look_13_0 = @input.peek(1)
+
+        if (look_13_0 == ?\s) 
+          alt_13 = 1
+
+        end
+        case alt_13
+        when 1
+          # at line 378:6: ' '
+          match(?\s)
+
+        else
+          match_count_13 > 0 and break
+          eee = EarlyExit(13)
+
+
+          raise eee
+        end
+        match_count_13 += 1
+      end
+
+      # --> action
+      skip()
+      # <-- action
+
+      
+      @state.type = type
+      @state.channel = channel
+
+    ensure
+      # -> uncomment the next line to manually enable rule tracing
+      # trace_out(__method__, 32)
 
     end
 
@@ -1145,10 +1246,10 @@ module ExcelFormula
     # but instead use the next_token method, which will
     # build and emit the actual next token
     def token!
-      # at line 1:8: ( EQ | LT | GT | NE | LE | GE | ADD | SUB | MUL | DIV | COLON | SEMICOLON | COMMA | LP | RP | CONCAT | PERCENT | POWER | BANG | INT_CONST | NUM_CONST | STR_CONST | REF2D | TRUE_CONST | FALSE_CONST | NAME | QUOTENAME | FUNC_IF | FUNC_CHOOSE )
-      alt_12 = 29
-      alt_12 = @dfa12.predict(@input)
-      case alt_12
+      # at line 1:8: ( EQ | LT | GT | NE | LE | GE | ADD | SUB | MUL | DIV | COLON | SEMICOLON | COMMA | LP | RP | CONCAT | PERCENT | POWER | BANG | INT_CONST | NUM_CONST | STR_CONST | REF2D | TRUE_CONST | FALSE_CONST | QUOTENAME | FUNC_IF | FUNC_CHOOSE | NAME | WS )
+      alt_14 = 30
+      alt_14 = @dfa14.predict(@input)
+      case alt_14
       when 1
         # at line 1:10: EQ
         eq!
@@ -1250,50 +1351,60 @@ module ExcelFormula
         false_const!
 
       when 26
-        # at line 1:157: NAME
-        name!
+        # at line 1:157: QUOTENAME
+        quotename!
 
       when 27
-        # at line 1:162: QUOTENAME
-        quotename!
+        # at line 1:167: FUNC_IF
+        func_if!
 
       when 28
-        # at line 1:172: FUNC_IF
-        func_if!
+        # at line 1:175: FUNC_CHOOSE
+        func_choose!
 
       when 29
-        # at line 1:180: FUNC_CHOOSE
-        func_choose!
+        # at line 1:187: NAME
+        name!
+
+      when 30
+        # at line 1:192: WS
+        ws!
 
       end
     end
 
     
     # - - - - - - - - - - DFA definitions - - - - - - - - - - -
-    class DFA12 < ANTLR3::DFA
-      EOT = unpack(2, -1, 1, 31, 1, 33, 13, -1, 1, 34, 18, -1, 1, 38, 3, 
-                   -1)
-      EOF = unpack(40, -1)
-      MIN = unpack(1, 0, 1, -1, 2, 61, 13, -1, 1, 46, 3, -1, 2, 36, 1, -1, 
-                   1, 36, 3, -1, 1, 36, 6, -1, 3, 36, 2, -1)
-      MAX = unpack(1, 116, 1, -1, 1, 62, 1, 61, 13, -1, 1, 57, 3, -1, 1, 
-                   97, 1, 114, 1, -1, 1, 90, 3, -1, 1, 90, 6, -1, 1, 108, 
-                   1, 57, 1, 79, 2, -1)
+    class DFA14 < ANTLR3::DFA
+      EOT = unpack(2, -1, 1, 34, 1, 36, 13, -1, 1, 37, 3, -1, 6, 30, 1, 
+                   -1, 2, 30, 8, -1, 3, 30, 1, 45, 3, 30, 1, -1, 2, 30, 
+                   1, 51, 1, 30, 1, 53, 1, -1, 1, 30, 1, -1, 1, 55, 1, -1)
+      EOF = unpack(56, -1)
+      MIN = unpack(1, 32, 1, -1, 2, 61, 13, -1, 1, 46, 3, -1, 3, 36, 1, 
+                   82, 1, 36, 1, 65, 1, -1, 2, 36, 8, -1, 1, 36, 1, 76, 
+                   1, 85, 2, 36, 1, 83, 1, 69, 1, -1, 1, 79, 1, 69, 1, 65, 
+                   1, 83, 1, 65, 1, -1, 1, 69, 1, -1, 1, 65, 1, -1)
+      MAX = unpack(1, 122, 1, -1, 1, 62, 1, 61, 13, -1, 1, 57, 3, -1, 1, 
+                   97, 1, 114, 1, 57, 1, 114, 1, 90, 1, 97, 1, -1, 2, 90, 
+                   8, -1, 2, 108, 1, 117, 1, 122, 1, 79, 1, 115, 1, 101, 
+                   1, -1, 1, 79, 1, 101, 1, 122, 1, 83, 1, 122, 1, -1, 1, 
+                   69, 1, -1, 1, 122, 1, -1)
       ACCEPT = unpack(1, -1, 1, 1, 2, -1, 1, 7, 1, 8, 1, 9, 1, 10, 1, 11, 
                       1, 12, 1, 13, 1, 14, 1, 15, 1, 16, 1, 17, 1, 18, 1, 
-                      19, 1, -1, 1, 21, 1, 22, 1, 23, 2, -1, 1, 24, 1, -1, 
-                      1, 25, 1, 26, 1, 27, 1, -1, 1, 4, 1, 5, 1, 2, 1, 6, 
-                      1, 3, 1, 20, 3, -1, 1, 28, 1, 29)
-      SPECIAL = unpack(40, -1)
+                      19, 1, -1, 1, 21, 1, 22, 1, 23, 6, -1, 1, 26, 2, -1, 
+                      1, 29, 1, 30, 1, 4, 1, 5, 1, 2, 1, 6, 1, 3, 1, 20, 
+                      7, -1, 1, 27, 5, -1, 1, 24, 1, -1, 1, 25, 1, -1, 1, 
+                      28)
+      SPECIAL = unpack(56, -1)
       TRANSITION = [
-        unpack(1, 26, 32, -1, 1, 16, 1, 19, 1, -1, 1, 20, 1, 14, 1, 13, 
-               1, 27, 1, 11, 1, 12, 1, 6, 1, 4, 1, 10, 1, 5, 1, 18, 1, 7, 
-               10, 17, 1, 8, 1, 9, 1, 2, 1, 1, 1, 3, 2, -1, 2, 20, 1, 28, 
-               2, 20, 1, 21, 2, 20, 1, 24, 10, 20, 1, 22, 6, 20, 3, -1, 
-               1, 15, 7, -1, 1, 25, 13, -1, 1, 23),
+        unpack(1, 31, 1, 16, 1, 19, 1, -1, 1, 20, 1, 14, 1, 13, 1, 27, 1, 
+               11, 1, 12, 1, 6, 1, 4, 1, 10, 1, 5, 1, 18, 1, 7, 10, 17, 
+               1, 8, 1, 9, 1, 2, 1, 1, 1, 3, 2, -1, 2, 29, 1, 28, 2, 29, 
+               1, 21, 2, 29, 1, 25, 10, 23, 1, 22, 6, 23, 3, -1, 1, 15, 
+               2, -1, 5, 30, 1, 26, 13, 30, 1, 24, 6, 30),
         unpack(),
-        unpack(1, 30, 1, 29),
-        unpack(1, 32),
+        unpack(1, 33, 1, 32),
+        unpack(1, 35),
         unpack(),
         unpack(),
         unpack(),
@@ -1311,24 +1422,40 @@ module ExcelFormula
         unpack(),
         unpack(),
         unpack(),
-        unpack(1, 20, 11, -1, 10, 20, 7, -1, 1, 35, 25, 20, 6, -1, 1, 25),
-        unpack(1, 20, 11, -1, 10, 20, 24, -1, 1, 23, 31, -1, 1, 23),
+        unpack(1, 20, 11, -1, 10, 20, 7, -1, 1, 38, 25, 23, 6, -1, 1, 39),
+        unpack(1, 20, 11, -1, 10, 20, 24, -1, 1, 40, 31, -1, 1, 40),
+        unpack(1, 20, 11, -1, 10, 20),
+        unpack(1, 40, 31, -1, 1, 40),
+        unpack(1, 20, 11, -1, 10, 20, 7, -1, 5, 23, 1, 41, 20, 23),
+        unpack(1, 39, 31, -1, 1, 39),
         unpack(),
-        unpack(1, 20, 11, -1, 10, 20, 7, -1, 5, 20, 1, 36, 20, 20),
+        unpack(1, 20, 11, -1, 10, 20, 7, -1, 7, 23, 1, 42, 18, 23),
+        unpack(1, 20, 11, -1, 10, 20, 7, -1, 26, 23),
         unpack(),
         unpack(),
         unpack(),
-        unpack(1, 20, 11, -1, 10, 20, 7, -1, 7, 20, 1, 37, 18, 20),
         unpack(),
         unpack(),
         unpack(),
         unpack(),
         unpack(),
+        unpack(1, 20, 11, -1, 10, 20, 18, -1, 1, 43, 31, -1, 1, 43),
+        unpack(1, 43, 31, -1, 1, 43),
+        unpack(1, 44, 31, -1, 1, 44),
+        unpack(1, 20, 11, -1, 10, 20, 7, -1, 26, 30, 6, -1, 26, 30),
+        unpack(1, 20, 11, -1, 10, 20, 21, -1, 1, 46),
+        unpack(1, 47, 31, -1, 1, 47),
+        unpack(1, 48, 31, -1, 1, 48),
         unpack(),
-        unpack(1, 20, 11, -1, 10, 20, 18, -1, 1, 25, 31, -1, 1, 25),
-        unpack(1, 20, 11, -1, 10, 20),
-        unpack(1, 20, 11, -1, 10, 20, 21, -1, 1, 39),
+        unpack(1, 49),
+        unpack(1, 50, 31, -1, 1, 50),
+        unpack(26, 30, 6, -1, 26, 30),
+        unpack(1, 52),
+        unpack(26, 30, 6, -1, 26, 30),
+        unpack(),
+        unpack(1, 54),
         unpack(),
+        unpack(26, 30, 6, -1, 26, 30),
         unpack()
       ].freeze
       
@@ -1338,12 +1465,12 @@ module ExcelFormula
         end
       end
       
-      @decision = 12
+      @decision = 14
       
 
       def description
         <<-'__dfa_description__'.strip!
-          1:1: Tokens : ( EQ | LT | GT | NE | LE | GE | ADD | SUB | MUL | DIV | COLON | SEMICOLON | COMMA | LP | RP | CONCAT | PERCENT | POWER | BANG | INT_CONST | NUM_CONST | STR_CONST | REF2D | TRUE_CONST | FALSE_CONST | NAME | QUOTENAME | FUNC_IF | FUNC_CHOOSE );
+          1:1: Tokens : ( EQ | LT | GT | NE | LE | GE | ADD | SUB | MUL | DIV | COLON | SEMICOLON | COMMA | LP | RP | CONCAT | PERCENT | POWER | BANG | INT_CONST | NUM_CONST | STR_CONST | REF2D | TRUE_CONST | FALSE_CONST | QUOTENAME | FUNC_IF | FUNC_CHOOSE | NAME | WS );
         __dfa_description__
       end
     end
@@ -1353,7 +1480,7 @@ module ExcelFormula
     
     def initialize_dfas
       super rescue nil
-      @dfa12 = DFA12.new(self, 12)
+      @dfa14 = DFA14.new(self, 14)
 
     end
   end # class Lexer < ANTLR3::Lexer