writeexcel 0.1.0 → 0.3.0

data/lib/writeexcel/charts/stock.rb

@@ -0,0 +1,211 @@
+###############################################################################
+#
+# Stock - A writer class for Excel Stock charts.
+#
+# Used in conjunction with Spreadsheet::WriteExcel::Chart.
+#
+# See formatting note in Spreadsheet::WriteExcel::Chart.
+#
+# Copyright 2000-2010, John McNamara, jmcnamara@cpan.org
+#
+# original written in Perl by John McNamara
+# converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
+#
+
+require 'writeexcel'
+
+class Chart
+
+  # ==SYNOPSIS
+  #
+  # To create a simple Excel file with a Stock chart using WriteExcel:
+  #
+  #     #!/usr/bin/ruby -w
+  #
+  #     require 'writeexcel'
+  #
+  #     workbook  = Spreadsheet::WriteExcel.new('chart.xls')
+  #     worksheet = workbook.add_worksheet
+  #
+  #     chart     = workbook.add_chart(:type => Chart::Stock)
+  #
+  #     # Add a series for each Open-High-Low-Close.
+  #     chart.add_series(:categories => '=Sheet1!$A$2:$A$6', :values => '=Sheet1!$B$2:$B$6')
+  #     chart.add_series(:categories => '=Sheet1!$A$2:$A$6', :values => '=Sheet1!$C$2:$C$6')
+  #     chart.add_series(:categories => '=Sheet1!$A$2:$A$6', :values => '=Sheet1!$D$2:$D$6')
+  #     chart.add_series(:categories => '=Sheet1!$A$2:$A$6', :values => '=Sheet1!$E$2:$E$6')
+  #
+  #     # Add the worksheet data the chart refers to.
+  #     # ... See the full example below.
+  #
+  #     workbook.close
+  #
+  # ==DESCRIPTION
+  #
+  # This module implements Stock charts for WriteExcel. The chart object
+  # is created via the Workbook add_chart() method:
+  #
+  #     chart = workbook.add_chart(:type => Chart::Stock)
+  #
+  # Once the object is created it can be configured via the following methods
+  # that are common to all chart classes:
+  #
+  #     chart.add_series
+  #     chart.set_x_axis
+  #     chart.set_y_axis
+  #     chart.set_title
+  #
+  # These methods are explained in detail in Chart section of WriteExcel.
+  # Class specific methods or settings, if any, are explained below.
+  #
+  # ==Stock Chart Methods
+  #
+  # There aren't currently any stock chart specific methods.
+  # See the TODO section of Chart section in WriteExcel.
+  #
+  # The default Stock chart is an Open-High-Low-Close chart.
+  # A series must be added for each of these data sources.
+  #
+  # The default Stock chart is in black and white. User defined colours
+  # will be added at a later stage.
+  #
+  # ==EXAMPLE
+  #
+  # Here is a complete example that demonstrates most of the available features
+  # when creating a Stock chart.
+  #
+  #     #!/usr/bin/ruby -w
+  #
+  #     require 'writeexcel'
+  #
+  #     workbook    = Spreadsheet::WriteExcel.new('chart_stock_ex.xls')
+  #     worksheet   = workbook.add_worksheet
+  #     bold        = workbook.add_format(:bold => 1)
+  #     date_format = workbook.add_format(:num_format => 'dd/mm/yyyy')
+  #
+  #     # Add the worksheet data that the charts will refer to.
+  #     headings = [ 'Date', 'Open', 'High', 'Low', 'Close' ]
+  #     data = [
+  #         [ '2009-08-23', 110.75, 113.48, 109.05, 109.40 ],
+  #         [ '2009-08-24', 111.24, 111.60, 103.57, 104.87 ],
+  #         [ '2009-08-25', 104.96, 108.00, 103.88, 106.00 ],
+  #         [ '2009-08-26', 104.95, 107.95, 104.66, 107.91 ],
+  #         [ '2009-08-27', 108.10, 108.62, 105.69, 106.15 ]
+  #    ]
+  #
+  #     worksheet.write('A1', headings, bold)
+  #
+  #     row = 1
+  #     data.each do |d|
+  #         worksheet.write(row, 0, d[0], date_format)
+  #         worksheet.write(row, 1, d[1])
+  #         worksheet.write(row, 2, d[2])
+  #         worksheet.write(row, 3, d[3])
+  #         worksheet.write(row, 4, d[4])
+  #         row += 1
+  #     end
+  #
+  #     # Create a new chart object. In this case an embedded chart.
+  #     chart = workbook.add_chart(:type => Chart::Stock, ::embedded => 1)
+  #
+  #     # Add a series for each of the Open-High-Low-Close columns.
+  #     chart.add_series(
+  #       :categories => '=Sheet1!$A$2:$A$6',
+  #       :values     => '=Sheet1!$B$2:$B$6',
+  #       :name       => 'Open'
+  #    )
+  #
+  #     chart.add_series(
+  #       :categories => '=Sheet1!$A$2:$A$6',
+  #       :values     => '=Sheet1!$C$2:$C$6',
+  #       :name       => 'High'
+  #    )
+  #
+  #     chart.add_series(
+  #       :categories => '=Sheet1!$A$2:$A$6',
+  #       :values     => '=Sheet1!$D$2:$D$6',
+  #       :name       => 'Low'
+  #    )
+  #
+  #     chart.add_series(
+  #       :categories => '=Sheet1!$A$2:$A$6',
+  #       :values     => '=Sheet1!$E$2:$E$6',
+  #       :name       => 'Close'
+  #    )
+  #
+  #     # Add a chart title and some axis labels.
+  #     chart.set_title(:name => 'Open-High-Low-Close')
+  #     chart.set_x_axis(:name => 'Date')
+  #     chart.set_y_axis(:name => 'Share price')
+  #
+  #     # Insert the chart into the worksheet (with an offset).
+  #     worksheet.insert_chart('F2', chart, 25, 10)
+  #
+  #     workbook.close
+  #
+  class Stock < Chart
+    ###############################################################################
+    #
+    # new()
+    #
+    #
+    def initialize(*args)   # :nodoc:
+      super
+    end
+
+    ###############################################################################
+    #
+    # _store_chart_type()
+    #
+    # Implementation of the abstract method from the specific chart class.
+    #
+    # Write the LINE chart BIFF record. A stock chart uses the same LINE record
+    # as a line chart but with additional DROPBAR and CHARTLINE records to define
+    # the stock style.
+    #
+    def store_chart_type   # :nodoc:
+      record = 0x1018     # Record identifier.
+      length = 0x0002     # Number of bytes to follow.
+      grbit  = 0x0000     # Option flags.
+
+      header = [record, length].pack('vv')
+      data   = [grbit].pack('v')
+
+      append(header, data)
+    end
+
+    ###############################################################################
+    #
+    # _store_marker_dataformat_stream(). Overridden.
+    #
+    # This is an implementation of the parent abstract method to define
+    # properties of markers, linetypes, pie formats and other.
+    #
+    def store_marker_dataformat_stream   # :nodoc:
+      store_dropbar
+      store_begin
+      store_lineformat(0x00000000, 0x0000, 0xFFFF, 0x0001, 0x004F)
+      store_areaformat(0x00FFFFFF, 0x0000, 0x01, 0x01, 0x09, 0x08)
+      store_end
+
+      store_dropbar
+      store_begin
+      store_lineformat(0x00000000, 0x0000, 0xFFFF, 0x0001, 0x004F)
+      store_areaformat(0x0000, 0x00FFFFFF, 0x01, 0x01, 0x08, 0x09)
+      store_end
+
+      store_chartline
+      store_lineformat(0x00000000, 0x0000, 0xFFFF, 0x0000, 0x004F)
+
+
+      store_dataformat(0x0000, 0xFFFD, 0x0000)
+      store_begin
+      store_3dbarshape
+      store_lineformat(0x00000000, 0x0005, 0xFFFF, 0x0000, 0x004F)
+      store_areaformat(0x00000000, 0x0000, 0x00, 0x01, 0x4D, 0x4D)
+      store_pieformat
+      store_markerformat(0x00, 0x00, 0x00, 0x00, 0x4D, 0x4D, 0x3C)
+      store_end
+    end
+  end
+end

