From 952c57ba77b5a36111b9f82f8632e58208c998c4 Mon Sep 17 00:00:00 2001
From: murphy <murphy@rubychan.de>
Date: Sun, 11 Dec 2005 04:15:33 +0000
Subject: scanners/ruby/patterns.rb:   Changed recognition of numerics   + and
 - prefixes now belong to the number. tests and demos adjusted.

helpers/plugin.rb: Typo in doc.
---
 demo/demo_html.out                    |  2 +-
 lib/coderay/helpers/plugin.rb         |  2 +-
 lib/coderay/scanners/ruby/patterns.rb |  2 +-
 test/ruby/1.out.raydebug              | 22 +++++------
 test/ruby/evil.out.raydebug           | 54 ++++++++++++-------------
 test/ruby/example.out.raydebug        | 28 ++++++-------
 test/ruby/pleac.out.raydebug          | 74 +++++++++++++++++------------------
 test/ruby/sidebarize.out.raydebug     |  2 +-
 test/ruby/strange.out.raydebug        | 36 ++++++++---------
 test/suite.rb                         |  2 +-
 10 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/demo/demo_html.out b/demo/demo_html.out
index d687bb1..ac1d8d1 100644
--- a/demo/demo_html.out
+++ b/demo/demo_html.out
@@ -642,7 +642,7 @@ ol.CodeRay li { white-space: pre; }
 </tt>          <tt>
 </tt>        <span class="r">elsif</span> <span class="iv">@scanner</span>.scan(<span class="rx"><span class="dl">/</span><span class="k"> [-+*</span><span class="ch">\/</span><span class="k">%=&lt;&gt;;,|&amp;!()</span><span class="ch">\[</span><span class="ch">\]</span><span class="k">{}~?] | </span><span class="ch">\.</span><span class="ch">\.</span><span class="k">?</span><span class="ch">\.</span><span class="k">? | ::? </span><span class="dl">/</span><span class="mod">x</span></span>)<tt>
 </tt>          kind = <span class="sy">:operator</span><tt>
