writeexcel 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/writeexcel/excelformula.y

@@ -1,139 +1,139 @@
-#
-# copyright (c) 2009, 2010  Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
-
-
-class ExcelFormulaParser
-
-prechigh
-  nonassoc UMINUS
-  right    '^'
-  left     '&'
-  left     '*' '/'
-  left     '+' '-'
-  left     '<' '>' '<=' '>=' '<>'
-  left     '='
-preclow
-
-rule
-
-  formula      : expr_list
-
-  expr_list    :                      { result = [] }
-               | expr_list expr EOL   { result.push val[1], '_arg', '1' }
-               | expr_list EOL
-
-  expr         : expr '+' expr        { result = [ val[0], val[2], 'ptgAdd' ] }
-               | expr '-' expr        { result = [ val[0], val[2], 'ptgSub' ] }
-               | expr '*' expr        { result = [ val[0], val[2], 'ptgMul' ] }
-               | expr '/' expr        { result = [ val[0], val[2], 'ptgDiv' ] }
-               | expr '^' expr        { result = [ val[0], val[2], 'ptgPower' ] }
-               | expr '&' expr        { result = [ val[0], val[2], 'ptgConcat' ] }
-               | expr LT  expr        { result = [ val[0], val[2], 'ptgLT' ] }
-               | expr GT  expr        { result = [ val[0], val[2], 'ptgGT' ] }
-               | expr LE  expr        { result = [ val[0], val[2], 'ptgLE' ] }
-               | expr GE  expr        { result = [ val[0], val[2], 'ptgGE' ] }
-               | expr NE  expr        { result = [ val[0], val[2], 'ptgNE' ] }
-               | expr '=' expr        { result = [ val[0], val[2], 'ptgEQ' ] }
-               | primary
-
-  primary      : '(' expr ')'         { result = [ val[1], '_arg', '1', 'ptgParen'] }
-               | '-' expr  = UMINUS   { result = [ '_num', '-1', val[1], 'ptgMul' ] }
-               | FUNC
-               | NUMBER               { result = [ '_num',     val[0] ] }
-               | STRING               { result = [ '_str',     val[0] ] }
-               | REF2D                { result = [ '_ref2d',   val[0] ] }
-               | REF3D                { result = [ '_ref3d',   val[0] ] }
-               | RANGE2D              { result = [ '_range2d', val[0] ] }
-               | RANGE3D              { result = [ '_range3d', val[0] ] }
-               | NAME                 { result = [ '_name',    val[0] ] }
-               | TRUE                 { result = [ 'ptgBool',  '1'    ] }
-               | FALSE                { result = [ 'ptgBool',  '0'    ] }
-               | funcall
-
-  funcall      : FUNC '(' args ')'    { result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ] }
-               | FUNC '(' ')'         { result = [ '_func', val[0] ] }
-
-  args         : expr                 { result = val }
-               | args ',' expr        { result.push val[2] }
-
-end
-
-
----- footer
-
-class ExcelFormulaParserError < StandardError; end
-
-class Node
-
-   def exec_list(nodes)
-      v = nil
-      nodes.each { |i| v = i.evaluate }
-      v
-   end
-
-   def excelformulaparser_error(msg)
-      raise ExcelFormulaParserError,
-               "in #{fname}:#{lineno}: #{msg}"
-   end
-
-end
-
-class RootNode < Node
-
-   def initialize(tree)
-      @tree = tree
-   end
-
-   def evaluate
-      exec_list @tree
-   end
-
-end
-
-
-class FuncallNode < Node
-
-   def initialize(func, args)
-      @func = func
-      @args = args
-   end
-
-   def evaluate
-      arg = @args.collect {|i| i.evaluate }
-      out = []
-      arg.each { |i| o.push i }
-      o.push @func
-      p o
-   end
-
-end
-
-class NumberNode < Node
-
-   def initialize(val)
-      @val = val
-   end
-
-   def evaluate
-      p @val
-   end
-
-end
-
-class OperateNode < Node
-
-   def initialize(op, left, right)
-      @op = op
-      @left = left
-      @right = right
-   end
-
-   def evaluate
-      o = []
-      o.push @left
-      o.push @right
-      o.push @op
-      p o
-   end
-end
-
+#
+# copyright (c) 2009, 2010  Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
+
+
+class ExcelFormulaParser
+
+prechigh
+  nonassoc UMINUS
+  right    '^'
+  left     '&'
+  left     '*' '/'
+  left     '+' '-'
+  left     '<' '>' '<=' '>=' '<>'
+  left     '='
+preclow
+
+rule
+
+  formula      : expr_list
+
+  expr_list    :                      { result = [] }
+               | expr_list expr EOL   { result.push val[1], '_arg', '1' }
+               | expr_list EOL
+
+  expr         : expr '+' expr        { result = [ val[0], val[2], 'ptgAdd' ] }
+               | expr '-' expr        { result = [ val[0], val[2], 'ptgSub' ] }
+               | expr '*' expr        { result = [ val[0], val[2], 'ptgMul' ] }
+               | expr '/' expr        { result = [ val[0], val[2], 'ptgDiv' ] }
+               | expr '^' expr        { result = [ val[0], val[2], 'ptgPower' ] }
+               | expr '&' expr        { result = [ val[0], val[2], 'ptgConcat' ] }
+               | expr LT  expr        { result = [ val[0], val[2], 'ptgLT' ] }
+               | expr GT  expr        { result = [ val[0], val[2], 'ptgGT' ] }
+               | expr LE  expr        { result = [ val[0], val[2], 'ptgLE' ] }
+               | expr GE  expr        { result = [ val[0], val[2], 'ptgGE' ] }
+               | expr NE  expr        { result = [ val[0], val[2], 'ptgNE' ] }
+               | expr '=' expr        { result = [ val[0], val[2], 'ptgEQ' ] }
+               | primary
+
+  primary      : '(' expr ')'         { result = [ val[1], '_arg', '1', 'ptgParen'] }
+               | '-' expr  = UMINUS   { result = [ '_num', '-1', val[1], 'ptgMul' ] }
+               | FUNC
+               | NUMBER               { result = [ '_num',     val[0] ] }
+               | STRING               { result = [ '_str',     val[0] ] }
+               | REF2D                { result = [ '_ref2d',   val[0] ] }
+               | REF3D                { result = [ '_ref3d',   val[0] ] }
+               | RANGE2D              { result = [ '_range2d', val[0] ] }
+               | RANGE3D              { result = [ '_range3d', val[0] ] }
+               | NAME                 { result = [ '_name',    val[0] ] }
+               | TRUE                 { result = [ 'ptgBool',  '1'    ] }
+               | FALSE                { result = [ 'ptgBool',  '0'    ] }
+               | funcall
+
+  funcall      : FUNC '(' args ')'    { result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ] }
+               | FUNC '(' ')'         { result = [ '_func', val[0] ] }
+
+  args         : expr                 { result = val }
+               | args ',' expr        { result.push val[2] }
+
+end
+
+
+---- footer
+
+class ExcelFormulaParserError < StandardError; end
+
+class Node
+
+   def exec_list(nodes)
+      v = nil
+      nodes.each { |i| v = i.evaluate }
+      v
+   end
+
+   def excelformulaparser_error(msg)
+      raise ExcelFormulaParserError,
+               "in #{fname}:#{lineno}: #{msg}"
+   end
+
+end
+
+class RootNode < Node
+
+   def initialize(tree)
+      @tree = tree
+   end
+
+   def evaluate
+      exec_list @tree
+   end
+
+end
+
+
+class FuncallNode < Node
+
+   def initialize(func, args)
+      @func = func
+      @args = args
+   end
+
+   def evaluate
+      arg = @args.collect {|i| i.evaluate }
+      out = []
+      arg.each { |i| o.push i }
+      o.push @func
+      p o
+   end
+
+end
+
+class NumberNode < Node
+
+   def initialize(val)
+      @val = val
+   end
+
+   def evaluate
+      p @val
+   end
+
+end
+
+class OperateNode < Node
+
+   def initialize(op, left, right)
+      @op = op
+      @left = left
+      @right = right
+   end
+
+   def evaluate
+      o = []
+      o.push @left
+      o.push @right
+      o.push @op
+      p o
+   end
+end
+

data/lib/writeexcel/workbook.rb

@@ -2972,8 +2972,8 @@ def add_mso_drawing_group_continue(data)       #:nodoc:
     end
 
     # Change length field of the first MSODRAWINGGROUP block. Case 2 and 3.
-    tmp = data.dup
-    tmp[0, limit + 4] = ""
+    tmp = data[0, limit + 4]
+    data[0, limit + 4] = ""
     tmp[2, 2] = [limit].pack('v')
     append(tmp)
 

data/writeexcel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{writeexcel}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hideo NAKAMURA"]
-  s.date = %q{2010-11-10}
+  s.date = %q{2011-04-15}
   s.description = %q{Multiple worksheets can be added to a workbook and formatting can be applied to cells. Text, numbers, formulas, hyperlinks and images can be written to the cells.}
   s.email = %q{cxn03651@msj.biglobe.ne.jp}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: writeexcel
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Hideo NAKAMURA
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +09:00
+date: 2011-04-15 00:00:00 +09:00
 default_executable: 
 dependencies: []