data/lib/writeexcel/excelformulaparser.rb

@@ -5,180 +5,183 @@
 #
 
 require 'racc/parser.rb'
-class ExcelFormulaParser < Racc::Parser
+class ExcelFormulaParser < Racc::Parser  # :nodoc:
 ##### State transition tables begin ###
 
 racc_action_table = [
-    16,    52,    25,    27,    29,    31,    33,    20,    19,     3,
-   nil,    53,    22,    18,   nil,     4,     5,     6,     8,    12,
-    13,    14,    15,    17,    16,    25,    27,    29,    31,    33,
-   nil,    10,   nil,   nil,   nil,    16,   nil,    18,   nil,     4,
-     5,     6,     8,    12,    13,    14,    15,    17,    18,    16,
-     4,     5,     6,     8,    12,    13,    14,    15,    17,   nil,
-    16,   nil,    18,   nil,     4,     5,     6,     8,    12,    13,
-    14,    15,    17,    18,    16,     4,     5,     6,     8,    12,
-    13,    14,    15,    17,   nil,    16,   nil,    18,   nil,     4,
-     5,     6,     8,    12,    13,    14,    15,    17,    18,    16,
-     4,     5,     6,     8,    12,    13,    14,    15,    17,   nil,
-    16,   nil,    18,    36,     4,     5,     6,     8,    12,    13,
-    14,    15,    17,    18,    16,     4,     5,     6,     8,    12,
-    13,    14,    15,    17,   nil,    16,   nil,    18,   nil,     4,
-     5,     6,     8,    12,    13,    14,    15,    17,    18,    16,
-     4,     5,     6,     8,    12,    13,    14,    15,    17,   nil,
-    16,   nil,    18,   nil,     4,     5,     6,     8,    12,    13,
-    14,    15,    17,    18,    16,     4,     5,     6,     8,    12,
-    13,    14,    15,    17,   nil,    16,   nil,    18,   nil,     4,
-     5,     6,     8,    12,    13,    14,    15,    17,    18,    16,
-     4,     5,     6,     8,    12,    13,    14,    15,    17,   nil,
-    16,   nil,    18,   nil,     4,     5,     6,     8,    12,    13,
-    14,    15,    17,    18,   nil,     4,     5,     6,     8,    12,
-    13,    14,    15,    17,    22,    23,    26,    28,    30,    32,
-   nil,   nil,   nil,   nil,   nil,    21,   nil,    25,    27,    29,
-    31,    33,   nil,    51,    22,    23,    26,    28,    30,    32,
-    22,    23,    26,    28,   nil,   nil,   nil,    25,    27,    29,
-    31,    33,   nil,    25,    27,    29,    31,    33,    22,    23,
-    26,    28,   nil,   nil,   nil,    22,    23,    26,    28,    30,
-    32,    25,    27,    29,    31,    33,    21,    24,    25,    27,
-    29,    31,    33,    22,    23,    26,    28,    30,    32,   nil,
-   nil,   nil,   nil,   nil,    21,   nil,    25,    27,    29,    31,
-    33,    22,    23,    26,    28,    30,    32,   nil,   nil,   nil,
-   nil,   nil,    21,   nil,    25,    27,    29,    31,    33,    22,
-    23,    26,    28,    30,    32,    22,   nil,   nil,   nil,   nil,
-    21,   nil,    25,    27,    29,    31,    33,   nil,    25,    27,
-    29,    31,    33,    22,    23,    26,    28,    30,    32,    22,
-    23,   nil,   nil,   nil,    21,   nil,    25,    27,    29,    31,
-    33,   nil,    25,    27,    29,    31,    33,    22,    23,    26,
-    28,    30,    32,    22,    23,   nil,   nil,   nil,    21,   nil,
-    25,    27,    29,    31,    33,   nil,    25,    27,    29,    31,
-    33,    22,    23,    26,    28,    30,    32,   nil,   nil,   nil,
-   nil,   nil,    21,   nil,    25,    27,    29,    31,    33,    22,
-    23,    26,    28,    30,    32,   nil,   nil,   nil,   nil,   nil,
-    21,   nil,    25,    27,    29,    31,    33 ]
+    16,    54,    26,    28,    30,    32,    34,    21,    20,     3,
+   nil,   nil,    53,    19,    23,     4,     5,     6,     7,    10,
+    13,    14,    15,    17,    18,    16,   nil,    26,    28,    30,
+    32,    34,     8,   nil,   nil,   nil,   nil,    16,    19,   nil,
+     4,     5,     6,     7,    10,    13,    14,    15,    17,    18,
+    19,    16,     4,     5,     6,     7,    10,    13,    14,    15,
+    17,    18,   nil,    16,    19,   nil,     4,     5,     6,     7,
+    10,    13,    14,    15,    17,    18,    19,    16,     4,     5,
+     6,     7,    10,    13,    14,    15,    17,    18,   nil,    16,
+    19,   nil,     4,     5,     6,     7,    10,    13,    14,    15,
+    17,    18,    19,    16,     4,     5,     6,     7,    10,    13,
+    14,    15,    17,    18,   nil,    16,    19,    37,     4,     5,
+     6,     7,    10,    13,    14,    15,    17,    18,    19,    16,
+     4,     5,     6,     7,    10,    13,    14,    15,    17,    18,
+   nil,    16,    19,   nil,     4,     5,     6,     7,    10,    13,
+    14,    15,    17,    18,    19,    16,     4,     5,     6,     7,
+    10,    13,    14,    15,    17,    18,   nil,    16,    19,   nil,
+     4,     5,     6,     7,    10,    13,    14,    15,    17,    18,
+    19,    16,     4,     5,     6,     7,    10,    13,    14,    15,
+    17,    18,   nil,    16,    19,   nil,     4,     5,     6,     7,
+    10,    13,    14,    15,    17,    18,    19,    16,     4,     5,
+     6,     7,    10,    13,    14,    15,    17,    18,   nil,    16,
+    19,   nil,     4,     5,     6,     7,    10,    13,    14,    15,
+    17,    18,    19,   nil,     4,     5,     6,     7,    10,    13,
+    14,    15,    17,    18,    23,    24,    27,    29,    31,    33,
+   nil,   nil,   nil,   nil,   nil,    22,   nil,    26,    28,    30,
+    32,    34,   nil,    52,    23,    24,    27,    29,    31,    33,
+    23,    24,    27,    29,   nil,   nil,   nil,    26,    28,    30,
+    32,    34,   nil,    26,    28,    30,    32,    34,    23,    24,
+    27,    29,   nil,   nil,   nil,    23,    24,    27,    29,    31,
+    33,    26,    28,    30,    32,    34,    22,    25,    26,    28,
+    30,    32,    34,    23,    24,    27,    29,    31,    33,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,    26,    28,    30,    32,
+    34,    23,    24,    27,    29,    31,    33,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    26,    28,    30,    32,    34,    23,
+    24,    27,    29,    31,    33,    23,   nil,   nil,   nil,   nil,
+    22,   nil,    26,    28,    30,    32,    34,   nil,    26,    28,
+    30,    32,    34,    23,    24,    27,    29,    31,    33,    23,
+    24,   nil,   nil,   nil,    22,   nil,    26,    28,    30,    32,
+    34,   nil,    26,    28,    30,    32,    34,    23,    24,    27,
+    29,    31,    33,    23,    24,   nil,   nil,   nil,    22,   nil,
+    26,    28,    30,    32,    34,   nil,    26,    28,    30,    32,
+    34,    23,    24,    27,    29,    31,    33,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    26,    28,    30,    32,    34,    23,
+    24,    27,    29,    31,    33,   nil,   nil,   nil,   nil,   nil,
+    22,   nil,    26,    28,    30,    32,    34 ]
 
 racc_action_check = [
-    33,    38,    34,    34,    34,    34,    34,     4,     3,     1,
-   nil,    38,    40,    33,   nil,    33,    33,    33,    33,    33,
-    33,    33,    33,    33,     2,    40,    40,    40,    40,    40,
-   nil,     2,   nil,   nil,   nil,    53,   nil,     2,   nil,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,    53,    32,
-    53,    53,    53,    53,    53,    53,    53,    53,    53,   nil,
-    31,   nil,    32,   nil,    32,    32,    32,    32,    32,    32,
-    32,    32,    32,    31,    16,    31,    31,    31,    31,    31,
-    31,    31,    31,    31,   nil,    18,   nil,    16,   nil,    16,
-    16,    16,    16,    16,    16,    16,    16,    16,    18,    20,
-    18,    18,    18,    18,    18,    18,    18,    18,    18,   nil,
-    21,   nil,    20,    20,    20,    20,    20,    20,    20,    20,
-    20,    20,    20,    21,    22,    21,    21,    21,    21,    21,
-    21,    21,    21,    21,   nil,    23,   nil,    22,   nil,    22,
-    22,    22,    22,    22,    22,    22,    22,    22,    23,    25,
-    23,    23,    23,    23,    23,    23,    23,    23,    23,   nil,
-    26,   nil,    25,   nil,    25,    25,    25,    25,    25,    25,
-    25,    25,    25,    26,    27,    26,    26,    26,    26,    26,
-    26,    26,    26,    26,   nil,    28,   nil,    27,   nil,    27,
-    27,    27,    27,    27,    27,    27,    27,    27,    28,    29,
-    28,    28,    28,    28,    28,    28,    28,    28,    28,   nil,
-    30,   nil,    29,   nil,    29,    29,    29,    29,    29,    29,
-    29,    29,    29,    30,   nil,    30,    30,    30,    30,    30,
-    30,    30,    30,    30,    35,    35,    35,    35,    35,    35,
-   nil,   nil,   nil,   nil,   nil,    35,   nil,    35,    35,    35,
-    35,    35,   nil,    35,    39,    39,    39,    39,    39,    39,
-    47,    47,    47,    47,   nil,   nil,   nil,    39,    39,    39,
-    39,    39,   nil,    47,    47,    47,    47,    47,    49,    49,
-    49,    49,   nil,   nil,   nil,     7,     7,     7,     7,     7,
-     7,    49,    49,    49,    49,    49,     7,     7,     7,     7,
-     7,     7,     7,    37,    37,    37,    37,    37,    37,   nil,
-   nil,   nil,   nil,   nil,    37,   nil,    37,    37,    37,    37,
-    37,    48,    48,    48,    48,    48,    48,   nil,   nil,   nil,
-   nil,   nil,    48,   nil,    48,    48,    48,    48,    48,    50,
-    50,    50,    50,    50,    50,    41,   nil,   nil,   nil,   nil,
-    50,   nil,    50,    50,    50,    50,    50,   nil,    41,    41,
-    41,    41,    41,    42,    42,    42,    42,    42,    42,    43,
-    43,   nil,   nil,   nil,    42,   nil,    42,    42,    42,    42,
-    42,   nil,    43,    43,    43,    43,    43,    44,    44,    44,
-    44,    44,    44,    45,    45,   nil,   nil,   nil,    44,   nil,
-    44,    44,    44,    44,    44,   nil,    45,    45,    45,    45,
-    45,    46,    46,    46,    46,    46,    46,   nil,   nil,   nil,
-   nil,   nil,    46,   nil,    46,    46,    46,    46,    46,    54,
-    54,    54,    54,    54,    54,   nil,   nil,   nil,   nil,   nil,
-    54,   nil,    54,    54,    54,    54,    54 ]
+    34,    39,    35,    35,    35,    35,    35,     4,     3,     1,
+   nil,   nil,    39,    34,    41,    34,    34,    34,    34,    34,
+    34,    34,    34,    34,    34,     2,   nil,    41,    41,    41,
+    41,    41,     2,   nil,   nil,   nil,   nil,    53,     2,   nil,
+     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+    53,    33,    53,    53,    53,    53,    53,    53,    53,    53,
+    53,    53,   nil,    32,    33,   nil,    33,    33,    33,    33,
+    33,    33,    33,    33,    33,    33,    32,    16,    32,    32,
+    32,    32,    32,    32,    32,    32,    32,    32,   nil,    19,
+    16,   nil,    16,    16,    16,    16,    16,    16,    16,    16,
+    16,    16,    19,    21,    19,    19,    19,    19,    19,    19,
+    19,    19,    19,    19,   nil,    22,    21,    21,    21,    21,
+    21,    21,    21,    21,    21,    21,    21,    21,    22,    23,
+    22,    22,    22,    22,    22,    22,    22,    22,    22,    22,
+   nil,    24,    23,   nil,    23,    23,    23,    23,    23,    23,
+    23,    23,    23,    23,    24,    26,    24,    24,    24,    24,
+    24,    24,    24,    24,    24,    24,   nil,    27,    26,   nil,
+    26,    26,    26,    26,    26,    26,    26,    26,    26,    26,
+    27,    28,    27,    27,    27,    27,    27,    27,    27,    27,
+    27,    27,   nil,    29,    28,   nil,    28,    28,    28,    28,
+    28,    28,    28,    28,    28,    28,    29,    30,    29,    29,
+    29,    29,    29,    29,    29,    29,    29,    29,   nil,    31,
+    30,   nil,    30,    30,    30,    30,    30,    30,    30,    30,
+    30,    30,    31,   nil,    31,    31,    31,    31,    31,    31,
+    31,    31,    31,    31,    36,    36,    36,    36,    36,    36,
+   nil,   nil,   nil,   nil,   nil,    36,   nil,    36,    36,    36,
+    36,    36,   nil,    36,    40,    40,    40,    40,    40,    40,
+    48,    48,    48,    48,   nil,   nil,   nil,    40,    40,    40,
+    40,    40,   nil,    48,    48,    48,    48,    48,    50,    50,
+    50,    50,   nil,   nil,   nil,     9,     9,     9,     9,     9,
+     9,    50,    50,    50,    50,    50,     9,     9,     9,     9,
+     9,     9,     9,    38,    38,    38,    38,    38,    38,   nil,
+   nil,   nil,   nil,   nil,    38,   nil,    38,    38,    38,    38,
+    38,    49,    49,    49,    49,    49,    49,   nil,   nil,   nil,
+   nil,   nil,    49,   nil,    49,    49,    49,    49,    49,    51,
+    51,    51,    51,    51,    51,    42,   nil,   nil,   nil,   nil,
+    51,   nil,    51,    51,    51,    51,    51,   nil,    42,    42,
+    42,    42,    42,    43,    43,    43,    43,    43,    43,    44,
+    44,   nil,   nil,   nil,    43,   nil,    43,    43,    43,    43,
+    43,   nil,    44,    44,    44,    44,    44,    45,    45,    45,
+    45,    45,    45,    46,    46,   nil,   nil,   nil,    45,   nil,
+    45,    45,    45,    45,    45,   nil,    46,    46,    46,    46,
+    46,    47,    47,    47,    47,    47,    47,   nil,   nil,   nil,
+   nil,   nil,    47,   nil,    47,    47,    47,    47,    47,    55,
+    55,    55,    55,    55,    55,   nil,   nil,   nil,   nil,   nil,
+    55,   nil,    55,    55,    55,    55,    55 ]
 
 racc_action_pointer = [
-   nil,     9,    16,     8,   -14,   nil,   nil,   282,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    66,   nil,    77,   nil,
-    91,   102,   116,   127,   nil,   141,   152,   166,   177,   191,
-   202,    52,    41,    -8,   -14,   231,   nil,   300,   -21,   251,
-     9,   342,   360,   366,   384,   390,   408,   257,   318,   275,
-   336,   nil,   nil,    27,   426 ]
+   nil,     9,    17,     8,   -14,   nil,   nil,   nil,   nil,   292,
+   nil,   nil,   nil,   nil,   nil,   nil,    69,   nil,   nil,    81,
+   nil,    95,   107,   121,   133,   nil,   147,   159,   173,   185,
+   199,   211,    55,    43,    -8,   -14,   241,   nil,   310,   -21,
+   261,    11,   352,   370,   376,   394,   400,   418,   267,   328,
+   285,   346,   nil,    29,   nil,   436 ]
 
 racc_action_default = [
-    -2,   -34,    -1,   -34,   -20,   -21,   -22,   -34,   -23,   -17,
-    -4,   -29,   -24,   -25,   -26,   -27,   -34,   -28,   -34,    55,
-   -34,   -34,   -34,   -34,    -3,   -34,   -34,   -34,   -34,   -34,
-   -34,   -34,   -34,   -34,   -19,   -34,   -31,   -32,   -34,   -16,
-    -9,   -10,   -11,    -7,   -12,    -8,   -13,    -5,   -14,    -6,
-   -15,   -18,   -30,   -34,   -33 ]
+    -2,   -35,    -1,   -35,   -20,   -21,   -22,   -23,    -4,   -35,
+   -24,   -17,   -30,   -25,   -26,   -27,   -35,   -28,   -29,   -35,
+    56,   -35,   -35,   -35,   -35,    -3,   -35,   -35,   -35,   -35,
+   -35,   -35,   -35,   -35,   -35,   -19,   -35,   -32,   -33,   -35,
+   -16,    -9,   -10,   -11,    -7,   -12,    -8,   -13,    -5,   -14,
+    -6,   -15,   -18,   -35,   -31,   -34 ]
 
 racc_goto_table = [
-     7,     1,     2,    38,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    34,   nil,    35,   nil,    37,    39,
-    40,    41,   nil,    42,    43,    44,    45,    46,    47,    48,
-    49,    50,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     9,     1,     2,    39,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    35,   nil,   nil,    36,   nil,    38,
+    40,    41,    42,   nil,    43,    44,    45,    46,    47,    48,
+    49,    50,    51,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    54 ]
+   nil,    55 ]
 
 racc_goto_check = [
      3,     1,     2,     6,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     3,   nil,     3,   nil,     3,     3,
-     3,     3,   nil,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,     3,   nil,   nil,     3,   nil,     3,
+     3,     3,     3,   nil,     3,     3,     3,     3,     3,     3,
+     3,     3,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,     3 ]
 
 racc_goto_pointer = [
-   nil,     1,     2,    -2,   nil,   nil,   -17 ]
+   nil,     1,     2,    -2,   nil,   nil,   -18 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,     9,    11,   nil ]
+   nil,   nil,   nil,   nil,    11,    12,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 34, :_reduce_none,
-  0, 35, :_reduce_2,
-  3, 35, :_reduce_3,
-  2, 35, :_reduce_none,
-  3, 36, :_reduce_5,
-  3, 36, :_reduce_6,
-  3, 36, :_reduce_7,
-  3, 36, :_reduce_8,
-  3, 36, :_reduce_9,
-  3, 36, :_reduce_10,
-  3, 36, :_reduce_11,
-  3, 36, :_reduce_12,
-  3, 36, :_reduce_13,
-  3, 36, :_reduce_14,
-  3, 36, :_reduce_15,
-  3, 36, :_reduce_16,
-  1, 36, :_reduce_none,
-  3, 37, :_reduce_18,
-  2, 37, :_reduce_19,
+  1, 35, :_reduce_none,
+  0, 36, :_reduce_2,
+  3, 36, :_reduce_3,
+  2, 36, :_reduce_none,
+  3, 37, :_reduce_5,
+  3, 37, :_reduce_6,
+  3, 37, :_reduce_7,
+  3, 37, :_reduce_8,
+  3, 37, :_reduce_9,
+  3, 37, :_reduce_10,
+  3, 37, :_reduce_11,
+  3, 37, :_reduce_12,
+  3, 37, :_reduce_13,
+  3, 37, :_reduce_14,
+  3, 37, :_reduce_15,
+  3, 37, :_reduce_16,
   1, 37, :_reduce_none,
