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.

1 files changed, 14 insertions, 14 deletions

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?)