From ec08216346b0d73b9118dbf498cff675924d40b0 Mon Sep 17 00:00:00 2001 From: murphy Date: Wed, 18 Oct 2006 10:28:21 +0000 Subject: Fixed warning in bench.rb. Ruby Scanner: improved handling of ambiguos values. - operator methods are now :ident instead of :operator - fancy_allowed and regexp_allowed are now value_expected - value_expected works in operator method calls - tests enhanced and adjusted Scanner tests: new diffed option, diff doesn't imply noassert anymore --- test/scanners/ruby/evil.expected.raydebug | 76 +++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) (limited to 'test/scanners/ruby/evil.expected.raydebug') diff --git a/test/scanners/ruby/evil.expected.raydebug b/test/scanners/ruby/evil.expected.raydebug index b1e3231..5518de0 100644 --- a/test/scanners/ruby/evil.expected.raydebug +++ b/test/scanners/ruby/evil.expected.raydebug @@ -4,10 +4,10 @@ reserved(class) class(Class) reserved(end) reserved(end) comment(#def String(x\) x.to_s end #it's already built-in. duh!) -reserved(def) constant(String)operator(.)operator(*)operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)ident(right)operator(]) reserved(end) -reserved(def) constant(String)operator(.)operator(<<)operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)symbol(:<<)operator(,)ident(right)operator(]) reserved(end) -reserved(def) constant(String)operator(.)operator(/)operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)symbol(:/)operator(,)ident(right)operator(]) reserved(end) -reserved(def) constant(String)operator(.)operator([])operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)symbol(:[])operator(,)ident(right)operator(]) reserved(end) +reserved(def) constant(String)operator(.)ident(*)operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)ident(right)operator(]) reserved(end) +reserved(def) constant(String)operator(.)ident(<<)operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)symbol(:<<)operator(,)ident(right)operator(]) reserved(end) +reserved(def) constant(String)operator(.)ident(/)operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)symbol(:/)operator(,)ident(right)operator(]) reserved(end) +reserved(def) constant(String)operator(.)ident([])operator(()ident(right)operator(\)) operator([)pre_constant(self)operator(,)symbol(:[])operator(,)ident(right)operator(]) reserved(end) ident(p)operator(()constant(String)operator(::)constant(Class)operator(\)) ident(p)operator(()constant(String)operator(::) constant(Class)operator(\)) ident(p)operator(()constant(String) operator(::)constant(Class)operator(\)) @@ -78,15 +78,15 @@ pre_constant(false) operator(?) ident(P?)operator(:) ident(p8) ident(P?) symbol(:p8) pre_constant(false) operator(?) ident(P?) operator(:) ident(p8) -pre_constant(self)operator(.)operator([])symbol(:p8) -pre_constant(false) operator(?) pre_constant(self)operator(.)operator([])operator(:) ident(p8) -pre_constant(self)operator(.)operator([]) symbol(:p8) -pre_constant(false) operator(?) pre_constant(self)operator(.)operator([]) operator(:) ident(p8) +pre_constant(self)operator(.)ident([])symbol(:p8) +pre_constant(false) operator(?) pre_constant(self)operator(.)ident([])operator(:) ident(p8) +pre_constant(self)operator(.)ident([]) symbol(:p8) +pre_constant(false) operator(?) pre_constant(self)operator(.)ident([]) operator(:) ident(p8) -pre_constant(self)operator(.)operator(<=>)symbol(:p8) -pre_constant(false) operator(?) pre_constant(self)operator(.)operator(<=>)operator(:) ident(p8) -pre_constant(self)operator(.)operator(<=>) symbol(:p8) -pre_constant(false) operator(?) pre_constant(self)operator(.)operator(<=>) operator(:) ident(p8) +pre_constant(self)operator(.)ident(<=>)symbol(:p8) +pre_constant(false) operator(?) pre_constant(self)operator(.)ident(<=>)operator(:) ident(p8) +pre_constant(self)operator(.)ident(<=>) symbol(:p8) +pre_constant(false) operator(?) pre_constant(self)operator(.)ident(<=>) operator(:) ident(p8) pre_constant(self) operator(<=>)symbol(:p8) comment(#false ? self <=>: p8 #gives ruby indigestion) @@ -390,9 +390,9 @@ reserved(def) method(`)operator(()ident(s)operator(\)) reserved(end) reserved(end) -integer(69)operator(.)operator(`)operator(()stringoperator(\)) +integer(69)operator(.)ident(`)operator(()stringoperator(\)) -integer(79)operator(::)operator(`)operator(()stringoperator(\)) +integer(79)operator(::)ident(`)operator(()stringoperator(\)) ident(p) symbol(:`) @@ -402,8 +402,8 @@ 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) +reserved(def) pre_constant(nil)operator(.)ident(+)operator(()ident(x)operator(\)) operator(~)ident(x) reserved(end) +reserved(def) pre_constant(nil)operator(.)ident([])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) integer(+5) operator(\)) ident(p)operator(() ident(p)integer(+5) operator(\)) @@ -417,28 +417,28 @@ reserved(class) class(Foou) 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([])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 comment(#value)string comment(#value)string -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([]) string comment(#value) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) operator(/)integer(9)operator(/) comment(#value) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])global_variable($9) comment(#value) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])ident(a0) comment(#value) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) global_variable($9) comment(#value) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) ident(a0) comment(#value) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([])operator({)integer(9)operator(}) comment(#lambda (op\)) -ident(p) constant(Foou)operator(.)ident(new)operator(.)operator([]) operator({)integer(9)operator(}) comment(#lambda (op\)) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([])operator(%)integer(9) comment(#op) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([])operator(/)integer(9) comment(#op) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([]) string comment(#value) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([]) regexp comment(#value) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([])global_variable($9) comment(#value) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([])ident(a0) comment(#value) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([]) global_variable($9) comment(#value) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([]) ident(a0) comment(#value) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([])operator({)integer(9)operator(}) comment(#lambda (op\)) +ident(p) constant(Foou)operator(.)ident(new)operator(.)ident([]) operator({)integer(9)operator(}) comment(#lambda (op\)) reserved(if) ident(p) reserved(then) ident(p) reserved(end) @@ -768,7 +768,7 @@ reserved(end) EOL)> reserved(def) method(add)operator(()operator(*)ident(args)operator(\)) - pre_constant(self)operator(.)operator(<<)operator(()operator(*)ident(args)operator(\)) + pre_constant(self)operator(.)ident(<<)operator(()operator(*)ident(args)operator(\)) reserved(end) @@ -841,7 +841,7 @@ reserved(def) method(yy)operator(;)reserved(yield) reserved(end) ident(block)operator(=)ident(proc)operator({)ident(p) stringoperator(}) ident(yy) operator(&)ident(block) -ident(p)operator(()integer(1)operator(.)operator(+)integer(1)operator(\)) +ident(p)operator(()integer(1)operator(.)ident(+)integer(1)operator(\)) ident(p) ident(pppp) reserved(module) class(M66) -- cgit v1.2.1