-  1, 37, :_reduce_21,
-  1, 37, :_reduce_22,
-  1, 37, :_reduce_23,
-  1, 37, :_reduce_24,
-  1, 37, :_reduce_25,
-  1, 37, :_reduce_26,
-  1, 37, :_reduce_27,
-  1, 37, :_reduce_28,
-  1, 37, :_reduce_none,
-  4, 38, :_reduce_30,
-  3, 38, :_reduce_31,
-  1, 39, :_reduce_32,
-  3, 39, :_reduce_33 ]
-
-racc_reduce_n = 34
-
-racc_shift_n = 55
+  3, 38, :_reduce_18,
+  2, 38, :_reduce_19,
+  1, 38, :_reduce_none,
+  1, 38, :_reduce_21,
+  1, 38, :_reduce_22,
+  1, 38, :_reduce_23,
+  1, 38, :_reduce_24,
+  1, 38, :_reduce_25,
+  1, 38, :_reduce_26,
+  1, 38, :_reduce_27,
+  1, 38, :_reduce_28,
+  1, 38, :_reduce_29,
+  1, 38, :_reduce_none,
+  4, 39, :_reduce_31,
+  3, 39, :_reduce_32,
+  1, 40, :_reduce_33,
+  3, 40, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 56
 
 racc_token_table = {
   false => 0,
@@ -211,11 +214,12 @@ racc_token_table = {
   :REF3D => 27,
   :RANGE2D => 28,
   :RANGE3D => 29,
-  :TRUE => 30,
-  :FALSE => 31,
-  "," => 32 }
+  :NAME => 30,
+  :TRUE => 31,
+  :FALSE => 32,
+  "," => 33 }
 
