Improved Ruby scanner (see #147 and Changes.textile.)

1 files changed, 34 insertions, 34 deletions

diff --git a/test/scanners/ruby/pleac.expected.raydebug b/test/scanners/ruby/pleac.expected.raydebug
index 021b8c3..778433c 100644
--- a/test/scanners/ruby/pleac.expected.raydebug
+++ b/test/scanners/ruby/pleac.expected.raydebug
@@ -290,7 +290,7 @@ reserved(def) method(login_names)
 reserved(end)
 
 ident(puts) string<delimiter(")content(Lookup user: )delimiter(")>
-ident(user) operator(=) constant(STDIN)operator(.)ident(gets)
+ident(user) operator(=) pre_constant(STDIN)operator(.)ident(gets)
 ident(user)operator(.)ident(chomp!)
 ident(exit) reserved(unless) ident(user)
 ident(name_code) operator(=) constant(Text)operator(::)constant(Soundex)operator(.)ident(soundex)operator(()ident(user)operator(\))
@@ -427,7 +427,7 @@ reserved(class) class(Integer)
         ident(roman)
     reserved(end)
     
-    reserved(def) constant(Integer)operator(.)ident(from_roman)operator(()ident(roman)operator(\))
+    reserved(def) constant(Integer)operator(.)method(from_roman)operator(()ident(roman)operator(\))
         ident(ustr) operator(=) ident(roman)operator(.)ident(upcase)
         ident(sum) operator(=) integer(0)
         reserved(for) ident(entry) reserved(in) class_variable(@@romanlist)
@@ -539,22 +539,22 @@ ident(tan_val) operator(=) constant(Math)operator(.)ident(tan)operator(()ident(a
 comment(# AFAIK Ruby's Math module doesn't provide acos/asin)
 comment(# While we're at it, let's also define missing hyperbolic functions)
 reserved(module) class(Math)
-    reserved(def) constant(Math)operator(.)ident(asin)operator(()ident(x)operator(\))
+    reserved(def) constant(Math)operator(.)method(asin)operator(()ident(x)operator(\))
         ident(atan2)operator(()ident(x)operator(,) ident(sqrt)operator(()integer(1) operator(-) ident(x)operator(**)integer(2)operator(\))operator(\))
     reserved(end)
-    reserved(def) constant(Math)operator(.)ident(acos)operator(()ident(x)operator(\))
+    reserved(def) constant(Math)operator(.)method(acos)operator(()ident(x)operator(\))
         ident(atan2)operator(()ident(sqrt)operator(()integer(1) operator(-) ident(x)operator(**)integer(2)operator(\))operator(,) ident(x)operator(\))
     reserved(end)
-    reserved(def) constant(Math)operator(.)ident(atan)operator(()ident(x)operator(\))
+    reserved(def) constant(Math)operator(.)method(atan)operator(()ident(x)operator(\))
         ident(atan2)operator(()ident(x)operator(,) integer(1)operator(\))
     reserved(end)
-    reserved(def) constant(Math)operator(.)ident(sinh)operator(()ident(x)operator(\))
+    reserved(def) constant(Math)operator(.)method(sinh)operator(()ident(x)operator(\))
         operator(()ident(exp)operator(()ident(x)operator(\)) operator(-) ident(exp)operator(()operator(-)ident(x)operator(\))operator(\)) operator(/) integer(2)
     reserved(end)
-    reserved(def) constant(Math)operator(.)ident(cosh)operator(()ident(x)operator(\))
+    reserved(def) constant(Math)operator(.)method(cosh)operator(()ident(x)operator(\))
         operator(()ident(exp)operator(()ident(x)operator(\)) operator(+) ident(exp)operator(()operator(-)ident(x)operator(\))operator(\)) operator(/) integer(2)
     reserved(end)
-    reserved(def) constant(Math)operator(.)ident(tanh)operator(()ident(x)operator(\))
+    reserved(def) constant(Math)operator(.)method(tanh)operator(()ident(x)operator(\))
         ident(sinh)operator(()ident(x)operator(\)) operator(/) ident(cosh)operator(()ident(x)operator(\))
     reserved(end)
 reserved(end)
@@ -980,8 +980,8 @@ reserved(for) ident(user) reserved(in) ident(bad_users)
     ident(complain)operator(()ident(user)operator(\))
 reserved(end)
 
-reserved(for) ident(var) reserved(in) constant(ENV)operator(.)ident(keys)operator(.)ident(sort)
-    ident(puts) string<delimiter(")inline<inline_delimiter(#{)ident(var)inline_delimiter(})>content(=)inline<inline_delimiter(#{)constant(ENV)operator([)ident(var)operator(])inline_delimiter(})>delimiter(")>
+reserved(for) ident(var) reserved(in) pre_constant(ENV)operator(.)ident(keys)operator(.)ident(sort)
+    ident(puts) string<delimiter(")inline<inline_delimiter(#{)ident(var)inline_delimiter(})>content(=)inline<inline_delimiter(#{)pre_constant(ENV)operator([)ident(var)operator(])inline_delimiter(})>delimiter(")>
 reserved(end)
 
 reserved(for) ident(user) reserved(in) ident(all_users)
@@ -1011,7 +1011,7 @@ reserved(end)
 comment(# same drawback as in problem 1.4, we can't mutate a Numeric...)
 ident(array)operator(.)ident(collect!) operator({) operator(|)ident(v)operator(|) ident(v) operator(-) integer(1) operator(})
 
-ident(a) operator(=) operator([) operator(.)integer(5)operator(,) integer(3) operator(])operator(;) ident(b) operator(=) operator([) integer(0)operator(,) integer(1) operator(])
+ident(a) operator(=) operator([) operator(.)error(5)operator(,) integer(3) operator(])operator(;) ident(b) operator(=) operator([) integer(0)operator(,) integer(1) operator(])
 reserved(for) ident(ary) reserved(in) operator([) ident(a)operator(,) ident(b) operator(])
     ident(ary)operator(.)ident(collect!) operator({) operator(|)ident(v)operator(|) ident(v) operator(*) integer(7) operator(})
 reserved(end)
@@ -1130,7 +1130,7 @@ ident(sorted) operator(=) ident(unsorted)operator(.)ident(sort) operator({) oper
 
 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(..)integer(-1)operator(])operator(.)
-    ident(select) operator({) operator(|)ident(i)operator(|) ident(i) operator(=)operator(~) regexp<delimiter(/)content(^)inline<inline_delimiter(#{)constant(ENV)operator([)string<delimiter(')content(USER)delimiter(')>operator(])inline_delimiter(})>delimiter(/)> operator(})operator(.)
+    ident(select) operator({) operator(|)ident(i)operator(|) ident(i) operator(=)operator(~) regexp<delimiter(/)content(^)inline<inline_delimiter(#{)pre_constant(ENV)operator([)string<delimiter(')content(USER)delimiter(')>operator(])inline_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(})
 ident(puts) string<delimiter(")content(Select a process ID to kill:)delimiter(")>
@@ -1331,7 +1331,7 @@ comment(# we use a class with a class variable store the private cache)
 comment(# for the results of the factorial function.)
 reserved(class) class(Factorial)
     class_variable(@@fact) operator(=) operator([) integer(1) operator(])
-    reserved(def) constant(Factorial)operator(.)ident(compute)operator(()ident(n)operator(\))
+    reserved(def) constant(Factorial)operator(.)method(compute)operator(()ident(n)operator(\))
         reserved(if) class_variable(@@fact)operator([)ident(n)operator(])
             class_variable(@@fact)operator([)ident(n)operator(])
         reserved(else)
@@ -2592,9 +2592,9 @@ comment(#-----------------------------)
 constant(Dear) ident(someuser)instance_variable(@host)operator(.)ident(com)operator(,)
 
 constant(Please) ident(confirm) ident(the) ident(mail) ident(address) ident(you) ident(gave) ident(us) constant(Wed) constant(May)  integer(6) integer(09)operator(:)integer(38)operator(:)integer(41)
-constant(MDT) integer(1998) ident(by) ident(replying) ident(to) ident(this) ident(message)operator(.)  constant(Include) ident(the) ident(string)
+constant(MDT) integer(1998) ident(by) ident(replying) ident(to) ident(this) ident(message)operator(.)  ident(Include) ident(the) ident(string)
 string<delimiter(")content(Rumpelstiltskin)delimiter(")> reserved(in) ident(that) ident(reply)operator(,) ident(but) ident(spelled) reserved(in) ident(reverse)operator(;) ident(that) ident(is)operator(,)
-ident(start) ident(with) string<delimiter(")content(Nik...)delimiter(")>operator(.)  constant(Once) ident(this) ident(is) ident(done)operator(,) ident(your) ident(confirmed) ident(address) ident(will)
+ident(start) ident(with) string<delimiter(")content(Nik...)delimiter(")>operator(.)  ident(Once) ident(this) ident(is) ident(done)operator(,) ident(your) ident(confirmed) ident(address) ident(will)
 ident(be) ident(entered) ident(into) ident(our) ident(records)operator(.)
 
 
@@ -2672,7 +2672,7 @@ regexp<delimiter(%r/)content(^([01]?)char(\\d)char(\\d)content(|2[0-4])char(\\d)
 comment(#-----------------------------)
 ident(str)operator(.)ident(sub!)operator(()regexp<delimiter(%r|)content(^.*/)delimiter(|)>operator(,) string<delimiter(')delimiter(')>operator(\))
 comment(#-----------------------------)
-ident(cols) operator(=) operator(() operator(()constant(ENV)operator([)string<delimiter(')content(TERMCAP)delimiter(')>operator(]) operator(||) string<delimiter(")content( )delimiter(")>operator(\)) operator(=)operator(~) regexp<delimiter(/)content(:co#()char(\\d)content(+\):)delimiter(/)> operator(\)) operator(?) global_variable($1) operator(:) integer(80)operator(;)
+ident(cols) operator(=) operator(() operator(()pre_constant(ENV)operator([)string<delimiter(')content(TERMCAP)delimiter(')>operator(]) operator(||) string<delimiter(")content( )delimiter(")>operator(\)) operator(=)operator(~) regexp<delimiter(/)content(:co#()char(\\d)content(+\):)delimiter(/)> operator(\)) operator(?) global_variable($1) operator(:) integer(80)operator(;)
 comment(#-----------------------------)
 ident(name) operator(=) string<delimiter(")content( )inline<inline_delimiter(#{)global_variable($0)inline_delimiter(})>content( )inline<inline_delimiter(#{)pre_constant(ARGV)inline_delimiter(})>delimiter(")>operator(.)ident(gsub)operator(()regexp<delimiter(%r|)content( /)char(\\S)content(+/)delimiter(|)>operator(,) string<delimiter(')content( )delimiter(')>operator(\))
 comment(#-----------------------------)
@@ -3028,7 +3028,7 @@ reserved(while) ident(gets)
     ident(gsub!)operator(()regexp<delimiter(/)content(DATE)delimiter(/)>operator(\))operator({)constant(Time)operator(.)ident(now)operator(})
     ident(print) 
 reserved(end)
-global_variable($stdout) operator(=) constant(STDOUT)
+global_variable($stdout) operator(=) pre_constant(STDOUT)
 comment(#-----------------------------)
 comment(#% ruby -i.old -pe 'gsub!(%r{\\bhisvar\\b}, 'hervar'\)' *.[Cchy])
 
@@ -3393,7 +3393,7 @@ reserved(if) pre_constant(ARGV)operator(.)ident(length) operator(!=) integer(1)
 reserved(end)
 ident(file) operator(=) pre_constant(ARGV)operator([)integer(0)operator(])
 ident(atime)operator(,) ident(mtime) operator(=) constant(File)operator(.)ident(stat)operator(()ident(file)operator(\))operator(.)ident(atime)operator(,) constant(File)operator(.)ident(stat)operator(()ident(file)operator(\))operator(.)ident(mtime)
-ident(system)operator(()constant(ENV)operator([)string<delimiter(")content(EDITOR)delimiter(")>operator(]) operator(||) string<delimiter(")content(vi)delimiter(")>operator(,) ident(file)operator(\))
+ident(system)operator(()pre_constant(ENV)operator([)string<delimiter(")content(EDITOR)delimiter(")>operator(]) operator(||) string<delimiter(")content(vi)delimiter(")>operator(,) ident(file)operator(\))
 constant(File)operator(.)ident(utime)operator(()ident(atime)operator(,) ident(mtime)operator(,) ident(file)operator(\))
 comment(#-----------------------------)
 
@@ -3422,7 +3422,7 @@ ident(filenames)operator(.)ident(each) reserved(do) operator(|)ident(file)operat
   reserved(end)
 reserved(end)
 reserved(if) ident(count) operator(!=) ident(filenames)operator(.)ident(length)
-  constant(STDERR)operator(.)ident(puts) string<delimiter(")content(could only delete )inline<inline_delimiter(#{)ident(count)inline_delimiter(})>content( of )inline<inline_delimiter(#{)ident(filenames)operator(.)ident(length)inline_delimiter(})>content( files)delimiter(")>
+  pre_constant(STDERR)operator(.)ident(puts) string<delimiter(")content(could only delete )inline<inline_delimiter(#{)ident(count)inline_delimiter(})>content( of )inline<inline_delimiter(#{)ident(filenames)operator(.)ident(length)inline_delimiter(})>content( files)delimiter(")>
 reserved(end)
 
 
@@ -3848,15 +3848,15 @@ comment(# In Ruby, it can be written as a static method and a static)
 comment(# variable)
 reserved(class) class(Counter)
     class_variable(@@counter) operator(=) integer(0)
-    reserved(def) constant(Counter)operator(.)ident(next_counter)operator(;) class_variable(@@counter) operator(+=) integer(1)operator(;) reserved(end)
+    reserved(def) constant(Counter)operator(.)method(next_counter)operator(;) class_variable(@@counter) operator(+=) integer(1)operator(;) reserved(end)
 reserved(end)
 
 comment(# There is no need of BEGIN since the variable will get)
 comment(# initialized when parsing)
 reserved(class) class(Counter)
     class_variable(@@counter) operator(=) integer(42)
-    reserved(def) constant(Counter)operator(.)ident(next_counter)operator(;) class_variable(@@counter) operator(+=) integer(1)operator(;) reserved(end)
-    reserved(def) constant(Counter)operator(.)ident(prev_counter)operator(;) class_variable(@@counter) operator(-=) integer(1)operator(;) reserved(end)
+    reserved(def) constant(Counter)operator(.)method(next_counter)operator(;) class_variable(@@counter) operator(+=) integer(1)operator(;) reserved(end)
+    reserved(def) constant(Counter)operator(.)method(prev_counter)operator(;) class_variable(@@counter) operator(-=) integer(1)operator(;) reserved(end)
 reserved(end)
 
 
@@ -4297,7 +4297,7 @@ reserved(module) class(Your_Module)
         comment(# this would be called as Your_Module.function)
     reserved(end)
     
-    reserved(def) constant(Your_Module)operator(.)ident(another)
+    reserved(def) constant(Your_Module)operator(.)method(another)
         comment(# this is the same as above, but more specific)
     reserved(end)
 reserved(end)
@@ -4495,7 +4495,7 @@ reserved(class) class(Person)
     reserved(end)
     
     comment(# Class method (also called static method\))
-    reserved(def) constant(Person)operator(.)ident(number_of_people)
+    reserved(def) constant(Person)operator(.)method(number_of_people)
         class_variable(@@person_counter)
     reserved(end)
 reserved(end)
@@ -4562,7 +4562,7 @@ reserved(class) class(MyClass)
         constant(ObjectSpace)operator(.)ident(define_finalizer)operator(()pre_constant(self)operator(,)
                                      pre_constant(self)operator(.)ident(class)operator(.)ident(method)operator(()symbol(:finalize)operator(\))operator(.)ident(to_proc)operator(\))
     reserved(end)
-    reserved(def) constant(MyClass)operator(.)ident(finalize)operator(()ident(id)operator(\))
+    reserved(def) constant(MyClass)operator(.)method(finalize)operator(()ident(id)operator(\))
         ident(puts) string<delimiter(")content(Object )inline<inline_delimiter(#{)ident(id)inline_delimiter(})>content( dying at )inline<inline_delimiter(#{)constant(Time)operator(.)ident(new)inline_delimiter(})>delimiter(")>
     reserved(end)
 reserved(end)
@@ -4604,7 +4604,7 @@ reserved(class) class(Person)
     comment(# Class variables (also called static attributes\) are prefixed by @@)
     class_variable(@@person_counter) operator(=) integer(0)
     
-    reserved(def) constant(Person)operator(.)ident(population)
+    reserved(def) constant(Person)operator(.)method(population)
         class_variable(@@person_counter)
     reserved(end)
     reserved(def) method(initialize)
@@ -4612,7 +4612,7 @@ reserved(class) class(Person)
         constant(ObjectSpace)operator(.)ident(define_finalizer)operator(()pre_constant(self)operator(,)
                                      pre_constant(self)operator(.)ident(class)operator(.)ident(method)operator(()symbol(:finalize)operator(\))operator(.)ident(to_proc)operator(\))
     reserved(end)
-    reserved(def) constant(Person)operator(.)ident(finalize)operator(()ident(id)operator(\))
+    reserved(def) constant(Person)operator(.)method(finalize)operator(()ident(id)operator(\))
         class_variable(@@person_counter) operator(-=) integer(1)
     reserved(end)
 reserved(end)
@@ -4644,7 +4644,7 @@ reserved(class) class(FixedArray)
     reserved(end)
     comment(# class method. This can only be called on a class,)
     comment(# but not on the instances)
-    reserved(def) constant(FixedArray)operator(.)ident(class_max_bounds)operator(=)operator(()ident(value)operator(\))
+    reserved(def) constant(FixedArray)operator(.)method(class_max_bounds=)operator(()ident(value)operator(\))
         class_variable(@@max_bounds) operator(=) ident(value)
     reserved(end)
 reserved(end)
@@ -4879,11 +4879,11 @@ reserved(class) class(RingNode)
                                      pre_constant(self)operator(.)ident(class)operator(.)ident(method)operator(()symbol(:finalize)operator(\))operator(.)ident(to_proc)operator(\))
     reserved(end)
 
-    reserved(def) constant(RingNode)operator(.)ident(finalize)operator(()ident(id)operator(\))
+    reserved(def) constant(RingNode)operator(.)method(finalize)operator(()ident(id)operator(\))
         ident(puts) string<delimiter(")content(Node )inline<inline_delimiter(#{)ident(id)inline_delimiter(})>content( dying)delimiter(")>
     reserved(end)
 
-    reserved(def) constant(RingNode)operator(.)ident(show_all_objects)
+    reserved(def) constant(RingNode)operator(.)method(show_all_objects)
         constant(ObjectSpace)operator(.)ident(each_object) operator({)operator(|)ident(id)operator(|)
             ident(puts) ident(id)operator(.)ident(name) reserved(if) ident(id)operator(.)ident(class) operator(==) constant(RingNode)
         operator(})
@@ -5642,7 +5642,7 @@ reserved(while) ident(gets)operator(()operator(\)) reserved(do)
     ident(print)
 reserved(end)
 comment(#-----------------------------)
-integer(1)operator(:) operator(>) constant(Welcome) ident(to) constant(Linux)operator(,) ident(version) float(2.0)operator(.)integer(33) ident(on) ident(a) ident(i686)
+integer(1)operator(:) operator(>) constant(Welcome) ident(to) constant(Linux)operator(,) ident(version) float(2.0)operator(.)error(33) ident(on) ident(a) ident(i686)
 
 integer(2)operator(:) operator(>) 
 
@@ -5650,7 +5650,7 @@ integer(3)operator(:) operator(>)     string<delimiter(")content(The software re
 
 4: >      so I installed Linux.)delimiter(")>  
 comment(#-----------------------------)
-operator(>) integer(1)operator(:) constant(Welcome) ident(to) constant(Linux)operator(,) constant(Kernel) ident(version) float(2.0)operator(.)integer(33) ident(on) ident(a) ident(i686)
+operator(>) integer(1)operator(:) constant(Welcome) ident(to) constant(Linux)operator(,) constant(Kernel) ident(version) float(2.0)operator(.)error(33) ident(on) ident(a) ident(i686)
 
 operator(>) integer(2)operator(:) 
 
@@ -5985,7 +5985,7 @@ reserved(class) class(Preforker)
             operator(()instance_variable(@prefork) operator(-) instance_variable(@child_count)operator(\))operator(.)ident(times) operator({) operator(|)ident(i)operator(|)
                 ident(make_new_child)
             operator(})
-            ident(sleep) operator(.)integer(1)
+            ident(sleep) operator(.)error(1)
         operator(})
     reserved(end)
 reserved(end)
@@ -6267,7 +6267,7 @@ doctype(#!/usr/bin/ruby)
 comment(# os_snipe - redirect to a Jargon File entry about current OS)
 ident(dir) operator(=) string<delimiter(')content(http://www.elsewhere.org/jargon/html/entry)delimiter(')>
 
-ident(agent) operator(=) constant(ENV)operator([)string<delimiter(')content(HTTP_USER_AGENT)delimiter(')>operator(])
+ident(agent) operator(=) pre_constant(ENV)operator([)string<delimiter(')content(HTTP_USER_AGENT)delimiter(')>operator(])
 
 ident(page) operator(=) reserved(case)
     reserved(when) ident(agent) operator(=)operator(~) regexp<delimiter(/)content(Mac)delimiter(/)>operator(:) string<delimiter(')content(Macintrash.html)delimiter(')>