-</tt>          <span class="iv">@regexp_allowed</span> = <span class="sy">:set</span> <span class="r">if</span> <span class="iv">@scanner</span>.matched[-<span class="i">1</span>,<span class="i">1</span>] =~ <span class="rx"><span class="dl">/</span><span class="k">[~=!&lt;&gt;|&amp;^,</span><span class="ch">\(</span><span class="ch">\[</span><span class="k">+</span><span class="ch">\-</span><span class="ch">\/</span><span class="ch">\*</span><span class="k">%]</span><span class="ch">\z</span><span class="dl">/</span></span><tt>
+</tt>          <span class="iv">@regexp_allowed</span> = <span class="sy">:set</span> <span class="r">if</span> <span class="iv">@scanner</span>.matched[<span class="i">-1</span>,<span class="i">1</span>] =~ <span class="rx"><span class="dl">/</span><span class="k">[~=!&lt;&gt;|&amp;^,</span><span class="ch">\(</span><span class="ch">\[</span><span class="k">+</span><span class="ch">\-</span><span class="ch">\/</span><span class="ch">\*</span><span class="k">%]</span><span class="ch">\z</span><span class="dl">/</span></span><tt>
 </tt>        <span class="r">elsif</span> <span class="iv">@scanner</span>.scan(<span class="co">FLOAT</span>)<tt>
 </tt>          kind = <span class="sy">:float</span><tt>
 </tt>        <span class="r">elsif</span> <span class="iv">@scanner</span>.scan(<span class="co">INTEGER</span>)<tt>
diff --git a/lib/coderay/helpers/plugin.rb b/lib/coderay/helpers/plugin.rb
index 233dfd6..6c3ce76 100644
--- a/lib/coderay/helpers/plugin.rb
+++ b/lib/coderay/helpers/plugin.rb
@@ -178,7 +178,7 @@ protected
 
 	# Loads the map file (see map).
 	#
-	# This is done automatically when plaugin_path is called.
+	# This is done automatically when plugin_path is called.
 	def load_map
 		begin
 			require path_to('_map')
diff --git a/lib/coderay/scanners/ruby/patterns.rb b/lib/coderay/scanners/ruby/patterns.rb
index ad649da..2933109 100644
--- a/lib/coderay/scanners/ruby/patterns.rb
+++ b/lib/coderay/scanners/ruby/patterns.rb
@@ -71,7 +71,7 @@ module CodeRay module Scanners
 		EXPONENT = / [eE] [+-]? #{DECIMAL} /ox
 		FLOAT_SUFFIX = / #{EXPONENT} | \. #{DECIMAL} #{EXPONENT}? /ox
 		FLOAT_OR_INT = / #{DECIMAL} (?: #{FLOAT_SUFFIX} () )? /ox
-		NUMERIC = / (?=0) (?: #{OCTAL} | #{HEXADECIMAL} | #{BINARY} ) | #{FLOAT_OR_INT} /ox
+		NUMERIC = / [-+]? (?: (?=0) (?: #{OCTAL} | #{HEXADECIMAL} | #{BINARY} ) | #{FLOAT_OR_INT} ) /ox
 
 		SYMBOL = /
 			:
diff --git a/test/ruby/1.out.raydebug b/test/ruby/1.out.raydebug
index 2b1c6fb..0cd4ac3 100644
--- a/test/ruby/1.out.raydebug
+++ b/test/ruby/1.out.raydebug
@@ -99,20 +99,20 @@ reserved(class) class(Date)
   operator(})
 
   constant(ZONES) operator(=) operator({)
-    string<delimiter(')content(ut)delimiter(')>  operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(gmt)delimiter(')> operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(est)delimiter(')> operator(=)operator(>) operator(-)integer(5)operator(*)integer(3600)operator(,) string<delimiter(')content(edt)delimiter(')> operator(=)operator(>) operator(-)integer(4)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(cst)delimiter(')> operator(=)operator(>) operator(-)integer(6)operator(*)integer(3600)operator(,) string<delimiter(')content(cdt)delimiter(')> operator(=)operator(>) operator(-)integer(5)operator(*)integer(3600)operator(,) string<delimiter(')content(mst)delimiter(')> operator(=)operator(>) operator(-)integer(7)operator(*)integer(3600)operator(,) string<delimiter(')content(mdt)delimiter(')> operator(=)operator(>) operator(-)integer(6)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(pst)delimiter(')> operator(=)operator(>) operator(-)integer(8)operator(*)integer(3600)operator(,) string<delimiter(')content(pdt)delimiter(')> operator(=)operator(>) operator(-)integer(7)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(ut)delimiter(')>  operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(gmt)delimiter(')> operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(est)delimiter(')> operator(=)operator(>) integer(-5)operator(*)integer(3600)operator(,) string<delimiter(')content(edt)delimiter(')> operator(=)operator(>) integer(-4)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(cst)delimiter(')> operator(=)operator(>) integer(-6)operator(*)integer(3600)operator(,) string<delimiter(')content(cdt)delimiter(')> operator(=)operator(>) integer(-5)operator(*)integer(3600)operator(,) string<delimiter(')content(mst)delimiter(')> operator(=)operator(>) integer(-7)operator(*)integer(3600)operator(,) string<delimiter(')content(mdt)delimiter(')> operator(=)operator(>) integer(-6)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(pst)delimiter(')> operator(=)operator(>) integer(-8)operator(*)integer(3600)operator(,) string<delimiter(')content(pdt)delimiter(')> operator(=)operator(>) integer(-7)operator(*)integer(3600)operator(,)
     string<delimiter(')content(a)delimiter(')>   operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(b)delimiter(')>   operator(=)operator(>)  integer(2)operator(*)integer(3600)operator(,) string<delimiter(')content(c)delimiter(')>   operator(=)operator(>)  integer(3)operator(*)integer(3600)operator(,) string<delimiter(')content(d)delimiter(')>   operator(=)operator(>)  integer(4)operator(*)integer(3600)operator(,)
     string<delimiter(')content(e)delimiter(')>   operator(=)operator(>)  integer(5)operator(*)integer(3600)operator(,) string<delimiter(')content(f)delimiter(')>   operator(=)operator(>)  integer(6)operator(*)integer(3600)operator(,) string<delimiter(')content(g)delimiter(')>   operator(=)operator(>)  integer(7)operator(*)integer(3600)operator(,) string<delimiter(')content(h)delimiter(')>   operator(=)operator(>)  integer(8)operator(*)integer(3600)operator(,)
     string<delimiter(')content(i)delimiter(')>   operator(=)operator(>)  integer(9)operator(*)integer(3600)operator(,) string<delimiter(')content(k)delimiter(')>   operator(=)operator(>) integer(10)operator(*)integer(3600)operator(,) string<delimiter(')content(l)delimiter(')>   operator(=)operator(>) integer(11)operator(*)integer(3600)operator(,) string<delimiter(')content(m)delimiter(')>   operator(=)operator(>) integer(12)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(n)delimiter(')>   operator(=)operator(>) operator(-)integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(o)delimiter(')>   operator(=)operator(>) operator(-)integer(2)operator(*)integer(3600)operator(,) string<delimiter(')content(p)delimiter(')>   operator(=)operator(>) operator(-)integer(3)operator(*)integer(3600)operator(,) string<delimiter(')content(q)delimiter(')>   operator(=)operator(>) operator(-)integer(4)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(r)delimiter(')>   operator(=)operator(>) operator(-)integer(5)operator(*)integer(3600)operator(,) string<delimiter(')content(s)delimiter(')>   operator(=)operator(>) operator(-)integer(6)operator(*)integer(3600)operator(,) string<delimiter(')content(t)delimiter(')>   operator(=)operator(>) operator(-)integer(7)operator(*)integer(3600)operator(,) string<delimiter(')content(u)delimiter(')>   operator(=)operator(>) operator(-)integer(8)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(v)delimiter(')>   operator(=)operator(>) operator(-)integer(9)operator(*)integer(3600)operator(,) string<delimiter(')content(w)delimiter(')>   operator(=)operator(>)operator(-)integer(10)operator(*)integer(3600)operator(,) string<delimiter(')content(x)delimiter(')>   operator(=)operator(>)operator(-)integer(11)operator(*)integer(3600)operator(,) string<delimiter(')content(y)delimiter(')>   operator(=)operator(>)operator(-)integer(12)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(n)delimiter(')>   operator(=)operator(>) integer(-1)operator(*)integer(3600)operator(,) string<delimiter(')content(o)delimiter(')>   operator(=)operator(>) integer(-2)operator(*)integer(3600)operator(,) string<delimiter(')content(p)delimiter(')>   operator(=)operator(>) integer(-3)operator(*)integer(3600)operator(,) string<delimiter(')content(q)delimiter(')>   operator(=)operator(>) integer(-4)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(r)delimiter(')>   operator(=)operator(>) integer(-5)operator(*)integer(3600)operator(,) string<delimiter(')content(s)delimiter(')>   operator(=)operator(>) integer(-6)operator(*)integer(3600)operator(,) string<delimiter(')content(t)delimiter(')>   operator(=)operator(>) integer(-7)operator(*)integer(3600)operator(,) string<delimiter(')content(u)delimiter(')>   operator(=)operator(>) integer(-8)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(v)delimiter(')>   operator(=)operator(>) integer(-9)operator(*)integer(3600)operator(,) string<delimiter(')content(w)delimiter(')>   operator(=)operator(>)integer(-10)operator(*)integer(3600)operator(,) string<delimiter(')content(x)delimiter(')>   operator(=)operator(>)integer(-11)operator(*)integer(3600)operator(,) string<delimiter(')content(y)delimiter(')>   operator(=)operator(>)integer(-12)operator(*)integer(3600)operator(,)
     string<delimiter(')content(z)delimiter(')>   operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(utc)delimiter(')> operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(wet)delimiter(')> operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(bst)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(wat)delimiter(')> operator(=)operator(>) operator(-)integer(1)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(at)delimiter(')>  operator(=)operator(>) operator(-)integer(2)operator(*)integer(3600)operator(,) string<delimiter(')content(ast)delimiter(')> operator(=)operator(>) operator(-)integer(4)operator(*)integer(3600)operator(,) string<delimiter(')content(adt)delimiter(')> operator(=)operator(>) operator(-)integer(3)operator(*)integer(3600)operator(,) string<delimiter(')content(yst)delimiter(')> operator(=)operator(>) operator(-)integer(9)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(ydt)delimiter(')> operator(=)operator(>) operator(-)integer(8)operator(*)integer(3600)operator(,) string<delimiter(')content(hst)delimiter(')> operator(=)operator(>)operator(-)integer(10)operator(*)integer(3600)operator(,) string<delimiter(')content(hdt)delimiter(')> operator(=)operator(>) operator(-)integer(9)operator(*)integer(3600)operator(,) string<delimiter(')content(cat)delimiter(')> operator(=)operator(>)operator(-)integer(10)operator(*)integer(3600)operator(,)
-    string<delimiter(')content(ahst)delimiter(')>operator(=)operator(>)operator(-)integer(10)operator(*)integer(3600)operator(,) string<delimiter(')content(nt)delimiter(')>  operator(=)operator(>)operator(-)integer(11)operator(*)integer(3600)operator(,) string<delimiter(')content(idlw)delimiter(')>operator(=)operator(>)operator(-)integer(12)operator(*)integer(3600)operator(,) string<delimiter(')content(cet)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(utc)delimiter(')> operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(wet)delimiter(')> operator(=)operator(>)  integer(0)operator(*)integer(3600)operator(,) string<delimiter(')content(bst)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(wat)delimiter(')> operator(=)operator(>) integer(-1)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(at)delimiter(')>  operator(=)operator(>) integer(-2)operator(*)integer(3600)operator(,) string<delimiter(')content(ast)delimiter(')> operator(=)operator(>) integer(-4)operator(*)integer(3600)operator(,) string<delimiter(')content(adt)delimiter(')> operator(=)operator(>) integer(-3)operator(*)integer(3600)operator(,) string<delimiter(')content(yst)delimiter(')> operator(=)operator(>) integer(-9)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(ydt)delimiter(')> operator(=)operator(>) integer(-8)operator(*)integer(3600)operator(,) string<delimiter(')content(hst)delimiter(')> operator(=)operator(>)integer(-10)operator(*)integer(3600)operator(,) string<delimiter(')content(hdt)delimiter(')> operator(=)operator(>) integer(-9)operator(*)integer(3600)operator(,) string<delimiter(')content(cat)delimiter(')> operator(=)operator(>)integer(-10)operator(*)integer(3600)operator(,)
+    string<delimiter(')content(ahst)delimiter(')>operator(=)operator(>)integer(-10)operator(*)integer(3600)operator(,) string<delimiter(')content(nt)delimiter(')>  operator(=)operator(>)integer(-11)operator(*)integer(3600)operator(,) string<delimiter(')content(idlw)delimiter(')>operator(=)operator(>)integer(-12)operator(*)integer(3600)operator(,) string<delimiter(')content(cet)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,)
     string<delimiter(')content(met)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(mewt)delimiter(')>operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(mest)delimiter(')>operator(=)operator(>)  integer(2)operator(*)integer(3600)operator(,) string<delimiter(')content(mesz)delimiter(')>operator(=)operator(>)  integer(2)operator(*)integer(3600)operator(,)
     string<delimiter(')content(swt)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(sst)delimiter(')> operator(=)operator(>)  integer(2)operator(*)integer(3600)operator(,) string<delimiter(')content(fwt)delimiter(')> operator(=)operator(>)  integer(1)operator(*)integer(3600)operator(,) string<delimiter(')content(fst)delimiter(')> operator(=)operator(>)  integer(2)operator(*)integer(3600)operator(,)
     string<delimiter(')content(eet)delimiter(')> operator(=)operator(>)  integer(2)operator(*)integer(3600)operator(,) string<delimiter(')content(bt)delimiter(')>  operator(=)operator(>)  integer(3)operator(*)integer(3600)operator(,) string<delimiter(')content(zp4)delimiter(')> operator(=)operator(>)  integer(4)operator(*)integer(3600)operator(,) string<delimiter(')content(zp5)delimiter(')> operator(=)operator(>)  integer(5)operator(*)integer(3600)operator(,)
@@ -539,7 +539,7 @@ comment(=begin
       ident(offset) operator(+=) integer(3600) reserved(if) ident(dst)
     reserved(elsif) regexp<delimiter(/)char(\\A)content(([-+]\)()char(\\d)content({2}\):?()char(\\d)content({2}\)?)char(\\Z)delimiter(/)modifier(no)> operator(=)operator(~) ident(str)
       ident(offset) operator(=) global_variable($2)operator(.)ident(to_i) operator(*) integer(3600) operator(+) global_variable($3)operator(.)ident(to_i) operator(*) integer(60)
-      ident(offset) operator(*=) operator(-)integer(1) reserved(if) global_variable($1) operator(==) string<delimiter(')content(-)delimiter(')>
+      ident(offset) operator(*=) integer(-1) reserved(if) global_variable($1) operator(==) string<delimiter(')content(-)delimiter(')>
     reserved(end)
     ident(offset)
   reserved(end)
diff --git a/test/ruby/evil.out.raydebug b/test/ruby/evil.out.raydebug
index 7322519..b62d778 100644
--- a/test/ruby/evil.out.raydebug
+++ b/test/ruby/evil.out.raydebug
@@ -184,12 +184,12 @@ comment(#  p(p $ a\) #work)
   ident(p)operator(()operator(()ident(p) ident(p)operator(,)ident(p)operator(\))operator(\))
   ident(p)operator(()operator(()ident(p) ident(p)operator(\))operator(\))
   ident(p)operator(()operator(()ident(p) ident(p)operator(,)ident(p)operator(\))operator(\))
-  ident(p)operator(()ident(p)operator(-)integer(0)operator(\))
-  ident(p)operator(()ident(p) operator(-)integer(0)operator(\))
+  ident(p)operator(()ident(p)integer(-0)operator(\))
+  ident(p)operator(()ident(p) integer(-0)operator(\))
   ident(p)operator(()ident(p)operator(-) integer(0)operator(\))
   ident(p)operator(()ident(p) operator(-) integer(0)operator(\))
-  ident(p)operator(()ident(p)operator(+)integer(9)operator(\))
-  ident(p)operator(()ident(p) operator(+)integer(9)operator(\))
+  ident(p)operator(()ident(p)integer(+9)operator(\))
+  ident(p)operator(()ident(p) integer(+9)operator(\))
   ident(p)operator(()ident(p)operator(+) integer(9)operator(\))
   ident(p)operator(()ident(p) operator(+) integer(9)operator(\))
   ident(p)operator(()ident(p)operator([)integer(1)operator(])operator(\))
@@ -399,14 +399,14 @@ ident(p) symbol(:`)
 ident(p)operator({)operator(})
 ident(p) operator({)operator(})
 ident(a)operator(=)integer(5)
-ident(p) ident(p) operator(+)integer(5)
-ident(p) ident(a) operator(+)integer(5)
+ident(p) ident(p) integer(+5)
+ident(p) ident(a) integer(+5)
 
 reserved(def) pre_constant(nil)operator(.)operator(+)operator(()ident(x)operator(\)) operator(~)ident(x) reserved(end)
 reserved(def) pre_constant(nil)operator(.)operator([])operator(()operator(*)ident(x)operator(\)) operator([)ident(x)operator(]) reserved(end)
 ident(p)operator(() ident(p) operator(+) integer(5) operator(\))
-ident(p)operator(() ident(p) operator(+)integer(5) operator(\))
-ident(p)operator(() ident(p)operator(+)integer(5) operator(\))
+ident(p)operator(() ident(p) integer(+5) operator(\))
+ident(p)operator(() ident(p)integer(+5) operator(\))
 ident(p)operator(() ident(p)operator([)operator(]) operator(\))
 ident(p)operator(() ident(p) operator([)operator(]) operator(\))
 ident(p)operator(() ident(p) operator([) operator(]) operator(\))
@@ -414,17 +414,17 @@ reserved(class) class(NilClass)operator(;) reserved(undef) method(+)operator(,)m
 
 reserved(class) class(Foou)
  ident(public)
- reserved(def) method([]) ident(x)operator(=)operator(-)integer(100)operator(,)operator(&)ident(y)operator(;) ident(p) ident(x)operator(;) integer(100) reserved(end)
+ reserved(def) method([]) ident(x)operator(=)integer(-100)operator(,)operator(&)ident(y)operator(;) ident(p) ident(x)operator(;) integer(100) reserved(end)
 reserved(end)
 ident(a0)operator(=)integer(8)
 ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])operator(!)pre_constant(false)  comment(#value)
 ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) operator(!)pre_constant(false) comment(#value)
 ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])operator(~)integer(9)      comment(#value)
 ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) operator(~)integer(9)     comment(#value)
-ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])operator(-)integer(9)      comment(#op)
-ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])operator(+)integer(9)      comment(#op)
-ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) operator(-)integer(9)     comment(#value)
-ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) operator(+)integer(9)     comment(#value)
+ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])integer(-9)      comment(#op)
+ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])integer(+9)      comment(#op)
+ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) integer(-9)     comment(#value)
+ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) integer(+9)     comment(#value)
 ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])operator(<<)integer(9)     comment(#op)
 ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) string<delimiter(<<9)>    comment(#value)string<content(
 foobar)delimiter(
@@ -754,7 +754,7 @@ ident(compile_body)operator(=)ident(outvar)operator(=)string<delimiter(')content
 reserved(if) pre_constant(false)
  ident(method_src) operator(=) ident(c)operator(.)ident(compile)operator(()ident(template)operator(,) operator(()constant(HtmlCompiler)operator(::)constant(AnyData)operator(.)ident(new)operator(\))operator(\))operator(.)ident(join)operator(()string<delimiter(")char(\\n)delimiter(")>operator(\)) operator(+)
     string<delimiter(")char(\\n)content(# generated by PartsTemplate::compile_partstemplate at )inline<delimiter(#{)constant(Time)operator(.)ident(new)delimiter(})>char(\\n)delimiter(")>
- ident(rescu) operator(-)integer(1)
+ ident(rescu) integer(-1)
 reserved(end)
 
   ident(p)operator(()string<delimiter(')content(rb_out)delimiter(')>operator(,) string<delimiter(')content(args)delimiter(')>operator(,) string<delimiter(<<-'EOL')>operator(\))string<content(
@@ -906,7 +906,7 @@ ident(p) integer(?p)
 ident(p) float(0.1)
 ident(p) float(0.8)
 ident(p) float(0.9)
-ident(p)operator(()operator(-)integer(1)operator(\))
+ident(p)operator(()integer(-1)operator(\))
 ident(p) string<delimiter(%/)content(p)delimiter(/)>
 ident(p) string<delimiter(%Q[)content(<LI>)delimiter(])>
 ident(i)operator(=)integer(99)
@@ -1058,9 +1058,9 @@ end
 )delimiter(
 S)>
 reserved(def) method(printem1) ident(a)operator(,)ident(b)operator(,)ident(c)
-   ident(p)operator(()ident(a) operator(+)integer(77)operator(\))
-   ident(p)operator(()ident(b) operator(+)integer(77)operator(\))
-   ident(p)operator(()ident(c) operator(+)integer(77)operator(\))
+   ident(p)operator(()ident(a) integer(+77)operator(\))
+   ident(p)operator(()ident(b) integer(+77)operator(\))
+   ident(p)operator(()ident(c) integer(+77)operator(\))
 reserved(end)
 
 reserved(def) method(foobar)operator(()operator(\)) reserved(end)
@@ -1068,15 +1068,15 @@ reserved(def) method(foobar2)
 reserved(end)
 
 reserved(def) method(printem0)operator(()ident(a)operator(\))
-   ident(p)operator(()ident(a) operator(+)integer(77)operator(\))
+   ident(p)operator(()ident(a) integer(+77)operator(\))
 reserved(end)
 reserved(def) method(printem0)operator(()ident(a)operator(,)ident(b)operator(,)ident(c)operator(\))
-   ident(p)operator(()ident(a) operator(+)integer(77)operator(\))
-   ident(p)operator(()ident(b) operator(+)integer(77)operator(\))
-   ident(p)operator(()ident(c) operator(+)integer(77)operator(\))
+   ident(p)operator(()ident(a) integer(+77)operator(\))
+   ident(p)operator(()ident(b) integer(+77)operator(\))
+   ident(p)operator(()ident(c) integer(+77)operator(\))
 reserved(end)
-reserved(def) method(printem2) ident(a)operator(,)ident(b)operator(,)ident(c)operator(;) ident(p)operator(()ident(a) operator(+)integer(77)operator(\))operator(;) ident(p)operator(()ident(b) operator(+)integer(77)operator(\))operator(;) ident(p)operator(()ident(c) operator(+)integer(77)operator(\)) reserved(end)
-reserved(def) method(three)operator(()operator(\)) operator(()integer(1)operator(+)integer(2)operator(\)) reserved(end)
+reserved(def) method(printem2) ident(a)operator(,)ident(b)operator(,)ident(c)operator(;) ident(p)operator(()ident(a) integer(+77)operator(\))operator(;) ident(p)operator(()ident(b) integer(+77)operator(\))operator(;) ident(p)operator(()ident(c) integer(+77)operator(\)) reserved(end)
+reserved(def) method(three)operator(()operator(\)) operator(()integer(1)integer(+2)operator(\)) reserved(end)
 
 reserved(def) method(d)operator(;)reserved(end)
 reserved(def) method(d)operator(()operator(\))reserved(end)
@@ -1084,15 +1084,15 @@ reserved(def) method(d)operator(()ident(dd)operator(\))reserved(end)
 
 reserved(def) method(printem) ident(a)operator(,)ident(b)operator(,)ident(c)
    ident(p) ident(a)operator(;)ident(p) ident(b)operator(;)ident(p) ident(c)
-   ident(p)operator(()ident(a) operator(+)integer(77)operator(\))
+   ident(p)operator(()ident(a) integer(+77)operator(\))
    ident(p)operator(()ident(b) string<delimiter(%()content(0.123)delimiter(\))>operator(\))
 reserved(end)
 ident(printem) integer(1)operator(,)integer(2)operator(,)integer(3)
 
 ident(a)operator(=)integer(1)
-ident(p)operator(()ident(a) operator(+)integer(77)operator(\))
+ident(p)operator(()ident(a) integer(+77)operator(\))
 
-reserved(def) method(hhh)operator(()ident(a)operator(=)operator(()integer(1)operator(+)integer(2)operator(\))operator(\)) ident(a) reserved(end)
+reserved(def) method(hhh)operator(()ident(a)operator(=)operator(()integer(1)integer(+2)operator(\))operator(\)) ident(a) reserved(end)
 
 
 
diff --git a/test/ruby/example.out.raydebug b/test/ruby/example.out.raydebug
index 90e2f2b..bd32f36 100644
--- a/test/ruby/example.out.raydebug
+++ b/test/ruby/example.out.raydebug
@@ -157,7 +157,7 @@ regexp<delimiter(/)content(%(?:[Qqxrw](?:)char(\\()content([^\)#)char(\\\\)char(
 
 			reserved(elsif) instance_variable(@scanner)operator(.)ident(scan)operator(()regexp<delimiter(/)content( [-+*)char(\\/)content(%=<>;,|&!(\))char(\\[)char(\\])content({}~?] | )char(\\.)char(\\.)content(?)char(\\.)content(? | ::? )delimiter(/)modifier(x)>operator(\))
 				ident(kind) operator(=) symbol(:operator)
-				instance_variable(@regexp_allowed) operator(=) symbol(:set) reserved(if) instance_variable(@scanner)operator(.)ident(matched)operator([)operator(-)integer(1)operator(,)integer(1)operator(]) operator(=)operator(~) regexp<delimiter(/)content([~=!<>|&^,)char(\\()char(\\[)content(+)char(\\-)char(\\/)char(\\*)content(%])char(\\z)delimiter(/)>
+				instance_variable(@regexp_allowed) operator(=) symbol(:set) reserved(if) instance_variable(@scanner)operator(.)ident(matched)operator([)integer(-1)operator(,)integer(1)operator(]) operator(=)operator(~) regexp<delimiter(/)content([~=!<>|&^,)char(\\()char(\\[)content(+)char(\\-)char(\\/)char(\\*)content(%])char(\\z)delimiter(/)>
 			reserved(elsif) instance_variable(@scanner)operator(.)ident(scan)operator(()constant(FLOAT)operator(\))
 				ident(kind) operator(=) symbol(:float)
 			reserved(elsif) instance_variable(@scanner)operator(.)ident(scan)operator(()constant(INTEGER)operator(\))
@@ -542,7 +542,7 @@ reserved(class) class(Set)
 
     reserved(begin)
       ident(ids) operator(<<) ident(object_id)
-      reserved(return) ident(sprintf)operator(()string<delimiter(')content(#<%s: {%s}>)delimiter(')>operator(,) pre_constant(self)operator(.)ident(class)operator(,) ident(to_a)operator(.)ident(inspect)operator([)integer(1)operator(..)operator(-)integer(2)operator(])operator(\))
+      reserved(return) ident(sprintf)operator(()string<delimiter(')content(#<%s: {%s}>)delimiter(')>operator(,) pre_constant(self)operator(.)ident(class)operator(,) ident(to_a)operator(.)ident(inspect)operator([)integer(1)operator(..)integer(-2)operator(])operator(\))
     reserved(ensure)
       ident(ids)operator(.)ident(pop)
     reserved(end)
@@ -747,7 +747,7 @@ comment(#   end)
 comment(# end)
 
 reserved(if) global_variable($0) operator(==) pre_constant(__FILE__)
-  ident(eval) pre_constant(DATA)operator(.)ident(read)operator(,) pre_constant(nil)operator(,) global_variable($0)operator(,) pre_constant(__LINE__)operator(+)integer(4)
+  ident(eval) pre_constant(DATA)operator(.)ident(read)operator(,) pre_constant(nil)operator(,) global_variable($0)operator(,) pre_constant(__LINE__)integer(+4)
 reserved(end)
 
 comment(# = rweb - CGI Support Library)
@@ -984,7 +984,7 @@ reserved(class) class(Rweb)
                     comment(# If the index is numerical convert it to an Integer)
                     ident(key) operator(=) ident(key)operator(.)ident(to_i)
                 reserved(elsif) ident(key)operator([)integer(0)operator(])operator(.)ident(chr) operator(==) string<delimiter(")content(')delimiter(")> operator(||) ident(key)operator([)integer(0)operator(])operator(.)ident(chr) operator(==) string<delimiter(')content(")delimiter(')>
-                    ident(key) operator(=) ident(key)operator([)integer(1)operator(,) ident(key)operator(.)ident(length)operator(()operator(\)) operator(-)integer(2)operator(])
+                    ident(key) operator(=) ident(key)operator([)integer(1)operator(,) ident(key)operator(.)ident(length)operator(()operator(\)) integer(-2)operator(])
                 reserved(end)
                 reserved(if) operator(!)ident(akt)operator(.)ident(has_key?)operator(()ident(key)operator(\)) operator(||) operator(!)ident(akt)operator([)ident(key)operator(])operator(.)ident(class) operator(==) constant(Hash)
                     comment(# create an empty Hash if there isn't already one)
@@ -1033,7 +1033,7 @@ reserved(class) class(Rweb)
                             comment(# If the index is numerical convert it to an Integer)
                             ident(key) operator(=) ident(key)operator(.)ident(to_i)
                         reserved(elsif) ident(key)operator([)integer(0)operator(])operator(.)ident(chr) operator(==) string<delimiter(")content(')delimiter(")> operator(||) ident(key)operator([)integer(0)operator(])operator(.)ident(chr) operator(==) string<delimiter(')content(")delimiter(')>
-                            ident(key) operator(=) ident(key)operator([)integer(1)operator(,) ident(key)operator(.)ident(length)operator(()operator(\)) operator(-)integer(2)operator(])
+                            ident(key) operator(=) ident(key)operator([)integer(1)operator(,) ident(key)operator(.)ident(length)operator(()operator(\)) integer(-2)operator(])
                         reserved(end)
                         reserved(if) operator(!)ident(akt)operator(.)ident(has_key?)operator(()ident(key)operator(\)) operator(||) operator(!)ident(akt)operator([)ident(key)operator(])operator(.)ident(class) operator(==) constant(Hash)
                             comment(# create an empty Hash if there isn't already one)
@@ -1794,7 +1794,7 @@ comment(=begin
 			reserved(end)
 
 			reserved(def) pre_constant(self)operator(.)ident(unquote) ident(qt)
-				ident(qt)operator([)integer(1)operator(..)operator(-)integer(1)operator(])operator(.)ident(chomp)operator(()string<delimiter(')content(")delimiter(')>operator(\))operator(.)ident(gsub)operator(()regexp<delimiter(/)char(\\\\)content(.)delimiter(/)>operator(\)) operator({) operator(|)ident(esc)operator(|) ident(unescape_char) ident(esc) operator(})
+				ident(qt)operator([)integer(1)operator(..)integer(-1)operator(])operator(.)ident(chomp)operator(()string<delimiter(')content(")delimiter(')>operator(\))operator(.)ident(gsub)operator(()regexp<delimiter(/)char(\\\\)content(.)delimiter(/)>operator(\)) operator({) operator(|)ident(esc)operator(|) ident(unescape_char) ident(esc) operator(})
 			reserved(end)
 
 			reserved(def) pre_constant(self)operator(.)ident(unescape) ident(str)
@@ -2162,7 +2162,7 @@ comment(=begin
 		reserved(def) method(handle_special_content) ident(tag)
 			ident(scanned) operator(=) instance_variable(@scanner)operator(.)ident(scan_until)operator(()ident(tag)operator(.)ident(closing_tag)operator(\))
 			reserved(if) ident(scanned)
-				ident(scanned)operator(.)ident(slice!)operator(()operator(-)operator(()instance_variable(@scanner)operator(.)ident(matched)operator(.)ident(size)operator(\))operator(..)operator(-)integer(1)operator(\))
+				ident(scanned)operator(.)ident(slice!)operator(()operator(-)operator(()instance_variable(@scanner)operator(.)ident(matched)operator(.)ident(size)operator(\))operator(..)integer(-1)operator(\))
 			reserved(else)
 				ident(scanned) operator(=) instance_variable(@scanner)operator(.)ident(scan)operator(()regexp<delimiter(/)content(.*)delimiter(/)modifier(m)>operator(\))operator(.)ident(to_s)
 			reserved(end)
@@ -2397,7 +2397,7 @@ ident(private)
 reserved(end)
 
 reserved(if) global_variable($0) operator(==) pre_constant(__FILE__)
-  ident(eval) pre_constant(DATA)operator(.)ident(read)operator(,) pre_constant(nil)operator(,) global_variable($0)operator(,) pre_constant(__LINE__)operator(+)integer(4)
+  ident(eval) pre_constant(DATA)operator(.)ident(read)operator(,) pre_constant(nil)operator(,) global_variable($0)operator(,) pre_constant(__LINE__)integer(+4)
 reserved(end)
 
 ident(require) string<delimiter(')content(test/unit)delimiter(')>
@@ -3297,7 +3297,7 @@ reserved(class) class(Side)
   reserved(end)
 
   reserved(def) method(get_edge)operator(()ident(side)operator(\))
-    ident(trio) operator(=) operator(()operator(-)integer(1)operator(..)integer(1)operator(\))operator(.)ident(map) operator({) operator(|)ident(x)operator(|) operator(()ident(side) operator(+) ident(x)operator(\)) operator(%) integer(4) operator(})
+    ident(trio) operator(=) operator(()integer(-1)operator(..)integer(1)operator(\))operator(.)ident(map) operator({) operator(|)ident(x)operator(|) operator(()ident(side) operator(+) ident(x)operator(\)) operator(%) integer(4) operator(})
     ident(prev_side)operator(,) ident(this_side)operator(,) ident(next_side) operator(=) instance_variable(@sides)operator(.)ident(values_at)operator(()operator(*)ident(trio)operator(\))
     ident(e) operator(=) constant(Edge)operator(.)ident(new)operator(()
       pre_constant(self)     operator(.)ident(values_at)operator(()                    operator([)ident(this_side)operator(])operator(,) operator([)ident(this_side)operator(,) ident(next_side)operator(]) operator(\)) operator(+)
@@ -3381,7 +3381,7 @@ reserved(end)
 comment(#$stdin = DATA)
 
 ident(gets)operator(.)ident(to_i)operator(.)ident(times) reserved(do) operator(|)ident(i)operator(|)
-  ident(puts) string<delimiter(")content(Scenario #)inline<delimiter(#{)ident(i)operator(+)integer(1)delimiter(})>content(:)delimiter(")>
+  ident(puts) string<delimiter(")content(Scenario #)inline<delimiter(#{)ident(i)integer(+1)delimiter(})>content(:)delimiter(")>
   ident(fs) operator(=) string<delimiter(')delimiter(')>
   integer(9)operator(.)ident(times) operator({) ident(fs) operator(<<) ident(gets) operator(})
   ident(cube) operator(=) constant(Cube)operator(.)ident(new)
@@ -3444,8 +3444,8 @@ reserved(class) class(Scenario)
 		instance_variable(@team_size)operator(.)ident(times) reserved(do)  comment(# each team member)
 			ident(io)operator(.)ident(gets)operator(.)ident(to_i)operator(.)ident(times) reserved(do)  comment(# each appointment)
 				ident(m) operator(=) constant(APPOINTMENT_PATTERN)operator(.)ident(match) ident(io)operator(.)ident(gets)
-				instance_variable(@data) operator(<<) operator([)constant(TimePoint)operator(.)ident(new)operator(()operator(*)ident(m)operator(.)ident(captures)operator([)integer(0)operator(,)integer(6)operator(])operator(.)ident(map) operator({) operator(|)ident(x)operator(|) ident(x)operator(.)ident(to_i) operator(})operator(\))operator(,) operator(-)integer(1)operator(])
-				instance_variable(@data) operator(<<) operator([)constant(TimePoint)operator(.)ident(new)operator(()operator(*)ident(m)operator(.)ident(captures)operator([)integer(6)operator(,)integer(6)operator(])operator(.)ident(map) operator({) operator(|)ident(x)operator(|) ident(x)operator(.)ident(to_i) operator(})operator(\))operator(,) operator(+)integer(1)operator(])
+				instance_variable(@data) operator(<<) operator([)constant(TimePoint)operator(.)ident(new)operator(()operator(*)ident(m)operator(.)ident(captures)operator([)integer(0)operator(,)integer(6)operator(])operator(.)ident(map) operator({) operator(|)ident(x)operator(|) ident(x)operator(.)ident(to_i) operator(})operator(\))operator(,) integer(-1)operator(])
+				instance_variable(@data) operator(<<) operator([)constant(TimePoint)operator(.)ident(new)operator(()operator(*)ident(m)operator(.)ident(captures)operator([)integer(6)operator(,)integer(6)operator(])operator(.)ident(map) operator({) operator(|)ident(x)operator(|) ident(x)operator(.)ident(to_i) operator(})operator(\))operator(,) integer(+1)operator(])
 			reserved(end)
 		reserved(end)
 		instance_variable(@data) operator(<<) operator([)constant(TimePoint)operator(.)ident(new)operator(()integer(2200)operator(,) integer(01)operator(,) integer(01)operator(,) integer(00)operator(,) integer(00)operator(,) integer(00)operator(\))operator(,) operator(-)instance_variable(@team_size)operator(])
@@ -3686,7 +3686,7 @@ ident(private)
 		ident(is_integer) operator(=) pre_constant(true)
 		ident(integer_too_long) operator(=) pre_constant(false)
 		ident(exponent) operator(=) integer(0)
-		ident(exp_counter) operator(=) operator(-)integer(1)
+		ident(exp_counter) operator(=) integer(-1)
 		ident(exp_sign) operator(=) integer(1)
 
 		ident(integer_mantisse) operator(=) instance_variable(@current_char)operator(.)ident(digit)
@@ -3722,7 +3722,7 @@ ident(private)
 			ident(is_integer) operator(=) pre_constant(false)
 			ident(read_next_char)
 			reserved(if) instance_variable(@next_char) operator(==) integer(?-)
-				ident(exp_sign) operator(=) operator(-)integer(1)
+				ident(exp_sign) operator(=) integer(-1)
 				ident(read_next_char)
 			reserved(end)
 			reserved(unless) instance_variable(@next_char)operator(.)ident(digit?)
diff --git a/test/ruby/pleac.out.raydebug b/test/ruby/pleac.out.raydebug
index c10812e..9465bcd 100644
--- a/test/ruby/pleac.out.raydebug
+++ b/test/ruby/pleac.out.raydebug
@@ -34,10 +34,10 @@ EOF)>
 
 comment(# @@PLEAC@@_1.1)
 ident(value) operator(=) ident(string)operator([)ident(offset)operator(,)ident(count)operator(])
-ident(value) operator(=) ident(string)operator([)ident(offset)operator(..)operator(-)integer(1)operator(])
+ident(value) operator(=) ident(string)operator([)ident(offset)operator(..)integer(-1)operator(])
 
 ident(string)operator([)ident(offset)operator(,)ident(count)operator(]) operator(=) ident(newstring)
-ident(string)operator([)ident(offset)operator(..)operator(-)integer(1)operator(])   operator(=) ident(newtail)
+ident(string)operator([)ident(offset)operator(..)integer(-1)operator(])   operator(=) ident(newtail)
 
 comment(# in Ruby we can also specify intervals by their two offsets)
 ident(value) operator(=) ident(string)operator([)ident(offset)operator(..)ident(offs2)operator(])
@@ -56,24 +56,24 @@ comment(#          note that 0 means 10 or 20, etc. above)
 
 ident(first)  operator(=) ident(string)operator([)integer(0)operator(,) integer(1)operator(])       comment(# "T")
 ident(start)  operator(=) ident(string)operator([)integer(5)operator(,) integer(2)operator(])       comment(# "is")
-ident(rest)   operator(=) ident(string)operator([)integer(13)operator(..)operator(-)integer(1)operator(])     comment(# "you have")
-ident(last)   operator(=) ident(string)operator([)operator(-)integer(1)operator(,) integer(1)operator(])      comment(# "e")
-ident(end_)   operator(=) ident(string)operator([)operator(-)integer(4)operator(..)operator(-)integer(1)operator(])     comment(# "have")
-ident(piece)  operator(=) ident(string)operator([)operator(-)integer(8)operator(,) integer(3)operator(])      comment(# "you")
+ident(rest)   operator(=) ident(string)operator([)integer(13)operator(..)integer(-1)operator(])     comment(# "you have")
+ident(last)   operator(=) ident(string)operator([)integer(-1)operator(,) integer(1)operator(])      comment(# "e")
+ident(end_)   operator(=) ident(string)operator([)integer(-4)operator(..)integer(-1)operator(])     comment(# "have")
+ident(piece)  operator(=) ident(string)operator([)integer(-8)operator(,) integer(3)operator(])      comment(# "you")
 
 ident(string)operator([)integer(5)operator(,) integer(2)operator(]) operator(=) string<delimiter(")content(wasn't)delimiter(")>     comment(# change "is" to "wasn't")
-ident(string)operator([)operator(-)integer(12)operator(..)operator(-)integer(1)operator(]) operator(=) string<delimiter(")content(ondrous)delimiter(")> comment(# "This wasn't wondrous")
+ident(string)operator([)integer(-12)operator(..)integer(-1)operator(]) operator(=) string<delimiter(")content(ondrous)delimiter(")> comment(# "This wasn't wondrous")
 ident(string)operator([)integer(0)operator(,) integer(1)operator(]) operator(=) string<delimiter(")delimiter(")>           comment(# delete first character)
-ident(string)operator([)operator(-)integer(10)operator(..)operator(-)integer(1)operator(])  operator(=) string<delimiter(")delimiter(")>       comment(# delete last 10 characters)
+ident(string)operator([)integer(-10)operator(..)integer(-1)operator(])  operator(=) string<delimiter(")delimiter(")>       comment(# delete last 10 characters)
 
-reserved(if) ident(string)operator([)operator(-)integer(10)operator(..)operator(-)integer(1)operator(]) operator(=)operator(~) regexp<delimiter(/)content(pattern)delimiter(/)>
+reserved(if) ident(string)operator([)integer(-10)operator(..)integer(-1)operator(]) operator(=)operator(~) regexp<delimiter(/)content(pattern)delimiter(/)>
     ident(puts) string<delimiter(")content(Pattern matches in last 10 characters)delimiter(")>
 reserved(end)
 
 ident(string)operator([)integer(0)operator(,) integer(5)operator(])operator(.)ident(gsub!)operator(()regexp<delimiter(/)content(is)delimiter(/)>operator(,) string<delimiter(')content(at)delimiter(')>operator(\))
 
 ident(a) operator(=) string<delimiter(")content(make a hat)delimiter(")>
-ident(a)operator([)integer(0)operator(,) integer(1)operator(])operator(,) ident(a)operator([)operator(-)integer(1)operator(,) integer(1)operator(]) operator(=) ident(a)operator([)operator(-)integer(1)operator(,) integer(1)operator(])operator(,) ident(a)operator([)integer(0)operator(,) integer(1)operator(])
+ident(a)operator([)integer(0)operator(,) integer(1)operator(])operator(,) ident(a)operator([)integer(-1)operator(,) integer(1)operator(]) operator(=) ident(a)operator([)integer(-1)operator(,) integer(1)operator(])operator(,) ident(a)operator([)integer(0)operator(,) integer(1)operator(])
 
 ident(a) operator(=) string<delimiter(")content(To be or not to be)delimiter(")>
 ident(b) operator(=) ident(a)operator(.)ident(unpack)operator(()string<delimiter(")content(x6 A6)delimiter(")>operator(\))
@@ -200,8 +200,8 @@ string<delimiter(")content(thIS is a loNG liNE)delimiter(")>operator(.)ident(gsu
 
 
 comment(# @@PLEAC@@_1.10)
-string<delimiter(")content(I have )inline<delimiter(#{)ident(n)operator(+)integer(1)delimiter(})>content( guanacos.)delimiter(")>
-ident(print) string<delimiter(")content(I have )delimiter(")>operator(,) ident(n)operator(+)integer(1)operator(,) string<delimiter(")content( guanacos.)delimiter(")>
+string<delimiter(")content(I have )inline<delimiter(#{)ident(n)integer(+1)delimiter(})>content( guanacos.)delimiter(")>
+ident(print) string<delimiter(")content(I have )delimiter(")>operator(,) ident(n)integer(+1)operator(,) string<delimiter(")content( guanacos.)delimiter(")>
 
 
 comment(# @@PLEAC@@_1.11)
@@ -255,7 +255,7 @@ ident(string)operator(.)ident(strip!)
 comment(# @@PLEAC@@_1.15)
 reserved(def) method(parse_csv)operator(()ident(text)operator(\))
     ident(new) operator(=) ident(text)operator(.)ident(scan)operator(()regexp<delimiter(/)content("([^)char(\\")char(\\\\)content(]*(?:)char(\\\\)content(.[^)char(\\")char(\\\\)content(]*\)*\)",?|([^,]+\),?|,)delimiter(/)>operator(\))
-    ident(new) operator(<<) pre_constant(nil) reserved(if) ident(text)operator([)operator(-)integer(1)operator(]) operator(==) integer(?,)
+    ident(new) operator(<<) pre_constant(nil) reserved(if) ident(text)operator([)integer(-1)operator(]) operator(==) integer(?,)
     ident(new)operator(.)ident(flatten)operator(.)ident(compact)
 reserved(end)  
 
@@ -363,7 +363,7 @@ ident(print)  string<delimiter(")content(Unrounded: )inline<delimiter(#{)ident(a
 ident(printf) string<delimiter(")content(Unrounded: )inline<delimiter(#{)ident(a)delimiter(})>char(\\n)content(Rounded: %.2f)char(\\n)delimiter(")>operator(,) ident(a)
 
 ident(print) string<delimiter(")content(number)char(\\t)content(int)char(\\t)content(floor)char(\\t)content(ceil)char(\\n)delimiter(")>
-ident(a) operator(=) operator([) float(3.3) operator(,) float(3.5) operator(,) float(3.7)operator(,) operator(-)float(3.3) operator(])
+ident(a) operator(=) operator([) float(3.3) operator(,) float(3.5) operator(,) float(3.7)operator(,) float(-3.3) operator(])
 reserved(for) ident(n) reserved(in) ident(a)
     ident(printf)operator(()string<delimiter(")content(% .1f)char(\\t)content(% .1f)char(\\t)content(% .1f)char(\\t)content(% .1f)char(\\n)delimiter(")>operator(,)  comment(# at least I don't fake my output :\))
            ident(n)operator(,) ident(n)operator(.)ident(to_i)operator(,) ident(n)operator(.)ident(floor)operator(,) ident(n)operator(.)ident(ceil)operator(\))
@@ -376,7 +376,7 @@ reserved(def) method(dec2bin)operator(()ident(n)operator(\))
 reserved(end)
 
 reserved(def) method(bin2dec)operator(()ident(n)operator(\))
-    operator([)operator(()string<delimiter(")content(0)delimiter(")>operator(*)integer(32)operator(+)ident(n)operator(.)ident(to_s)operator(\))operator([)operator(-)integer(32)operator(..)operator(-)integer(1)operator(])operator(])operator(.)ident(pack)operator(()string<delimiter(")content(B32)delimiter(")>operator(\))operator(.)ident(unpack)operator(()string<delimiter(")content(N)delimiter(")>operator(\))operator([)integer(0)operator(])
+    operator([)operator(()string<delimiter(")content(0)delimiter(")>operator(*)integer(32)operator(+)ident(n)operator(.)ident(to_s)operator(\))operator([)integer(-32)operator(..)integer(-1)operator(])operator(])operator(.)ident(pack)operator(()string<delimiter(")content(B32)delimiter(")>operator(\))operator(.)ident(unpack)operator(()string<delimiter(")content(N)delimiter(")>operator(\))operator([)integer(0)operator(])
 reserved(end)
 
 
@@ -459,7 +459,7 @@ reserved(end)
 
 
 comment(# @@PLEAC@@_2.7)
-ident(random) operator(=) ident(rand)operator(()ident(y)operator(-)ident(x)operator(+)integer(1)operator(\))operator(+)ident(x)
+ident(random) operator(=) ident(rand)operator(()ident(y)operator(-)ident(x)integer(+1)operator(\))operator(+)ident(x)
 
 ident(chars) operator(=) operator([)string<delimiter(")content(A)delimiter(")>operator(..)string<delimiter(")content(Z)delimiter(")>operator(,)string<delimiter(")content(a)delimiter(")>operator(..)string<delimiter(")content(z)delimiter(")>operator(,)string<delimiter(")content(0)delimiter(")>operator(..)string<delimiter(")content(9)delimiter(")>operator(])operator(.)ident(collect) operator({) operator(|)ident(r)operator(|) ident(r)operator(.)ident(to_a) operator(})operator(.)ident(join) operator(+) string<delimiter(%q()content(!@$%^&*)delimiter(\))>
 ident(password) operator(=) operator(()integer(1)operator(..)integer(8)operator(\))operator(.)ident(collect) operator({) ident(chars)operator([)ident(rand)operator(()ident(chars)operator(.)ident(size)operator(\))operator(]) operator(})operator(.)ident(pack)operator(()string<delimiter(")content(C*)delimiter(")>operator(\))
@@ -511,7 +511,7 @@ reserved(def) method(gaussian_rand)
         ident(u2) operator(=) integer(2) operator(*) ident(rand)operator(()operator(\)) operator(-) integer(1)
         ident(w) operator(=) ident(u1)operator(*)ident(u1) operator(+) ident(u2)operator(*)ident(u2)
     reserved(end) reserved(while) operator(()ident(w) operator(>)operator(=) integer(1)operator(\))
-    ident(w) operator(=) constant(Math)operator(.)ident(sqrt)operator(()operator(()operator(-)integer(2)operator(*)constant(Math)operator(.)ident(log)operator(()ident(w)operator(\))operator(\))operator(/)ident(w)operator(\))
+    ident(w) operator(=) constant(Math)operator(.)ident(sqrt)operator(()operator(()integer(-2)operator(*)constant(Math)operator(.)ident(log)operator(()ident(w)operator(\))operator(\))operator(/)ident(w)operator(\))
     operator([) ident(u2)operator(*)ident(w)operator(,) ident(u1)operator(*)ident(w) operator(])
 reserved(end)
 
@@ -599,7 +599,7 @@ ident(require) string<delimiter(')content(complex.rb)delimiter(')>
 ident(require) string<delimiter(')content(rational.rb)delimiter(')>
 
 ident(a) operator(=) constant(Complex)operator(()integer(3)operator(,) integer(5)operator(\))              comment(# 3 + 5i)
-ident(b) operator(=) constant(Complex)operator(()integer(2)operator(,) operator(-)integer(2)operator(\))             comment(# 2 - 2i)
+ident(b) operator(=) constant(Complex)operator(()integer(2)operator(,) integer(-2)operator(\))             comment(# 2 - 2i)
 ident(puts) string<delimiter(")content(c = )inline<delimiter(#{)ident(a)operator(*)ident(b)delimiter(})>delimiter(")>
 
 ident(c) operator(=) ident(a) operator(*) ident(b)
@@ -849,7 +849,7 @@ reserved(class) class(MailHopDelta)
     reserved(end)
 
     reserved(def) method(hop_time)operator(()ident(secs)operator(\))
-        ident(sign) operator(=) ident(secs) operator(<) integer(0) operator(?) operator(-)integer(1) operator(:) integer(1)
+        ident(sign) operator(=) ident(secs) operator(<) integer(0) operator(?) integer(-1) operator(:) integer(1)
         ident(days)operator(,) ident(secs) operator(=) ident(secs)operator(.)ident(abs)operator(.)ident(divmod)operator(()integer(60) operator(*) integer(60) operator(*) integer(24)operator(\))
         ident(hours)operator(,)ident(secs) operator(=) ident(secs)operator(.)ident(abs)operator(.)ident(divmod)operator(()integer(60) operator(*) integer(60)operator(\))
         ident(mins)operator(,) ident(secs) operator(=) ident(secs)operator(.)ident(abs)operator(.)ident(divmod)operator(()integer(60)operator(\))
@@ -903,7 +903,7 @@ reserved(def) method(commify_series)operator(()ident(arr)operator(\))
         reserved(when) integer(0) reserved(then) string<delimiter(')delimiter(')>
         reserved(when) integer(1) reserved(then) ident(arr)operator([)integer(0)operator(])
         reserved(when) integer(2) reserved(then) ident(arr)operator(.)ident(join)operator(()string<delimiter(')content( and )delimiter(')>operator(\))
-        reserved(else) ident(arr)operator([)integer(0)operator(..)operator(-)integer(2)operator(])operator(.)ident(join)operator(()string<delimiter(')content(, )delimiter(')>operator(\)) operator(+) string<delimiter(')content(, and )delimiter(')> operator(+) ident(arr)operator([)operator(-)integer(1)operator(])
+        reserved(else) ident(arr)operator([)integer(0)operator(..)integer(-2)operator(])operator(.)ident(join)operator(()string<delimiter(')content(, )delimiter(')>operator(\)) operator(+) string<delimiter(')content(, and )delimiter(')> operator(+) ident(arr)operator([)integer(-1)operator(])
     reserved(end)
 reserved(end)
 
@@ -929,7 +929,7 @@ reserved(def) method(commify_series)operator(()ident(arr)operator(\))
         reserved(when) integer(0) reserved(then) string<delimiter(')delimiter(')>
         reserved(when) integer(1) reserved(then) ident(arr)operator([)integer(0)operator(])
         reserved(when) integer(2) reserved(then) ident(arr)operator(.)ident(join)operator(()string<delimiter(')content( and )delimiter(')>operator(\))
-        reserved(else) ident(arr)operator([)integer(0)operator(..)operator(-)integer(2)operator(])operator(.)ident(join)operator(()ident(sepchar)operator(\)) operator(+) ident(sepchar) operator(+) string<delimiter(')content(and )delimiter(')> operator(+) ident(arr)operator([)operator(-)integer(1)operator(])
+        reserved(else) ident(arr)operator([)integer(0)operator(..)integer(-2)operator(])operator(.)ident(join)operator(()ident(sepchar)operator(\)) operator(+) ident(sepchar) operator(+) string<delimiter(')content(and )delimiter(')> operator(+) ident(arr)operator([)integer(-1)operator(])
     reserved(end)
 reserved(end)
 
@@ -953,9 +953,9 @@ reserved(end)
 comment(# @@PLEAC@@_4.3)
 comment(#   (note: AFAIK Ruby doesn't allow gory change of Array length\))
 comment(# grow the array by assigning nil to past the end of array)
-ident(ary)operator([)ident(new_size)operator(-)integer(1)operator(]) operator(=) pre_constant(nil)
+ident(ary)operator([)ident(new_size)integer(-1)operator(]) operator(=) pre_constant(nil)
 comment(# shrink the array by slicing it down)
-ident(ary)operator(.)ident(slice!)operator(()ident(new_size)operator(..)operator(-)integer(1)operator(\))
+ident(ary)operator(.)ident(slice!)operator(()ident(new_size)operator(..)integer(-1)operator(\))
 comment(# init the array with given size)
 constant(Array)operator(.)ident(new)operator(()ident(number_of_elems)operator(\))
 comment(# assign to an element past the original end enlarges the array)
@@ -1082,7 +1082,7 @@ comment(# remove n elements from front of ary (shift n\))
 ident(front) operator(=) ident(ary)operator(.)ident(slice!)operator(()integer(0)operator(,) ident(n)operator(\))
 
 comment(# remove n elements from the end of ary (pop n\))
-ident(end_) operator(=) ident(ary)operator(.)ident(slice!)operator(()operator(-)ident(n) operator(..) operator(-)integer(1)operator(\))
+ident(end_) operator(=) ident(ary)operator(.)ident(slice!)operator(()operator(-)ident(n) operator(..) integer(-1)operator(\))
 
 comment(# let's extend the Array class, to make that useful)
 reserved(class) class(Array)
@@ -1090,7 +1090,7 @@ reserved(class) class(Array)
         ident(slice!)operator(()integer(0) operator(..) integer(1)operator(\))     comment(# more symetric with pop2...)
     reserved(end)
     reserved(def) method(pop2)operator(()operator(\))
-        ident(slice!)operator(()operator(-)integer(2) operator(..) operator(-)integer(1)operator(\))
+        ident(slice!)operator(()integer(-2) operator(..) integer(-1)operator(\))
     reserved(end)
 reserved(end)
 
@@ -1129,7 +1129,7 @@ comment(# you may specify another sort method:)
 ident(sorted) operator(=) ident(unsorted)operator(.)ident(sort) operator({) operator(|)ident(a)operator(,)ident(b)operator(|) ident(a)operator(.)ident(to_f) operator(<=>) ident(b)operator(.)ident(to_f) operator(})
 
 comment(# let's use the list of my own PID's)
-shell<delimiter(`)content(ps ux)delimiter(`)>operator(.)ident(split)operator(()string<delimiter(")char(\\n)delimiter(")>operator(\))operator([)integer(1)operator(..)operator(-)integer(1)operator(])operator(.)
+shell<delimiter(`)content(ps ux)delimiter(`)>operator(.)ident(split)operator(()string<delimiter(")char(\\n)delimiter(")>operator(\))operator([)integer(1)operator(..)integer(-1)operator(])operator(.)
     ident(select) operator({) operator(|)ident(i)operator(|) ident(i) operator(=)operator(~) regexp<delimiter(/)content(^)inline<delimiter(#{)constant(ENV)operator([)string<delimiter(')content(USER)delimiter(')>operator(])delimiter(})>delimiter(/)> operator(})operator(.)
     ident(collect) operator({) operator(|)ident(i)operator(|) ident(i)operator(.)ident(split)operator([)integer(1)operator(]) operator(})operator(.)
     ident(sort) operator({) operator(|)ident(a)operator(,)ident(b)operator(|) ident(a)operator(.)ident(to_i) operator(<=>) ident(b)operator(.)ident(to_i) operator(})operator(.)ident(each) operator({) operator(|)ident(i)operator(|) ident(puts) ident(i) operator(})
@@ -1207,8 +1207,8 @@ reserved(end)
 
 comment(# @@PLEAC@@_4.17)
 reserved(def) method(fisher_yates_shuffle)operator(()ident(a)operator(\))
-    operator(()ident(a)operator(.)ident(size)operator(-)integer(1)operator(\))operator(.)ident(downto)operator(()integer(1)operator(\)) operator({) operator(|)ident(i)operator(|)
-        ident(j) operator(=) ident(rand)operator(()ident(i)operator(+)integer(1)operator(\))
+    operator(()ident(a)operator(.)ident(size)integer(-1)operator(\))operator(.)ident(downto)operator(()integer(1)operator(\)) operator({) operator(|)ident(i)operator(|)
+        ident(j) operator(=) ident(rand)operator(()ident(i)integer(+1)operator(\))
         ident(a)operator([)ident(i)operator(])operator(,) ident(a)operator([)ident(j)operator(]) operator(=) ident(a)operator([)ident(j)operator(])operator(,) ident(a)operator([)ident(i)operator(]) reserved(if) ident(i) operator(!=) ident(j)
     operator(})
 reserved(end)
@@ -1252,7 +1252,7 @@ reserved(class) class(WordFormatter)
         comment(# now process each item, picking out proper piece for this position)
         integer(0)operator(.)ident(upto)operator(()ident(rows) operator(*) ident(columns) operator(-) integer(1)operator(\)) operator({) operator(|)ident(item)operator(|)
             ident(target) operator(=) operator(()ident(item) operator(%) ident(columns)operator(\)) operator(*) ident(rows) operator(+) operator(()ident(item) operator(/) ident(columns)operator(\))
-            ident(eol) operator(=) operator(()operator(()ident(item)operator(+)integer(1)operator(\)) operator(%) ident(columns) operator(==) integer(0)operator(\))
+            ident(eol) operator(=) operator(()operator(()ident(item)integer(+1)operator(\)) operator(%) ident(columns) operator(==) integer(0)operator(\))
             ident(piece) operator(=) ident(wordlist)operator([)ident(target)operator(]) operator(||) string<delimiter(")delimiter(")>
             ident(piece) operator(=) ident(piece)operator(.)ident(ljust)operator(()ident(collen)operator(\)) reserved(unless) ident(eol)
             ident(print) ident(piece)
@@ -1936,7 +1936,7 @@ ident(fishes)operator(.)ident(gsub)operator(()regexp<delimiter(/)content(
 operator(})
 
 ident(pond) operator(=) string<delimiter(')content(One fish two fish red fish blue fish swim here.)delimiter(')>
-ident(puts) string<delimiter(")content(Last fish is )inline<delimiter(#{)ident(pond)operator(.)ident(scan)operator(()regexp<delimiter(/)char(\\b)content(()char(\\w)content(+\))char(\\s)content(+fish)char(\\b)delimiter(/)modifier(i)>operator(\))operator(.)ident(flatten)operator([)operator(-)integer(1)operator(])delimiter(})>delimiter(")>
+ident(puts) string<delimiter(")content(Last fish is )inline<delimiter(#{)ident(pond)operator(.)ident(scan)operator(()regexp<delimiter(/)char(\\b)content(()char(\\w)content(+\))char(\\s)content(+fish)char(\\b)delimiter(/)modifier(i)>operator(\))operator(.)ident(flatten)operator([)integer(-1)operator(])delimiter(})>delimiter(")>
 
 regexp<delimiter(/)content(
     A               # find some pattern A
@@ -3178,7 +3178,7 @@ ident(puts) string<delimiter(")content(I'm )inline<delimiter(#{)ident(pos)delimi
 comment(#-----------------------------)
 ident(logfile)operator(.)ident(seek)operator(()integer(0)operator(,) constant(IO)operator(::)constant(SEEK_END)operator(\))
 ident(datafile)operator(.)ident(seek)operator(()ident(pos)operator(\))  comment(#  IO::SEEK_SET is the default)
-ident(out)operator(.)ident(seek)operator(()operator(-)integer(20)operator(,) constant(IO)operator(::)constant(SEEK_CUR)operator(\))
+ident(out)operator(.)ident(seek)operator(()integer(-20)operator(,) constant(IO)operator(::)constant(SEEK_CUR)operator(\))
 comment(#-----------------------------)
 ident(written) operator(=) ident(datafile)operator(.)ident(syswrite)operator(()ident(mystring)operator(\))
 ident(raise) constant(RunTimeError) reserved(unless) ident(written) operator(==) ident(mystring)operator(.)ident(length)
@@ -3563,7 +3563,7 @@ ident(puts) string<delimiter(")inline<delimiter(#{)ident(argv)operator(.)ident(j
 
 ident(require) string<delimiter(')content(find)delimiter(')>
 ident(argv) operator(=) pre_constant(ARGV)operator(.)ident(empty?) operator(?) string<delimiter(%w{)content(.)delimiter(})> operator(:) pre_constant(ARGV)
-ident(saved_size)operator(,) ident(saved_name) operator(=) operator(-)integer(1)operator(,) string<delimiter(")delimiter(")>
+ident(saved_size)operator(,) ident(saved_name) operator(=) integer(-1)operator(,) string<delimiter(")delimiter(")>
 constant(Find)operator(.)ident(find)operator(()operator(*)ident(argv)operator(\)) reserved(do) operator(|)ident(file)operator(|)
   ident(size) operator(=) ident(test)operator(()integer(?s)operator(,) ident(file)operator(\)) operator(||) integer(0)
   reserved(next) reserved(unless) ident(test)operator(()integer(?f)operator(,) ident(file)operator(\)) operator(&&) ident(size) operator(>) ident(saved_size)
@@ -4092,7 +4092,7 @@ reserved(class) class(Mailbox) operator(<) constant(Array)
     comment(# reads mails from open file and stores them)
     reserved(def) method(read)operator(()ident(file)operator(\))
         global_variable($INPUT_RECORD_SEPARATOR) operator(=) string<delimiter(')delimiter(')>  comment(# paragraph reads)
-        ident(msgno) operator(=) operator(-)integer(1)
+        ident(msgno) operator(=) integer(-1)
         ident(file)operator(.)ident(each) operator({) operator(|)ident(para)operator(|)
             reserved(if) ident(para) operator(=)operator(~) regexp<delimiter(/)content(^From)delimiter(/)>
                 ident(mail) operator(=) constant(Mail)operator(.)ident(new)
@@ -4819,7 +4819,7 @@ reserved(class) class(Person)
     reserved(def) method(method_missing)operator(()ident(namesymbol)operator(,) operator(*)ident(params)operator(\))
         ident(name) operator(=) ident(namesymbol)operator(.)ident(to_s)
         reserved(return) reserved(if) ident(name) operator(=)operator(~) regexp<delimiter(/)content(^A-Z)delimiter(/)>
-        reserved(if) ident(name)operator(.)ident(to_s)operator([)operator(-)integer(1)operator(]) operator(==) operator(()string<delimiter(')content(=)delimiter(')>operator([)integer(0)operator(])operator(\))       comment(# we have a setter)
+        reserved(if) ident(name)operator(.)ident(to_s)operator([)integer(-1)operator(]) operator(==) operator(()string<delimiter(')content(=)delimiter(')>operator([)integer(0)operator(])operator(\))       comment(# we have a setter)
             ident(isSetter) operator(=) pre_constant(true)
             ident(name)operator(.)ident(sub!)operator(()regexp<delimiter(/)content(=$)delimiter(/)>operator(,) string<delimiter(')delimiter(')>operator(\))
         reserved(end)
@@ -5256,7 +5256,7 @@ ident(lines)operator(.)ident(tie)operator(()ident(filename)operator(,) constant(
     comment(# print the records in order.)
     comment(# Opposed to perl, the tied array behaves exactly as a normal array)
     ident(puts) string<delimiter(")char(\\n)content(Original)delimiter(")>
-    reserved(for) ident(i) reserved(in) integer(0)operator(..)operator(()ident(lines)operator(.)ident(length)operator(-)integer(1)operator(\))
+    reserved(for) ident(i) reserved(in) integer(0)operator(..)operator(()ident(lines)operator(.)ident(length)integer(-1)operator(\))
         ident(puts) string<delimiter(")inline<delimiter(#{)ident(i)delimiter(})>content(: )inline<delimiter(#{)ident(lines)operator([)ident(i)operator(])delimiter(})>delimiter(")>
     reserved(end)
 
@@ -5505,7 +5505,7 @@ ident(values) operator(=) operator(()integer(1)operator(..)integer(5)operator(\)
 reserved(for) ident(i) reserved(in) ident(values)
     ident(max) operator(=) ident(i) reserved(if) ident(max) operator(<) ident(i)
 reserved(end)
-ident(ratio) operator(=) constant(Float)operator(()ident(ws_col)operator(-)integer(12)operator(\))operator(/)ident(max)          comment(# chars per unit)
+ident(ratio) operator(=) constant(Float)operator(()ident(ws_col)integer(-12)operator(\))operator(/)ident(max)          comment(# chars per unit)
 reserved(for) ident(i) reserved(in) ident(values)
     ident(printf) string<delimiter(")content(%8.1f %s)char(\\n)delimiter(")>operator(,) ident(i)operator(,) string<delimiter(")content(*)delimiter(")> operator(*) operator(()ident(ratio)operator(*)ident(i)operator(\))
 reserved(end)
@@ -5812,7 +5812,7 @@ constant(Signal)operator(.)ident(list)operator(.)ident(each) operator({) operato
 
 comment(# @@PLEAC@@_16.14)
 constant(Process)operator(.)ident(kill)operator(()integer(9)operator(,) ident(pid)operator(\))                    comment(# send $pid a signal 9)
-constant(Process)operator(.)ident(kill)operator(()operator(-)integer(1)operator(,) constant(Process)operator(.)ident(getpgrp)operator(()operator(\))operator(\))     comment(# send whole job a signal 1)
+constant(Process)operator(.)ident(kill)operator(()integer(-1)operator(,) constant(Process)operator(.)ident(getpgrp)operator(()operator(\))operator(\))     comment(# send whole job a signal 1)
 constant(Process)operator(.)ident(kill)operator(()string<delimiter(")content(USR1)delimiter(")>operator(,) global_variable($$)operator(\))                comment(# send myself a SIGUSR1)
 constant(Process)operator(.)ident(kill)operator(()string<delimiter(")content(HUP)delimiter(")>operator(,) ident(pid1)operator(,) ident(pid2)operator(,) ident(pid3)operator(\))   comment(# send a SIGHUP to processes in @pids)
 comment(#-----------------------------)
diff --git a/test/ruby/sidebarize.out.raydebug b/test/ruby/sidebarize.out.raydebug
index adaec34..f9c3662 100644
--- a/test/ruby/sidebarize.out.raydebug
+++ b/test/ruby/sidebarize.out.raydebug
@@ -94,7 +94,7 @@ comment(# uses code by murphy extended with iconv conversion)
 reserved(def) method(convert_entity)operator(()ident(text)operator(\))
     ident(text) operator(=) constant(Iconv)operator(.)ident(new)operator(()string<delimiter(')content(iso-8859-15)delimiter(')>operator(,) string<delimiter(')content(utf-8)delimiter(')>operator(\))operator(.)ident(iconv)operator(()ident(text)operator(\)) 
     
-    ident(feed) operator(=) ident(text)operator(.)ident(inspect)operator([)integer(1)operator(...)operator(-)integer(1)operator(])
+    ident(feed) operator(=) ident(text)operator(.)ident(inspect)operator([)integer(1)operator(...)integer(-1)operator(])
 
     ident(feed)operator(.)ident(gsub!)operator(()regexp<delimiter(/)char(\\\\)content(([0-7]+\)|(.\))delimiter(/)modifier(m)>operator(\)) reserved(do)
         reserved(if) global_variable($2)
diff --git a/test/ruby/strange.out.raydebug b/test/ruby/strange.out.raydebug
index 6186f7b..8a9137c 100644
--- a/test/ruby/strange.out.raydebug
+++ b/test/ruby/strange.out.raydebug
@@ -1,10 +1,10 @@
-ident(a)operator(.)ident(each)operator({)operator(|)ident(el)operator(|)ident(anz)operator([)ident(el)operator(])operator(=)ident(anz)operator([)ident(el)operator(])operator(?)ident(anz)operator([)ident(el)operator(])operator(+)integer(1)operator(:)integer(1)operator(})
+ident(a)operator(.)ident(each)operator({)operator(|)ident(el)operator(|)ident(anz)operator([)ident(el)operator(])operator(=)ident(anz)operator([)ident(el)operator(])operator(?)ident(anz)operator([)ident(el)operator(])integer(+1)operator(:)integer(1)operator(})
 reserved(while) ident(x)operator(<)integer(10000)
 comment(#a bis f dienen dazu die Nachbarschaft festzulegen. Man stelle sich die #Zahl von 1 bis 64 im Binärcode vor 1 bedeutet an 0 aus)
   ident(b)operator(=)operator(()ident(p)operator([)ident(x)operator(])operator(%)integer(32)operator(\))operator(/)integer(16)operator(<)integer(1) operator(?) integer(0) operator(:) integer(1)
 
-  operator(()ident(x)operator(-)integer(102)operator(>)operator(=)integer(0)operator(?) ident(n)operator([)ident(x)operator(-)integer(102)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(a)operator(+)operator(()ident(x)operator(-)integer(101)operator(>)operator(=)integer(0)operator(?)ident(n)operator([)ident(x)operator(-)integer(101)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(e)operator(+)ident(n)operator([)ident(x)operator(-)integer(100)operator(])operator(.)ident(to_i)operator(+)operator(()ident(x)operator(-)integer(99)operator(>)operator(=)integer(0)operator(?) ident(n)operator([)ident(x)operator(-)integer(99)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(f)operator(+)operator(()ident(x)operator(-)integer(98)operator(>)operator(=)integer(0)operator(?) ident(n)operator([)ident(x)operator(-)integer(98)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(a)operator(+)
-  ident(n)operator([)ident(x)operator(+)integer(199)operator(])operator(.)ident(to_i)operator(*)ident(b)operator(+)ident(n)operator([)ident(x)operator(+)integer(200)operator(])operator(.)ident(to_i)operator(*)ident(d)operator(+)ident(n)operator([)ident(x)operator(+)integer(201)operator(])operator(.)ident(to_i)operator(*)ident(b)
+  operator(()ident(x)integer(-102)operator(>)operator(=)integer(0)operator(?) ident(n)operator([)ident(x)integer(-102)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(a)operator(+)operator(()ident(x)integer(-101)operator(>)operator(=)integer(0)operator(?)ident(n)operator([)ident(x)integer(-101)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(e)operator(+)ident(n)operator([)ident(x)integer(-100)operator(])operator(.)ident(to_i)operator(+)operator(()ident(x)integer(-99)operator(>)operator(=)integer(0)operator(?) ident(n)operator([)ident(x)integer(-99)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(f)operator(+)operator(()ident(x)integer(-98)operator(>)operator(=)integer(0)operator(?) ident(n)operator([)ident(x)integer(-98)operator(])operator(.)ident(to_i) operator(:) integer(0)operator(\))operator(*)ident(a)operator(+)
+  ident(n)operator([)ident(x)integer(+199)operator(])operator(.)ident(to_i)operator(*)ident(b)operator(+)ident(n)operator([)ident(x)integer(+200)operator(])operator(.)ident(to_i)operator(*)ident(d)operator(+)ident(n)operator([)ident(x)integer(+201)operator(])operator(.)ident(to_i)operator(*)ident(b)
 
 comment(#und die Ausgabe folgt)
 ident(g)operator(=)string<delimiter(%w{)delimiter(})>
@@ -125,11 +125,11 @@ comment(#           license ( http://www.ruby-lang.org/en/LICENSE.txt \))
    global_variable($e)operator(=)string<delimiter(")delimiter(")>
 
 reserved(def) method(a)operator(()operator(\))
-   global_variable($a)operator(=)global_variable($a)operator(+)integer(1)
+   global_variable($a)operator(=)global_variable($a)integer(+1)
 reserved(end)
 
 reserved(def) method(b)operator(()operator(\))
-   global_variable($a)operator(=)global_variable($a)operator(+)integer(5)
+   global_variable($a)operator(=)global_variable($a)integer(+5)
 reserved(end)
 
 reserved(def) method(c)operator(()operator(\))
@@ -141,7 +141,7 @@ reserved(def) method(d)operator(()operator(\))
 reserved(end)
 
 reserved(def) method(e)operator(()operator(\))
-   global_variable($a)operator(=)global_variable($a)operator(+)integer(16)
+   global_variable($a)operator(=)global_variable($a)integer(+16)
 reserved(end)
 
 ident(d)operator(;)ident(e)operator(;)ident(b)operator(;)ident(a)operator(;)ident(a)operator(;)ident(a)operator(;)ident(a)operator(;)ident(a)operator(;)ident(c)operator(;)ident(d)operator(;)ident(e)operator(;)ident(e)operator(;)ident(e)operator(;)ident(e)operator(;)ident(e)operator(;)ident(e)operator(;)ident(b)operator(;)ident(a)operator(;)ident(a)operator(;)ident(a)operator(;)ident(a)operator(;)ident(c)operator(;)ident(d)operator(;)ident(e)operator(;)ident(e)operator(;)ident(e)operator(;)ident(a)operator(;)ident(a)operator(;)ident(a)operator(;)ident(c)operator(;)ident(d)operator(;)ident(e)operator(;)ident(e)operator(;)ident(b)operator(;)ident(b)operator(;)
@@ -206,10 +206,10 @@ n,p,a= ")char(\\#)nesting_delimiter({)content(q.do)inline<delimiter(#{)string<de
 inject(''\))nesting_delimiter({)content(|m,v|v.length>1?m+v.to_i.chr: m+v)nesting_delimiter(})content("\);o)inline<delimiter(#{)string<delimiter(%w{)content(e P)delimiter(})>operator(.)ident(sort)operator(.)ident(join)operator(.)ident(downcase)
 delimiter(})>content(n("http://www.)char(\\#)nesting_delimiter({)content(n)nesting_delimiter(})content("\))nesting_delimiter({)content(|w|$F=w.read.sc)char(\\x61)content(n(/li>.+?"([^"]+\)..([^<]+\)/\))nesting_delimiter(})content(;)char(\\160)content(uts)char(\\
 )content(")char(\\#)nesting_delimiter({)content(q)nesting_delimiter(})char(\\n)char(\\n)content(";$F.)char(\\145)char(\\141)content(ch)nesting_delimiter({)content(|e|i=e[0][/)char(\\\\)content(d+/];s="%2s.  %s"%[i,e[1]];i.to_i%2==0 ?
-)char(\\160)content(ut)char(\\x73)content((s\) : )inline<delimiter(#{)string<delimiter(%w{)content(s p)delimiter(})>operator([)operator(-)integer(1)operator(])delimiter(})>content(rint("%-38s  "%s\))nesting_delimiter(})content(;p)char(\\x72)char(\\x69)char(\\x6e)content(t")char(\\n)content(?  ";e)char(\\x76)content(al(
+)char(\\160)content(ut)char(\\x73)content((s\) : )inline<delimiter(#{)string<delimiter(%w{)content(s p)delimiter(})>operator([)integer(-1)operator(])delimiter(})>content(rint("%-38s  "%s\))nesting_delimiter(})content(;p)char(\\x72)char(\\x69)char(\\x6e)content(t")char(\\n)content(?  ";e)char(\\x76)content(al(
 ['puts")char(\\n)char(\\#)nesting_delimiter({)content(l[0..3])nesting_delimiter(})content(ing...)char(\\n)char(\\n)content("','$c=gets.chomp.to_i'].sort.join(";"\)\);)inline<delimiter(#{)integer(111)operator(.)ident(chr)
 delimiter(})>content(pen("http://www.)char(\\#)nesting_delimiter({)content(n)nesting_delimiter(})content("+$F[$c-1][0]\))nesting_delimiter({)content(|n|$_=n.read[/^)char(\\\\)content(s+<span.+/m];)inline<delimiter(#{)operator(()string<delimiter(')content(a)delimiter(')>operator(..)string<delimiter(")content(z)delimiter(")>operator(\))operator(.)
-ident(to_a)operator([)integer(10)operator(-)integer(5)operator(*)integer(2)operator(])delimiter(})>content(.e)char(\\141)content(ch)nesting_delimiter({)content(|(z,f\)|)char(\\x67)content(sub!(z,f\))nesting_delimiter(})content(;)char(\\147)content(sub!(/&()char(\\\\)content(w+\);/\))nesting_delimiter({)content(|y|p.
+ident(to_a)operator([)integer(10)integer(-5)operator(*)integer(2)operator(])delimiter(})>content(.e)char(\\141)content(ch)nesting_delimiter({)content(|(z,f\)|)char(\\x67)content(sub!(z,f\))nesting_delimiter(})content(;)char(\\147)content(sub!(/&()char(\\\\)content(w+\);/\))nesting_delimiter({)content(|y|p.
 ke)char(\\171)char(\\077)content(($1\)?p[$1]:y)nesting_delimiter(})content(;while$_=~/([^)char(\\n)content(])nesting_delimiter({)content(81,)nesting_delimiter(})content(\)/:z=$1.dup;f=$1.dup;f[f.rindex(
 " ",80\),1]=")char(\\n)content(";f.s)char(\\165)content(b!(/)char(\\n)content([ )char(\\t)content(]+/,")char(\\n)content("\);s)char(\\165)content(b!(/)char(\\#)nesting_delimiter({)content(R)char(\\x65)content(g)char(\\x65)content(xp.
 )char(\\x65)content(scap)char(\\x65)content((z\))nesting_delimiter(})content(/,f\)end)nesting_delimiter(})content(;while)char(\\040)char(\\163)content(ub!(/^(?:[^)char(\\n)content(]*)char(\\n)content(\))nesting_delimiter({)content(20)nesting_delimiter(})content(/, ""\):puts")char(\\#)content($&
@@ -298,20 +298,20 @@ ident(c)operator(,)ident(d)operator(=)ident(a)  operator([)integer(1)   operator
 ident(call)operator(()      ident(e)operator(+)ident(b)operator([)  integer(0)operator(])   operator(,)ident(c)operator(*)      ident(e)operator(/)ident(d)operator(+)ident(b)     operator([)integer(1)operator(])operator(\))operator(})operator(;)reserved(end)operator(;)constant(V)operator(=)integer(0)operator(;)reserved(def) method(bo)operator(&)ident(u)
 global_variable($u)operator(||=)  constant(V)operator(;)   operator(;)global_variable($u)  operator(+=)   integer(1)operator(+)constant(V)  operator(;)operator(;)   reserved(return) ident(u)operator(.)ident(call) reserved(if)global_variable($u)operator(>)integer(1)operator(;)ident(q)operator(=)float(128.0)
 operator(;)ident(x)operator(=)operator(()constant(V)  operator(..)   integer(255)  operator(\))operator(.)   ident(map)  operator({)operator(|)   ident(y)operator(|)ident(f1)operator(,)ident(z) operator(=)ident(sin)operator(()ident(y)operator(.)ident(to_f)operator(*)constant(PI)operator(/)ident(q)operator(\))operator(,)
-ident(sin)operator(()operator(()  ident(y)operator(.)   ident(to_f)    operator(+) integer(200)      operator(\))operator(*)constant(PI)operator(/)operator(()   ident(q)operator(\))operator(\))operator(;)operator([)operator(()ident(f1)operator(*)float(30.0)operator(+)float(110.0)operator(\))operator(.)
-ident(to_i)operator(,)operator(()operator(()ident(f1)operator(+)ident(z)operator(\))operator(*)float(10.0)operator(+)float(40.0)operator(\))operator(.)ident(to_i)operator(,)operator(()ident(z)operator(*)float(20.0)operator(+)float(120.0)operator(\))operator(.)ident(to_i)operator(])operator(})operator(;)constant(Y)operator(.)ident(times)operator({)operator(|)ident(i)operator(|)constant(X)operator(.)
-ident(times)operator({)operator(|)ident(j)operator(|)ident(i1)operator(=)operator(()operator(()ident(i)operator(*)float(0.3)operator(+)integer(150)operator(\))operator(*)operator(()ident(j)operator(*)float(1.1)operator(+)integer(50)operator(\))operator(/)float(50.0)operator(\))operator(.)ident(to_i)operator(;)ident(i2)operator(=)operator(()operator(()ident(i)operator(*)float(0.8)operator(+)integer(510)operator(\))operator(*)operator(()
-ident(j)operator(*)float(0.9)operator(+)integer(1060)operator(\))operator(/)float(51.0)operator(\))operator(.)ident(to_i)operator(;)global_variable($s)operator([)ident(i)operator(])operator([)ident(j)operator(])operator(=)ident(x)operator([)operator(()ident(i1)operator(*)ident(i2)operator(\))operator(%)integer(255)operator(])operator(.)ident(clone)operator(})operator(})operator(;)global_variable($a)operator(=)operator(()integer(0)operator(..)integer(25)operator(\))operator(.)
+ident(sin)operator(()operator(()  ident(y)operator(.)   ident(to_f)    operator(+) integer(200)      operator(\))operator(*)constant(PI)operator(/)operator(()   ident(q)operator(\))operator(\))operator(;)operator([)operator(()ident(f1)operator(*)float(30.0)float(+110.0)operator(\))operator(.)
+ident(to_i)operator(,)operator(()operator(()ident(f1)operator(+)ident(z)operator(\))operator(*)float(10.0)float(+40.0)operator(\))operator(.)ident(to_i)operator(,)operator(()ident(z)operator(*)float(20.0)float(+120.0)operator(\))operator(.)ident(to_i)operator(])operator(})operator(;)constant(Y)operator(.)ident(times)operator({)operator(|)ident(i)operator(|)constant(X)operator(.)
+ident(times)operator({)operator(|)ident(j)operator(|)ident(i1)operator(=)operator(()operator(()ident(i)operator(*)float(0.3)integer(+150)operator(\))operator(*)operator(()ident(j)operator(*)float(1.1)integer(+50)operator(\))operator(/)float(50.0)operator(\))operator(.)ident(to_i)operator(;)ident(i2)operator(=)operator(()operator(()ident(i)operator(*)float(0.8)integer(+510)operator(\))operator(*)operator(()
+ident(j)operator(*)float(0.9)integer(+1060)operator(\))operator(/)float(51.0)operator(\))operator(.)ident(to_i)operator(;)global_variable($s)operator([)ident(i)operator(])operator([)ident(j)operator(])operator(=)ident(x)operator([)operator(()ident(i1)operator(*)ident(i2)operator(\))operator(%)integer(255)operator(])operator(.)ident(clone)operator(})operator(})operator(;)global_variable($a)operator(=)operator(()integer(0)operator(..)integer(25)operator(\))operator(.)
 ident(inject)operator(()operator([)operator(])operator(\))operator({)operator(|)ident(a)operator(,)ident(i)operator(|)ident(a)operator(<<)operator(()constant(V)operator(..)integer(3)operator(\))operator(.)ident(inject)operator(()operator([)operator(])operator(\))operator({)operator(|)ident(r)operator(,)ident(j)operator(|)ident(r)operator(<<)global_variable($c)operator([)ident(i)operator(*)integer(4)operator(+)ident(j)operator(])operator(})operator(})operator(;)ident(u)operator(.)ident(call)operator(;)reserved(end)
 constant(I)operator(=)constant(LocalJumpError)operator(;)reserved(def) method(run)operator(*)ident(a)operator(,)operator(&)ident(b)operator(;)reserved(return) reserved(if) ident(a)operator(.)ident(size)operator(==)constant(V)operator(;)reserved(if) ident(a)operator([)constant(V)operator(])operator(==)integer(666)operator(;)global_variable($b)operator(=)ident(b)
 reserved(elsif)global_variable($b)operator(;)global_variable($b)operator(.)ident(call)operator(;)reserved(end)operator(;)reserved(end)operator(;)reserved(def) method(main) ident(s)operator(,)operator(&)ident(u)operator(;)global_variable($m)operator(=)constant(V)operator(;)ident(u)operator(.)ident(call) reserved(rescue) constant(I)operator(;)reserved(end)
 reserved(def) method(rb_eval_string)operator(()operator(*)ident(a)operator(\))operator(;)reserved(end)     comment(# you promised not to look here)
-reserved(def) method(ruby_init)operator(;)ident(q)operator(=)float(2.0)operator(;)ident(l)operator(=)operator(()operator(()constant(X)operator(**)ident(q)operator(\))operator(*)constant(A)operator(+)operator(()constant(Y)operator(**)ident(q)operator(\))operator(*)constant(A)operator(\))operator(**)constant(A)operator(;)constant(V)operator(.)ident(upto)operator(()constant(Y)operator(-)integer(4)operator(\))operator({)operator(|)ident(s)operator(|)constant(V)operator(.)
-ident(upto)operator(()constant(X)operator(-)integer(4)operator(\))operator({)operator(|)ident(q)operator(|)ident(d)operator(=)operator(()operator(()ident(q)operator(-)constant(X)operator(/)constant(A)operator(\))operator(**)ident(q)operator(+)operator(()ident(s)operator(-)constant(Y)operator(/)constant(A)operator(\))operator(**)ident(q)operator(\))operator(**)constant(A)operator(;)ident(e)operator(=)operator(()ident(cos)operator(()ident(d)operator(*)constant(PI)operator(/)operator(()ident(l)operator(/)ident(q)operator(\))operator(\))operator(/)ident(q)
-operator(+)constant(A)operator(\))operator(*)float(3.0)operator(+)float(1.0)operator(;)ident(v)operator(=)integer(2)operator(;)ident(f)operator(=)ident(v)operator(/)ident(e)operator(;)ident(a)operator(,)ident(p)operator(,)ident(b)operator(=)global_variable($s)operator([)ident(s)operator(])operator(,)global_variable($s)operator([)ident(s)operator(+)integer(1)operator(])operator(,)global_variable($s)operator([)ident(s)operator(+)ident(v)operator(])operator(;)ident(r)operator(=)ident(a)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(*)ident(e)operator(+)
-ident(p)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(+)ident(a)operator([)ident(q)operator(+)integer(1)operator(])operator([)constant(V)operator(])operator(+)ident(b)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(+)ident(a)operator([)ident(q)operator(+)ident(v)operator(])operator([)constant(V)operator(])operator(+)ident(b)operator([)ident(q)operator(+)ident(v)operator(/)ident(v)operator(])operator([)constant(V)operator(])operator(+)ident(p)operator([)ident(q)operator(+)ident(v)operator(])operator([)constant(V)operator(])operator(+)ident(b)operator([)ident(q)operator(+)
+reserved(def) method(ruby_init)operator(;)ident(q)operator(=)float(2.0)operator(;)ident(l)operator(=)operator(()operator(()constant(X)operator(**)ident(q)operator(\))operator(*)constant(A)operator(+)operator(()constant(Y)operator(**)ident(q)operator(\))operator(*)constant(A)operator(\))operator(**)constant(A)operator(;)constant(V)operator(.)ident(upto)operator(()constant(Y)integer(-4)operator(\))operator({)operator(|)ident(s)operator(|)constant(V)operator(.)
+ident(upto)operator(()constant(X)integer(-4)operator(\))operator({)operator(|)ident(q)operator(|)ident(d)operator(=)operator(()operator(()ident(q)operator(-)constant(X)operator(/)constant(A)operator(\))operator(**)ident(q)operator(+)operator(()ident(s)operator(-)constant(Y)operator(/)constant(A)operator(\))operator(**)ident(q)operator(\))operator(**)constant(A)operator(;)ident(e)operator(=)operator(()ident(cos)operator(()ident(d)operator(*)constant(PI)operator(/)operator(()ident(l)operator(/)ident(q)operator(\))operator(\))operator(/)ident(q)
+operator(+)constant(A)operator(\))operator(*)float(3.0)float(+1.0)operator(;)ident(v)operator(=)integer(2)operator(;)ident(f)operator(=)ident(v)operator(/)ident(e)operator(;)ident(a)operator(,)ident(p)operator(,)ident(b)operator(=)global_variable($s)operator([)ident(s)operator(])operator(,)global_variable($s)operator([)ident(s)integer(+1)operator(])operator(,)global_variable($s)operator([)ident(s)operator(+)ident(v)operator(])operator(;)ident(r)operator(=)ident(a)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(*)ident(e)operator(+)
+ident(p)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(+)ident(a)operator([)ident(q)integer(+1)operator(])operator([)constant(V)operator(])operator(+)ident(b)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(+)ident(a)operator([)ident(q)operator(+)ident(v)operator(])operator([)constant(V)operator(])operator(+)ident(b)operator([)ident(q)operator(+)ident(v)operator(/)ident(v)operator(])operator([)constant(V)operator(])operator(+)ident(p)operator([)ident(q)operator(+)ident(v)operator(])operator([)constant(V)operator(])operator(+)ident(b)operator([)ident(q)operator(+)
 ident(v)operator(])operator([)constant(V)operator(])operator(*)ident(f)operator(;)ident(g)operator(=)operator([)ident(a)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(,)ident(b)operator([)ident(q)operator(])operator([)constant(V)operator(])operator(,)ident(a)operator([)ident(q)operator(+)ident(v)operator(])operator([)constant(V)operator(])operator(,)ident(b)operator([)ident(q)operator(+)ident(v)operator(])operator([)constant(V)operator(])operator(])operator(;)ident(h)operator(=)operator(()ident(g)operator(.)ident(max)operator(-)ident(g)operator(.)ident(min)
-operator(\))operator(*)ident(f)operator(;)global_variable($s)operator([)ident(s)operator(])operator([)ident(q)operator(])operator([)constant(V)operator(])operator(=)operator([)operator([)operator(()ident(r)operator(/)operator(()ident(e)operator(+)ident(f)operator(+)float(6.0)operator(\))operator(+)constant(A)operator(+)operator(()ident(h)operator(*)float(0.4)operator(\))operator(\))operator(.)ident(to_i)operator(,)integer(255)operator(])operator(.)ident(min)operator(,)constant(V)operator(])operator(.)ident(max)
+operator(\))operator(*)ident(f)operator(;)global_variable($s)operator([)ident(s)operator(])operator([)ident(q)operator(])operator([)constant(V)operator(])operator(=)operator([)operator([)operator(()ident(r)operator(/)operator(()ident(e)operator(+)ident(f)float(+6.0)operator(\))operator(+)constant(A)operator(+)operator(()ident(h)operator(*)float(0.4)operator(\))operator(\))operator(.)ident(to_i)operator(,)integer(255)operator(])operator(.)ident(min)operator(,)constant(V)operator(])operator(.)ident(max)
 operator(})operator(})operator(;)constant(File)operator(.)ident(open)operator(()string<delimiter(")content(res.ppm)delimiter(")>operator(,)string<delimiter(")content(w+)delimiter(")>operator(\))operator({)operator(|)ident(f)operator(|)ident(f)operator(.)ident(write)operator(()comment(# secret.greetings :-\))
 string<delimiter(")content(P3)char(\\n)content(# res.ppm)char(\\n)inline<delimiter(#{)constant(X)delimiter(})>content( )inline<delimiter(#{)constant(Y)delimiter(})>char(\\n)content(255)char(\\n)delimiter(")>operator(+)global_variable($s)operator(.)ident(map)operator({)operator(|)ident(a)operator(|)ident(a)operator(.)ident(map)operator({)operator(|)ident(b)operator(|)ident(b)operator(.)ident(join)string<delimiter(')content( )delimiter(')>
 operator(})operator(.)ident(join)operator(()string<delimiter(')content( )delimiter(')>operator(\))operator(+)string<delimiter(")char(\\n)delimiter(")>operator(})operator(.)ident(join)operator(\))operator(})operator(;)reserved(end)operator(;)reserved(def) method(switch) ident(i)operator(,)operator(&)ident(b)operator(;)ident(b)operator(.)ident(call)operator(;)reserved(return) reserved(unless)
@@ -319,7 +319,7 @@ reserved(defined?)operator(()global_variable($m)operator(\))operator(;)ident(b)o
 ident(a)operator(=)global_variable($a)operator(.)ident(map)operator({)operator(|)operator(()ident(f)operator(,)ident(g)operator(,)ident(h)operator(,)ident(j)operator(\))operator(|)operator([)ident(f)operator(*)ident(d)operator(,)ident(g)operator(*)ident(e)operator(,)ident(h)operator(*)ident(d)operator(,)ident(j)operator(*)ident(e)operator(])operator(})operator(;)ident(a)operator(.)ident(each)operator({)operator(|)operator(()ident(k)operator(,)ident(l)operator(,)ident(m)operator(,)ident(n)operator(\))operator(|)ident(u)operator(()global_variable($s)operator(,)operator(()ident(k)operator(*)constant(X)
 operator(\))operator(.)ident(to_i)operator(+)ident(b)operator(+)ident(i)operator(,)operator(()ident(l)operator(*)constant(Y)operator(\))operator(.)ident(to_i)operator(+)ident(c)operator(+)ident(i)operator(,)operator(()ident(m)operator(*)constant(X)operator(\))operator(.)ident(to_i)operator(+)ident(b)operator(+)ident(i)operator(,)operator(()ident(n)operator(*)constant(Y)operator(\))operator(.)ident(to_i)operator(+)ident(c)operator(+)ident(i)operator(,)operator([)constant(Z)operator(])operator(*)integer(3)operator(\))operator(})
 ident(a)operator(.)ident(each)operator({)operator(|)operator(()ident(o)operator(,)ident(q)operator(,)ident(r)operator(,)ident(s)operator(\))operator(|)ident(u)operator(()global_variable($s)operator(,)operator(()ident(o)operator(*)operator(()constant(X)operator(-)constant(Z)operator(\))operator(\))operator(.)ident(to_i)operator(+)ident(i)operator(,)operator(()ident(q)operator(*)operator(()constant(Y)operator(-)constant(Z)operator(\))operator(\))operator(.)ident(to_i)operator(+)ident(i)operator(,)operator(()ident(r)operator(*)operator(()constant(X)operator(-)
-constant(Z)operator(\))operator(\))operator(.)ident(to_i)operator(+)ident(i)operator(,)operator(()ident(s)operator(*)operator(()constant(Y)operator(-)constant(Z)operator(\))operator(\))operator(.)ident(to_i)operator(+)ident(i)operator(,)operator([)operator(()integer(1)operator(<<)integer(8)operator(\))operator(-)integer(1)operator(])operator(*)integer(3)operator(\))operator(})operator(;)reserved(end)operator(;)constant(Q)operator(=)constant(Object)operator(;)reserved(class)
+constant(Z)operator(\))operator(\))operator(.)ident(to_i)operator(+)ident(i)operator(,)operator(()ident(s)operator(*)operator(()constant(Y)operator(-)constant(Z)operator(\))operator(\))operator(.)ident(to_i)operator(+)ident(i)operator(,)operator([)operator(()integer(1)operator(<<)integer(8)operator(\))integer(-1)operator(])operator(*)integer(3)operator(\))operator(})operator(;)reserved(end)operator(;)constant(Q)operator(=)constant(Object)operator(;)reserved(class)
 class(Regexp)operator(;)reserved(def) method([]=)operator(()ident(v)operator(,)ident(is)operator(\))operator(;)ident(is)operator(.)ident(each)operator({)operator(|)ident(s)operator(|)constant(Q)operator(.)ident(send)operator(()symbol(:remove_const)operator(,)ident(s)operator(\))reserved(if) constant(Q)operator(.)
 ident(const_defined?) ident(s)operator(;)constant(Q)operator(.)ident(const_set)operator(()ident(s)operator(,)ident(v)operator(\))operator(})operator(;)reserved(end)operator(;)reserved(end)operator(;)reserved(def) method(int)operator(*)ident(ptr)operator(;)integer(666)
 reserved(end)operator(;)reserved(class) class(O)operator(;)reserved(def) method([]=)operator(()ident(a)operator(,)ident(b)operator(=)pre_constant(nil)operator(\))operator(;)global_variable($c)operator(=)ident(a)operator(;)reserved(end)operator(;)reserved(end)operator(;)reserved(alias)symbol(:void)symbol(:goto)
diff --git a/test/suite.rb b/test/suite.rb
index e8d93de..ef3e2fb 100644
--- a/test/suite.rb
+++ b/test/suite.rb
@@ -66,7 +66,7 @@ class CodeRaySuite < TestCase
 						File.open(computed, 'w') { |f| f.write result }
 						print `gvimdiff #{output} #{computed}` if $DEBUG
 					end
-					assert(ok, "Scan error: #{computed} != #{output}")
+					assert(ok, "Scan error: #{computed} != #{output}") unless $DEBUG
 				else
 					File.open(output, 'w') do |f| f.write result end
 					puts "New test: #{output}"
-- 
cgit v1.2.1