-racc_nt_base = 33
+racc_nt_base = 34
 
 racc_use_result_var = true
 
@@ -266,6 +270,7 @@ Racc_token_to_s_table = [
   "REF3D",
   "RANGE2D",
   "RANGE3D",
+  "NAME",
   "TRUE",
   "FALSE",
   "\",\"",
@@ -287,14 +292,14 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'excelformula.y', 20)
   def _reduce_2(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 21)
   def _reduce_3(val, _values, result)
-     result.push val[1], '_arg', '1' 
+     result.push val[1], '_arg', '1'
     result
   end
 .,.,
@@ -303,84 +308,84 @@ module_eval(<<'.,.,', 'excelformula.y', 21)
 
 module_eval(<<'.,.,', 'excelformula.y', 24)
   def _reduce_5(val, _values, result)
-     result = [ val[0], val[2], 'ptgAdd' ] 
+     result = [ val[0], val[2], 'ptgAdd' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 25)
   def _reduce_6(val, _values, result)
-     result = [ val[0], val[2], 'ptgSub' ] 
+     result = [ val[0], val[2], 'ptgSub' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 26)
   def _reduce_7(val, _values, result)
-     result = [ val[0], val[2], 'ptgMul' ] 
+     result = [ val[0], val[2], 'ptgMul' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 27)
   def _reduce_8(val, _values, result)
-     result = [ val[0], val[2], 'ptgDiv' ] 
+     result = [ val[0], val[2], 'ptgDiv' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 28)
   def _reduce_9(val, _values, result)
-     result = [ val[0], val[2], 'ptgPower' ] 
+     result = [ val[0], val[2], 'ptgPower' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 29)
   def _reduce_10(val, _values, result)
-     result = [ val[0], val[2], 'ptgConcat' ] 
+     result = [ val[0], val[2], 'ptgConcat' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 30)
   def _reduce_11(val, _values, result)
-     result = [ val[0], val[2], 'ptgLT' ] 
+     result = [ val[0], val[2], 'ptgLT' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 31)
   def _reduce_12(val, _values, result)
-     result = [ val[0], val[2], 'ptgGT' ] 
+     result = [ val[0], val[2], 'ptgGT' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 32)
   def _reduce_13(val, _values, result)
-     result = [ val[0], val[2], 'ptgLE' ] 
+     result = [ val[0], val[2], 'ptgLE' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 33)
   def _reduce_14(val, _values, result)
-     result = [ val[0], val[2], 'ptgGE' ] 
+     result = [ val[0], val[2], 'ptgGE' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 34)
   def _reduce_15(val, _values, result)
-     result = [ val[0], val[2], 'ptgNE' ] 
+     result = [ val[0], val[2], 'ptgNE' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 35)
   def _reduce_16(val, _values, result)
-     result = [ val[0], val[2], 'ptgEQ' ] 
+     result = [ val[0], val[2], 'ptgEQ' ]
     result
   end
 .,.,
@@ -389,14 +394,14 @@ module_eval(<<'.,.,', 'excelformula.y', 35)
 
 module_eval(<<'.,.,', 'excelformula.y', 38)
   def _reduce_18(val, _values, result)
-     result = [ val[1], '_arg', '1', 'ptgParen'] 
+     result = [ val[1], '_arg', '1', 'ptgParen']
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 39)
   def _reduce_19(val, _values, result)
-     result = [ '_num', '-1', val[1], 'ptgMul' ] 
+     result = [ '_num', '-1', val[1], 'ptgMul' ]
     result
   end
 .,.,
@@ -405,100 +410,108 @@ module_eval(<<'.,.,', 'excelformula.y', 39)
 
 module_eval(<<'.,.,', 'excelformula.y', 41)
   def _reduce_21(val, _values, result)
-     result = [ '_num',     val[0] ] 
+     result = [ '_num',     val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 42)
   def _reduce_22(val, _values, result)
-     result = [ '_str',     val[0] ] 
+     result = [ '_str',     val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 43)
   def _reduce_23(val, _values, result)
-     result = [ '_ref2d',   val[0] ] 
+     result = [ '_ref2d',   val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 44)
   def _reduce_24(val, _values, result)
-     result = [ '_ref3d',   val[0] ] 
+     result = [ '_ref3d',   val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 45)
   def _reduce_25(val, _values, result)
-     result = [ '_range2d', val[0] ] 
+     result = [ '_range2d', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 46)
   def _reduce_26(val, _values, result)
-     result = [ '_range3d', val[0] ] 
+     result = [ '_range3d', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 47)
   def _reduce_27(val, _values, result)
-     result = [ 'ptgBool',  '1'    ] 
+     result = [ '_name',    val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 48)
   def _reduce_28(val, _values, result)
-     result = [ 'ptgBool',  '0'    ] 
+     result = [ 'ptgBool',  '1'    ]
     result
   end
 .,.,
 
-# reduce 29 omitted
-
-module_eval(<<'.,.,', 'excelformula.y', 51)
-  def _reduce_30(val, _values, result)
-     result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ] 
+module_eval(<<'.,.,', 'excelformula.y', 49)
+  def _reduce_29(val, _values, result)
+     result = [ 'ptgBool',  '0'    ]
     result
   end
 .,.,
 
+# reduce 30 omitted
+
 module_eval(<<'.,.,', 'excelformula.y', 52)
   def _reduce_31(val, _values, result)
-     result = [ '_func', val[0] ] 
+     result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'excelformula.y', 54)
+module_eval(<<'.,.,', 'excelformula.y', 53)
   def _reduce_32(val, _values, result)
-     result = val 
+     result = [ '_func', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 55)
   def _reduce_33(val, _values, result)
-     result.push val[2] 
+     result = val
     result
   end
 .,.,
 
-def _reduce_none(val, _values, result)
-  val[0]
-end
+module_eval(<<'.,.,', 'excelformula.y', 56)
+  def _reduce_34(val, _values, result)
+     result.push val[2]
+    result
+  end
+.,.,
+
+  def _reduce_none(val, _values, result)
+    val[0]
+  end
 
 end   # class ExcelFormulaParser
 
 
-class ExcelFormulaParserError < StandardError; end
+class ExcelFormulaParserError < StandardError #:nodoc:
+end
 
-class Node
+class Node  # :nodoc:
 
    def exec_list(nodes)
       v = nil
@@ -513,7 +526,7 @@ class Node
 
 end
 
-class RootNode < Node
+class RootNode < Node  # :nodoc:
 
    def initialize(tree)
       @tree = tree
@@ -526,7 +539,7 @@ class RootNode < Node
 end
 
 
-class FuncallNode < Node
+class FuncallNode < Node  # :nodoc:
 
    def initialize(func, args)
       @func = func
@@ -543,7 +556,7 @@ class FuncallNode < Node
 
 end
 
-class NumberNode < Node
+class NumberNode < Node  # :nodoc:
 
    def initialize(val)
       @val = val
@@ -555,7 +568,7 @@ class NumberNode < Node
 
 end
 
-class OperateNode < Node
+class OperateNode < Node  # :nodoc:
 
    def initialize(op, left, right)
       @op = op