From 457f919fe5ba7456f08fc493dc0ec70d2efbf4a3 Mon Sep 17 00:00:00 2001 From: murphy Date: Sat, 29 Oct 2005 06:05:51 +0000 Subject: scanners/ruby.rb: changed operator handling = fix and speedup. Test fixtures adjusted. --- test/ruby/1.out.raydebug | 20 +++--- test/ruby/class.out.raydebug | 2 +- test/ruby/evil.out.raydebug | 2 +- test/ruby/pleac.out.raydebug | 154 +++++++++++++++++++++---------------------- 4 files changed, 89 insertions(+), 89 deletions(-) (limited to 'test') diff --git a/test/ruby/1.out.raydebug b/test/ruby/1.out.raydebug index 6575ccd..2b1c6fb 100644 --- a/test/ruby/1.out.raydebug +++ b/test/ruby/1.out.raydebug @@ -161,7 +161,7 @@ reserved(class) class(Date) ident(val) operator(=) global_variable($1)operator(.)ident(to_i) reserved(return) reserved(unless) operator(()integer(0)operator(..)integer(99)operator(\)) operator(===) ident(val) ident(elem)operator([)symbol(:cwyear)operator(]) operator(=) ident(val) - ident(elem)operator([)symbol(:cent)operator(]) operator(||)operator(=) reserved(if) ident(val) operator(>)operator(=) integer(69) reserved(then) integer(19) reserved(else) integer(20) reserved(end) + ident(elem)operator([)symbol(:cent)operator(]) operator(||=) reserved(if) ident(val) operator(>)operator(=) integer(69) reserved(then) integer(19) reserved(else) integer(20) reserved(end) reserved(when) stringoperator(,) string reserved(return) reserved(unless) ident(str)operator(.)ident(sub!)operator(()regexpoperator(,) stringoperator(\)) ident(val) operator(=) global_variable($1)operator(.)ident(to_i) @@ -244,7 +244,7 @@ reserved(class) class(Date) ident(val) operator(=) global_variable($1)operator(.)ident(to_i) reserved(return) reserved(unless) operator(()integer(0)operator(..)integer(99)operator(\)) operator(===) ident(val) ident(elem)operator([)symbol(:year)operator(]) operator(=) ident(val) - ident(elem)operator([)symbol(:cent)operator(]) operator(||)operator(=) reserved(if) ident(val) operator(>)operator(=) integer(69) reserved(then) integer(19) reserved(else) integer(20) reserved(end) + ident(elem)operator([)symbol(:cent)operator(]) operator(||=) reserved(if) ident(val) operator(>)operator(=) integer(69) reserved(then) integer(19) reserved(else) integer(20) reserved(end) reserved(when) stringoperator(,) string reserved(return) reserved(unless) ident(str)operator(.)ident(sub!)operator(()regexpoperator(,) stringoperator(\)) ident(val) operator(=) global_variable($1) @@ -276,17 +276,17 @@ comment(=begin reserved(if) ident(cent) operator(=) ident(elem)operator(.)ident(delete)operator(()symbol(:cent)operator(\)) reserved(if) ident(elem)operator([)symbol(:cwyear)operator(]) - ident(elem)operator([)symbol(:cwyear)operator(]) operator(+)operator(=) ident(cent) operator(*) integer(100) + ident(elem)operator([)symbol(:cwyear)operator(]) operator(+=) ident(cent) operator(*) integer(100) reserved(end) reserved(if) ident(elem)operator([)symbol(:year)operator(]) - ident(elem)operator([)symbol(:year)operator(]) operator(+)operator(=) ident(cent) operator(*) integer(100) + ident(elem)operator([)symbol(:year)operator(]) operator(+=) ident(cent) operator(*) integer(100) reserved(end) reserved(end) reserved(if) ident(merid) operator(=) ident(elem)operator(.)ident(delete)operator(()symbol(:merid)operator(\)) reserved(if) ident(elem)operator([)symbol(:hour)operator(]) ident(elem)operator([)symbol(:hour)operator(]) operator(%=) integer(12) - ident(elem)operator([)symbol(:hour)operator(]) operator(+)operator(=) ident(merid) + ident(elem)operator([)symbol(:hour)operator(]) operator(+=) ident(merid) reserved(end) reserved(end) @@ -343,7 +343,7 @@ comment(=begin reserved(if) global_variable($5) ident(hour) operator(%=) integer(12) reserved(if) global_variable($5)operator(.)ident(downcase) operator(==) string - ident(hour) operator(+)operator(=) integer(12) + ident(hour) operator(+=) integer(12) reserved(end) reserved(end) @@ -510,9 +510,9 @@ comment(=begin reserved(if) ident(comp) reserved(and) ident(year) reserved(if) ident(year) operator(>)operator(=) integer(0) reserved(and) ident(year) operator(<=) integer(99) reserved(if) ident(year) operator(>)operator(=) integer(69) - ident(year) operator(+)operator(=) integer(1900) + ident(year) operator(+=) integer(1900) reserved(else) - ident(year) operator(+)operator(=) integer(2000) + ident(year) operator(+=) integer(2000) reserved(end) reserved(end) reserved(end) @@ -536,10 +536,10 @@ comment(=begin ident(abb)operator(,) ident(dst) operator(=) ident(str)operator(.)ident(downcase)operator(.)ident(split)operator(()regexpoperator(,) integer(2)operator(\)) reserved(if) constant(ZONES)operator(.)ident(include?)operator(()ident(abb)operator(\)) ident(offset) operator(=) constant(ZONES)operator([)ident(abb)operator(]) - ident(offset) operator(+)operator(=) integer(3600) reserved(if) ident(dst) + ident(offset) operator(+=) integer(3600) reserved(if) ident(dst) reserved(elsif) regexp 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(=) operator(-)integer(1) reserved(if) global_variable($1) operator(==) string + ident(offset) operator(*=) operator(-)integer(1) reserved(if) global_variable($1) operator(==) string reserved(end) ident(offset) reserved(end) diff --git a/test/ruby/class.out.raydebug b/test/ruby/class.out.raydebug index b9b57a7..0f79311 100644 --- a/test/ruby/class.out.raydebug +++ b/test/ruby/class.out.raydebug @@ -9,7 +9,7 @@ ident(include) constant(Test)operator(::)constant(Unit) reserved(class) class(CodeRaySuite) operator(<) constant(TestCase) reserved(def) pre_constant(self)operator(.)ident(dir) operator(&)ident(block) - instance_variable(@dir) operator(||)operator(=) constant(File)operator(.)ident(dirname)operator(()instance_variable(@file)operator(\)) + instance_variable(@dir) operator(||=) constant(File)operator(.)ident(dirname)operator(()instance_variable(@file)operator(\)) reserved(if) ident(block) constant(Dir)operator(.)ident(chdir) instance_variable(@dir)operator(,) operator(&)ident(block) reserved(end) diff --git a/test/ruby/evil.out.raydebug b/test/ruby/evil.out.raydebug index 2dd4b7b..7322519 100644 --- a/test/ruby/evil.out.raydebug +++ b/test/ruby/evil.out.raydebug @@ -807,7 +807,7 @@ reserved(for) ident(i) reserved(in) reserved(if) pre_constant(false) reserved(th ident(foob12345)operator(;) reserved(else) operator([)integer(44)operator(,)integer(55)operator(,)integer(66)operator(,)integer(77)operator(,)integer(88)operator(]) reserved(end) reserved(do) ident(p) ident(i)operator(**)constant(Math)operator(.)ident(sqrt)operator(()ident(i)operator(\)) reserved(end) ident(c)operator(=)ident(j)operator(=)integer(0) -reserved(until) reserved(while) ident(j)operator(<)integer(10) reserved(do) ident(j)operator(+)operator(=)integer(1) reserved(end)operator(.)ident(nil?) reserved(do) ident(p) string reserved(end) +reserved(until) reserved(while) ident(j)operator(<)integer(10) reserved(do) ident(j)operator(+=)integer(1) reserved(end)operator(.)ident(nil?) reserved(do) ident(p) string reserved(end) reserved(for) ident(i) reserved(in) reserved(if) pre_constant(false) reserved(then) ident(foob12345)operator(;) reserved(else) operator([)integer(44)operator(,)integer(55)operator(,)integer(66)operator(,)integer(77)operator(,)integer(88)operator(]) reserved(end) reserved(do) ident(p) ident(i)operator(**)constant(Math)operator(.)ident(sqrt)operator(()ident(i)operator(\)) reserved(end) diff --git a/test/ruby/pleac.out.raydebug b/test/ruby/pleac.out.raydebug index 571d66e..c10812e 100644 --- a/test/ruby/pleac.out.raydebug +++ b/test/ruby/pleac.out.raydebug @@ -85,10 +85,10 @@ reserved(def) method(cut2fmt)operator(()operator(*)ident(args)operator(\)) ident(template) operator(=) string ident(lastpos) operator(=) integer(1) reserved(for) ident(place) reserved(in) ident(args) - ident(template) operator(+)operator(=) string operator(+) operator(()ident(place) operator(-) ident(lastpos)operator(\))operator(.)ident(to_s) operator(+) string + ident(template) operator(+=) string operator(+) operator(()ident(place) operator(-) ident(lastpos)operator(\))operator(.)ident(to_s) operator(+) string ident(lastpos) operator(=) ident(place) reserved(end) - ident(template) operator(+)operator(=) string + ident(template) operator(+=) string reserved(return) ident(template) reserved(end) @@ -156,7 +156,7 @@ ident(print) stringoperator ident(sum) operator(=) integer(0) reserved(for) ident(ascval) reserved(in) ident(string)operator(.)ident(unpack)operator(()stringoperator(\)) comment(# or use Array#each for a pure OO style :\)) - ident(sum) operator(+)operator(=) ident(ascval) + ident(sum) operator(+=) ident(ascval) reserved(end) ident(puts) stringdelimiter(")> comment(# since Ruby will go Bignum if necessary) @@ -225,7 +225,7 @@ reserved(def) method(wrap)operator(()ident(str)operator(,) ident(max_size)operat ident(all)operator(.)ident(push)operator(()ident(line)operator(\)) ident(line) operator(=) string reserved(end) - ident(line) operator(+)operator(=) ident(line) operator(==) string operator(?) ident(l) operator(:) string operator(+) ident(l) + ident(line) operator(+=) ident(line) operator(==) string operator(?) ident(l) operator(:) string operator(+) ident(l) reserved(end) ident(all)operator(.)ident(push)operator(()ident(line)operator(\))operator(.)ident(join)operator(()stringoperator(\)) reserved(end) @@ -420,7 +420,7 @@ reserved(class) class(Integer) ident(roman) operator(=) string reserved(for) ident(sym)operator(,) ident(num) reserved(in) class_variable(@@romanlist) reserved(while) ident(remains) operator(>)operator(=) ident(num) - ident(remains) operator(-)operator(=) ident(num) + ident(remains) operator(-=) ident(num) ident(roman) operator(<<) ident(sym) reserved(end) reserved(end) @@ -433,7 +433,7 @@ reserved(class) class(Integer) reserved(for) ident(entry) reserved(in) class_variable(@@romanlist) ident(sym)operator(,) ident(num) operator(=) ident(entry)operator([)integer(0)operator(])operator(,) ident(entry)operator([)integer(1)operator(]) reserved(while) ident(sym) operator(==) ident(ustr)operator([)integer(0)operator(,) ident(sym)operator(.)ident(length)operator(]) - ident(sum) operator(+)operator(=) ident(num) + ident(sum) operator(+=) ident(num) ident(ustr)operator(.)ident(slice!)operator(()integer(0)operator(,) ident(sym)operator(.)ident(length)operator(\)) reserved(end) reserved(end) @@ -452,7 +452,7 @@ comment(# check) reserved(for) ident(i) reserved(in) operator(()integer(1)operator(..)integer(3900)operator(\)) ident(r) operator(=) ident(i)operator(.)ident(to_roman) ident(j) operator(=) constant(Integer)operator(.)ident(from_roman)operator(()ident(r)operator(\)) - reserved(if) ident(i) operator(!)operator(=) ident(j) + reserved(if) ident(i) operator(!=) ident(j) ident(puts) stringcontent( : )inlinecontent( - )inlinedelimiter(")> reserved(end) reserved(end) @@ -796,7 +796,7 @@ ident(number_of_times)operator(.)ident(times) operator({) ident(begin_) operator(=) constant(Time)operator(.)ident(now) ident(array)operator(.)ident(sort!) ident(time) operator(=) constant(Time)operator(.)ident(now) operator(-) ident(begin_) - ident(total_time) operator(+)operator(=) ident(time) + ident(total_time) operator(+=) ident(time) operator(}) ident(printf) stringoperator(,) ident(size)operator(,) operator(()ident(total_time)operator(/)constant(Float)operator(()ident(number_of_times)operator(\))operator(\)) @@ -854,9 +854,9 @@ reserved(class) class(MailHopDelta) 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(\)) ident(rtn) operator(=) string operator(%) operator([)ident(secs) operator(*) ident(sign)operator(]) - ident(rtn) operator(<<) string operator(%) operator([)ident(mins) operator(*) ident(sign)operator(]) reserved(if) ident(mins) operator(!)operator(=) integer(0) - ident(rtn) operator(<<) string operator(%) operator([)ident(hours) operator(*) ident(sign)operator(]) reserved(if) ident(hours) operator(!)operator(=) integer(0) - ident(rtn) operator(<<) string operator(%) operator([)ident(days) operator(*) ident(sign)operator(]) reserved(if) ident(days) operator(!)operator(=) integer(0) + ident(rtn) operator(<<) string operator(%) operator([)ident(mins) operator(*) ident(sign)operator(]) reserved(if) ident(mins) operator(!=) integer(0) + ident(rtn) operator(<<) string operator(%) operator([)ident(hours) operator(*) ident(sign)operator(]) reserved(if) ident(hours) operator(!=) integer(0) + ident(rtn) operator(<<) string operator(%) operator([)ident(days) operator(*) ident(sign)operator(]) reserved(if) ident(days) operator(!=) integer(0) ident(rtn) reserved(end) reserved(end) @@ -1056,7 +1056,7 @@ ident(new_ary) operator(=) ident(array1) operator(+) ident(array2) ident(members) operator(=) operator([) stringoperator(,) string operator(]) ident(initiates) operator(=) operator([) stringoperator(,) string operator(]) -ident(members) operator(+)operator(=) ident(initiates) +ident(members) operator(+=) ident(initiates) ident(members) operator(=) operator([) stringoperator(,) string operator(]) ident(initiates) operator(=) operator([) stringoperator(,) string operator(]) @@ -1209,7 +1209,7 @@ 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(\)) - 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(!)operator(=) ident(j) + 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) @@ -1289,8 +1289,8 @@ comment(# needed, so there is no need for an extra module) reserved(def) method(factorial)operator(()ident(n)operator(\)) ident(s) operator(=) integer(1) reserved(while) ident(n) operator(>) integer(0) - ident(s) operator(*)operator(=) ident(n) - ident(n) operator(-)operator(=) integer(1) + ident(s) operator(*=) ident(n) + ident(n) operator(-=) integer(1) reserved(end) ident(s) reserved(end) @@ -1321,8 +1321,8 @@ comment(# mjd_permute: permute each word of input) reserved(def) method(factorial)operator(()ident(n)operator(\)) ident(s) operator(=) integer(1) reserved(while) ident(n) operator(>) integer(0) - ident(s) operator(*)operator(=) ident(n) - ident(n) operator(-)operator(=) integer(1) + ident(s) operator(*=) ident(n) + ident(n) operator(-=) integer(1) reserved(end) ident(s) reserved(end) @@ -1487,7 +1487,7 @@ comment(# countfrom - count number of messages from each sender) comment(# Default value is 0) ident(from) operator(=) constant(Hash)operator(.)ident(new)operator(()integer(0)operator(\)) reserved(while) ident(gets) - regexp reserved(and) ident(from)operator([)global_variable($1)operator(]) operator(+)operator(=) integer(1) + regexp reserved(and) ident(from)operator([)global_variable($1)operator(]) operator(+=) integer(1) reserved(end) comment(# More useful to sort by number of received mail by person) @@ -1514,7 +1514,7 @@ comment(# @@PLEAC@@_5.7) ident(ttys) operator(=) constant(Hash)operator(.)ident(new) reserved(for) ident(i) reserved(in) shell ident(user)operator(,) ident(tty) operator(=) ident(i)operator(.)ident(split) - operator(()ident(ttys)operator([)ident(user)operator(]) operator(||)operator(=) operator([)operator(])operator(\)) operator(<<) ident(tty) comment(# see problems_ruby for more infos) + operator(()ident(ttys)operator([)ident(user)operator(]) operator(||=) operator([)operator(])operator(\)) operator(<<) ident(tty) comment(# see problems_ruby for more infos) reserved(end) ident(ttys)operator(.)ident(keys)operator(.)ident(sort)operator(.)ident(each) operator({) operator(|)ident(k)operator(|) ident(puts) stringcontent(: )inlinedelimiter(")> comment(# from 4.2) @@ -1605,7 +1605,7 @@ comment(# special (documentation says: there is effectively only one Fixnum obje comment(# instance for any given integer value\).) ident(count) operator(=) constant(Hash)operator(.)ident(new)operator(()integer(0)operator(\)) ident(array)operator(.)ident(each) operator({) operator(|)ident(e)operator(|) - ident(count)operator([)ident(e)operator(]) operator(+)operator(=) integer(1) + ident(count)operator([)ident(e)operator(]) operator(+=) integer(1) operator(}) @@ -1635,7 +1635,7 @@ reserved(end) ident(children) operator(=) operator({)operator(}) ident(father)operator(.)ident(each) operator({) operator(|)ident(k)operator(,)ident(v)operator(|) - operator(()ident(children)operator([)ident(v)operator(]) operator(||)operator(=) operator([)operator(])operator(\)) operator(<<) ident(k) + operator(()ident(children)operator([)ident(v)operator(]) operator(||=) operator([)operator(])operator(\)) operator(<<) ident(k) operator(}) reserved(while) ident(gets) ident(chomp) @@ -1647,7 +1647,7 @@ ident(files)operator(.)ident(each) operator({) operator(|)ident(f)operator(|) reserved(begin) reserved(for) ident(l) reserved(in) constant(IO)operator(.)ident(readlines)operator(()ident(f)operator(\)) reserved(next) reserved(unless) ident(l) operator(=)operator(~) regexp]+\)>)delimiter(/)> - operator(()ident(includes)operator([)global_variable($1)operator(]) operator(||)operator(=) operator([)operator(])operator(\)) operator(<<) ident(f) + operator(()ident(includes)operator([)global_variable($1)operator(]) operator(||=) operator([)operator(])operator(\)) operator(<<) ident(f) reserved(end) reserved(rescue) constant(SystemCallError) global_variable($stderr)operator(.)ident(puts) string @@ -1749,10 +1749,10 @@ reserved(class) class(Dutree) reserved(def) method(get_dots)operator(()ident(node)operator(\)) ident(cursize) operator(=) ident(node)operator(.)ident(size) reserved(for) ident(kid) reserved(in) ident(node)operator(.)ident(kids) - ident(cursize) operator(-)operator(=) ident(kid)operator(.)ident(size) + ident(cursize) operator(-=) ident(kid)operator(.)ident(size) ident(get_dots)operator(()ident(kid)operator(\)) reserved(end) - reserved(if) ident(node)operator(.)ident(size) operator(!)operator(=) ident(cursize) + reserved(if) ident(node)operator(.)ident(size) operator(!=) ident(cursize) ident(newnode) operator(=) ident(get_create_node)operator(()ident(node)operator(.)ident(name) operator(+) stringoperator(\)) ident(newnode)operator(.)ident(size) operator(=) ident(cursize) ident(node)operator(.)ident(kids)operator(.)ident(push)operator(()ident(newnode)operator(\)) @@ -1765,7 +1765,7 @@ reserved(class) class(Dutree) reserved(def) method(output)operator(()ident(node)operator(,) ident(prefix)operator(=)stringoperator(,) ident(width)operator(=)integer(0)operator(\)) ident(line) operator(=) ident(sprintf)operator(()stringcontent(d %s)delimiter(")>operator(,) ident(node)operator(.)ident(size)operator(,) ident(node)operator(.)ident(basename)operator(\)) ident(puts)operator(()ident(prefix) operator(+) ident(line)operator(\)) - ident(prefix) operator(+)operator(=) ident(line)operator(.)ident(sub)operator(()regexpoperator(,) stringoperator(\)) + ident(prefix) operator(+=) ident(line)operator(.)ident(sub)operator(()regexpoperator(,) stringoperator(\)) ident(prefix)operator(.)ident(gsub!)operator(()regexpoperator(,) stringoperator(\)) reserved(if) ident(node)operator(.)ident(kids)operator(.)ident(length) operator(>) integer(0) comment(# not a bachelor node) ident(kids) operator(=) ident(node)operator(.)ident(kids) @@ -1897,7 +1897,7 @@ ident(fish) operator(=) stringoperator(\)) operator({) - reserved(if) operator(()ident(count) operator(+)operator(=) integer(1)operator(\)) operator(==) constant(WANT) + reserved(if) operator(()ident(count) operator(+=) integer(1)operator(\)) operator(==) constant(WANT) ident(puts) stringcontent( one.)delimiter(")> reserved(end) operator(}) @@ -1917,7 +1917,7 @@ ident(puts) string -ident(evens) operator(=) ident(fishes)operator(.)ident(scan)operator(()regexpoperator(\))operator(.)ident(select) operator({) operator(()ident(count)operator(+)operator(=)integer(1)operator(\)) operator(%) integer(2) operator(==) integer(0) operator(}) +ident(evens) operator(=) ident(fishes)operator(.)ident(scan)operator(()regexpoperator(\))operator(.)ident(select) operator({) operator(()ident(count)operator(+=)integer(1)operator(\)) operator(%) integer(2) operator(==) integer(0) operator(}) ident(print) stringoperator(\))delimiter(})>content(.)delimiter(")> ident(count) operator(=) integer(0) @@ -1928,7 +1928,7 @@ ident(fishes)operator(.)ident(gsub)operator(()regexpoperator(\)) operator({) - reserved(if) operator(()ident(count) operator(+)operator(=) integer(1)operator(\)) operator(==) integer(4) + reserved(if) operator(()ident(count) operator(+=) integer(1)operator(\)) operator(==) integer(4) string operator(+) global_variable($2) reserved(else) global_variable($1) operator(+) global_variable($2) @@ -2077,7 +2077,7 @@ pre_constant(ARGF)operator(.)ident(each) reserved(do) operator(|)ident(line)oper reserved(next) reserved(unless) ident(line) operator(=)operator(~) regexp operator(..) ident(line) operator(=)operator(~) regexpoperator(;) ident(line)operator(.)ident(scan)operator(()regexp(\),;)char(\\s)content(]+)char(\\@)content([^<>(\),;)char(\\s)content(]+\))delimiter(/)>operator(\))operator(.)ident(each) reserved(do) operator(|)ident(addr)operator(|) ident(puts) ident(addr) reserved(unless) ident(seen)operator([)ident(addr)operator(]) - ident(seen)operator([)ident(addr)operator(]) operator(||)operator(=) integer(1) + ident(seen)operator([)ident(addr)operator(]) operator(||=) integer(1) reserved(end) reserved(end) @@ -2133,9 +2133,9 @@ comment(# version 2: eval strings; fast but hard to quote) ident(popstates) operator(=) string ident(code) operator(=) string ident(popstates)operator(.)ident(each) reserved(do) operator(|)ident(state)operator(|) - ident(code) operator(+)operator(=) stringchar(\\\\)content(b/; print(line\); next; end)char(\\n)delimiter(")> + ident(code) operator(+=) stringchar(\\\\)content(b/; print(line\); next; end)char(\\n)delimiter(")> reserved(end) -ident(code) operator(+)operator(=) string +ident(code) operator(+=) string ident(print) stringchar(\\n)content(---)char(\\n)delimiter(")> reserved(if) pre_constant(false) comment(# turn on for debugging) ident(eval) ident(code) @@ -2159,9 +2159,9 @@ comment(# version 2.5: eval strings; fast but hard to quote) ident(popstates) operator(=) string ident(code) operator(=) string ident(popstates)operator(.)ident(each) reserved(do) operator(|)ident(state)operator(|) - ident(code) operator(+)operator(=) stringchar(\\\\)content(b/ : print line)char(\\n)delimiter(")> + ident(code) operator(+=) stringchar(\\\\)content(b/ : print line)char(\\n)delimiter(")> reserved(end) -ident(code) operator(+)operator(=) string +ident(code) operator(+=) string ident(print) stringchar(\\n)content(---)char(\\n)delimiter(")> reserved(if) pre_constant(false) comment(# turn on for debugging) ident(eval) ident(code) @@ -2909,7 +2909,7 @@ pre_constant(ARGV) operator(=) constant(Dir)operator([)stringoperator(\)) - ident(chop_first) operator(+)operator(=) integer(1) + ident(chop_first) operator(+=) integer(1) pre_constant(ARGV)operator(.)ident(shift) reserved(end) @@ -2927,10 +2927,10 @@ ident(append) operator(=) integer(0) ident(unbuffer) operator(=) integer(0) ident(ignore_ints) operator(=) integer(0) pre_constant(ARGV)operator(.)ident(options) reserved(do) operator(|)ident(opt)operator(|) - ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(nostdout) operator(+)operator(=)integer(1) operator(}) - ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(append) operator(+)operator(=)integer(1) operator(}) - ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(unbuffer) operator(+)operator(=)integer(1) operator(}) - ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(ignore_ints) operator(+)operator(=)integer(1) operator(}) + ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(nostdout) operator(+=)integer(1) operator(}) + ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(append) operator(+=)integer(1) operator(}) + ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(unbuffer) operator(+=)integer(1) operator(}) + ident(opt)operator(.)ident(on)operator(()stringoperator(\)) operator({) ident(ignore_ints) operator(+=)integer(1) operator(}) ident(opt)operator(.)ident(parse!) reserved(end) reserved(or) ident(abort)operator(()string operator(+) pre_constant(__FILE__) operator(+) stringoperator(\)) @@ -2971,7 +2971,7 @@ ident(chunks) operator(=) integer(0) constant(File)operator(.)ident(read)operator(()pre_constant(ARGV)operator([)integer(0)operator(])operator(\))operator(.)ident(split)operator(.)ident(each) reserved(do) operator(|)ident(word)operator(|) reserved(next) reserved(if) ident(word) operator(=)operator(~) regexp reserved(break) reserved(if) operator([)stringoperator(,) stringoperator(])operator(.)ident(member?) ident(word) - ident(chunks) operator(+)operator(=) integer(1) + ident(chunks) operator(+=) integer(1) reserved(end) ident(print) stringoperator(,) ident(chunks)operator(,) string @@ -3019,7 +3019,7 @@ comment(# effectively becomes:) pre_constant(ARGV) operator(<<) string ident(oldfile) operator(=) string reserved(while) ident(gets) - reserved(if) pre_constant(ARGF)operator(.)ident(filename) operator(!)operator(=) ident(oldfile) + reserved(if) pre_constant(ARGF)operator(.)ident(filename) operator(!=) ident(oldfile) ident(newfile) operator(=) pre_constant(ARGF)operator(.)ident(filename) constant(File)operator(.)ident(rename)operator(()ident(newfile)operator(,) ident(newfile) operator(+) stringoperator(\)) global_variable($stdout) operator(=) constant(File)operator(.)ident(open)operator(()ident(newfile)operator(,)stringoperator(\)) @@ -3183,7 +3183,7 @@ 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) ident(block) operator(=) ident(infile)operator(.)ident(sysread)operator(()integer(256)operator(\)) comment(# no equivalent to perl offset parameter in sysread) -ident(puts) stringcontent( bytes)delimiter(")> reserved(if) integer(256) operator(!)operator(=) ident(block)operator(.)ident(length) +ident(puts) stringcontent( bytes)delimiter(")> reserved(if) integer(256) operator(!=) ident(block)operator(.)ident(length) comment(#-----------------------------) ident(pos) operator(=) ident(handle)operator(.)ident(sysseek)operator(()integer(0)operator(,) constant(IO)operator(::)constant(SEEK_CUR)operator(\)) comment(# don't change position) @@ -3193,8 +3193,8 @@ reserved(while) operator(()ident(line) operator(=) ident(fh)operator(.)ident(get ident(line)operator(.)ident(chomp!) ident(nextline) operator(=) pre_constant(nil) ident(line)operator(.)ident(gsub!)operator(()regexpoperator(\)) operator({) operator(|)ident(match)operator(|) ident(nextline) operator(=) ident(fh)operator(.)ident(gets)operator(;) string operator(}) - reserved(if) operator(()ident(nextline) operator(!)operator(=) pre_constant(nil)operator(\)) - ident(line) operator(+)operator(=) ident(nextline) + reserved(if) operator(()ident(nextline) operator(!=) pre_constant(nil)operator(\)) + ident(line) operator(+=) ident(nextline) reserved(redo) reserved(end) comment(# process full record in line here) @@ -3214,22 +3214,22 @@ operator(}) comment(# @@PLEAC@@_8.2) comment(#-----------------------------) ident(count) operator(=) shelldelimiter(`)> -ident(fail) stringdelimiter(")> reserved(if) global_variable($?) operator(!)operator(=) integer(0) +ident(fail) stringdelimiter(")> reserved(if) global_variable($?) operator(!=) integer(0) ident(count)operator(.)ident(chomp!) comment(#-----------------------------) ident(count) operator(=) integer(0) constant(File)operator(.)ident(open)operator(()ident(file)operator(,) stringoperator(\)) operator({) operator(|)ident(fh)operator(|) - ident(count) operator(+)operator(=) integer(1) reserved(while) ident(fh)operator(.)ident(gets) + ident(count) operator(+=) integer(1) reserved(while) ident(fh)operator(.)ident(gets) operator(}) comment(# count now holds the number of lines read) comment(#-----------------------------) ident(count) operator(=) integer(0) reserved(while) operator(()ident(chunk) operator(=) ident(file)operator(.)ident(sysread)operator(()integer(2)operator(**)integer(16)operator(\))operator(\)) - ident(count) operator(+)operator(=) ident(chunk)operator(.)ident(count)operator(()stringoperator(\)) + ident(count) operator(+=) ident(chunk)operator(.)ident(count)operator(()stringoperator(\)) reserved(end) reserved(rescue) constant(EOFError) comment(#-----------------------------) constant(File)operator(.)ident(open)operator(()ident(filename)operator(,)stringoperator(\)) operator({) operator(|)ident(fh)operator(|) - ident(count) operator(+)operator(=) integer(1) reserved(while) ident(fh)operator(.)ident(gets) + ident(count) operator(+=) integer(1) reserved(while) ident(fh)operator(.)ident(gets) operator(}) comment(# count now holds the number of lines read) comment(#-----------------------------) @@ -3269,7 +3269,7 @@ comment(# of nil. (nil can't be incremented\)) ident(seen) operator(=) constant(Hash)operator(.)ident(new)operator(()integer(0)operator(\)) reserved(while) operator(()ident(gets)operator(\)) ident(gsub)operator(()regexpoperator(\)) operator({) operator(|)ident(word)operator(|) - ident(seen)operator([)ident(word)operator(.)ident(downcase)operator(]) operator(+)operator(=) integer(1) + ident(seen)operator([)ident(word)operator(.)ident(downcase)operator(]) operator(+=) integer(1) operator(}) reserved(end) comment(# output hash in a descending numeric sort of its values) @@ -3281,7 +3281,7 @@ comment(#-----------------------------) comment(# Line frequency count) ident(seen) operator(=) constant(Hash)operator(.)ident(new)operator(()integer(0)operator(\)) reserved(while) operator(()ident(gets)operator(\)) - ident(seen)operator([)global_variable($_)operator(.)ident(downcase)operator(]) operator(+)operator(=) integer(1) + ident(seen)operator([)global_variable($_)operator(.)ident(downcase)operator(]) operator(+=) integer(1) reserved(end) ident(seen)operator(.)ident(sort) operator({) operator(|)ident(a)operator(,)ident(b)operator(|) ident(b)operator([)integer(1)operator(]) operator(<=>) ident(a)operator([)integer(1)operator(]) operator(})operator(.)ident(each) reserved(do) operator(|)ident(k)operator(,)ident(v)operator(|) ident(printf)operator(()stringoperator(,) ident(v)operator(,) ident(k) operator(\)) @@ -3375,8 +3375,8 @@ constant(SECONDS_PER_DAY) operator(=) integer(60) operator(*) integer(60) operat ident(file) operator(=) constant(File)operator(.)ident(stat)operator(()stringoperator(\)) ident(atime)operator(,) ident(mtime) operator(=) ident(file)operator(.)ident(atime)operator(,) ident(file)operator(.)ident(mtime) -ident(atime) operator(-)operator(=) integer(7) operator(*) constant(SECONDS_PER_DAY) -ident(mtime) operator(-)operator(=) integer(7) operator(*) constant(SECONDS_PER_DAY) +ident(atime) operator(-=) integer(7) operator(*) constant(SECONDS_PER_DAY) +ident(mtime) operator(-=) integer(7) operator(*) constant(SECONDS_PER_DAY) constant(File)operator(.)ident(utime)operator(()ident(atime)operator(,) ident(mtime)operator(,) ident(file)operator(\)) ident(mtime) operator(=) constant(File)operator(.)ident(stat)operator(()ident(file)operator(\))operator(.)ident(mtime) @@ -3387,7 +3387,7 @@ comment(#-----------------------------) comment(#!/usr/bin/ruby -w) comment(## uvi - vi a file without changing it's access times) -reserved(if) pre_constant(ARGV)operator(.)ident(length) operator(!)operator(=) integer(1) +reserved(if) pre_constant(ARGV)operator(.)ident(length) operator(!=) integer(1) ident(puts) string ident(exit) reserved(end) @@ -3418,10 +3418,10 @@ ident(filenames)operator(.)ident(each) reserved(do) operator(|)ident(file)operat reserved(begin) constant(File)operator(.)ident(unlink)operator(()ident(file)operator(\)) reserved(rescue) - ident(count) operator(-)operator(=) integer(1) + ident(count) operator(-=) integer(1) reserved(end) reserved(end) -reserved(if) ident(count) operator(!)operator(=) ident(filenames)operator(.)ident(length) +reserved(if) ident(count) operator(!=) ident(filenames)operator(.)ident(length) constant(STDERR)operator(.)ident(puts) stringcontent( of )inlinecontent( files)delimiter(")> reserved(end) @@ -3557,7 +3557,7 @@ ident(argv) operator(=) pre_constant(ARGV)operator(.)ident(empty?) operator(?) s ident(sum) operator(=) integer(0) 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) - ident(sum) operator(+)operator(=) ident(size) + ident(sum) operator(+=) ident(size) reserved(end) ident(puts) stringoperator(\))delimiter(})>content( contains )inlinecontent( bytes)delimiter(")> @@ -3719,7 +3719,7 @@ ident(opts) operator(=) constant(Getopt)operator(::)constant(Declare)operator(.) )delimiter( EOPARAM)> -global_variable($sort_criteria) operator(||)operator(=) symbol(:mtime) +global_variable($sort_criteria) operator(||=) symbol(:mtime) ident(files) operator(=) operator({)operator(}) constant(DIRS) operator(=) ident(opts)operator([)stringoperator(]) operator(?) global_variable($stdin)operator(.)ident(readlines)operator(.)ident(map)operator({)operator(|)ident(f)operator(|)ident(f)operator(.)ident(chomp!)operator(}) operator(:) pre_constant(ARGV) constant(DIRS)operator(.)ident(each) reserved(do) operator(|)ident(dir)operator(|) @@ -3751,7 +3751,7 @@ reserved(end) comment(# @@PLEAC@@_10.0) reserved(def) method(hello) - global_variable($greeted) operator(+)operator(=) integer(1) comment(# in Ruby, a variable beginning with $ is global (can be any type of course\)) + global_variable($greeted) operator(+=) integer(1) comment(# in Ruby, a variable beginning with $ is global (can be any type of course\)) ident(puts) string reserved(end) @@ -3826,7 +3826,7 @@ comment(# The following gives the same results as in Perl for $global_array,) comment(# though it doesn't illustrate anymore the way to keep a reference) comment(# to an object: $global_array is extended with the elements of ary) reserved(def) method(save_array)operator(()ident(ary)operator(\)) - global_variable($global_array) operator(+)operator(=) ident(ary) + global_variable($global_array) operator(+=) ident(ary) 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(+)operator(=) integer(1)operator(;) reserved(end) + reserved(def) constant(Counter)operator(.)ident(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(+)operator(=) integer(1)operator(;) reserved(end) - reserved(def) constant(Counter)operator(.)ident(prev_counter)operator(;) class_variable(@@counter) operator(-)operator(=) integer(1)operator(;) reserved(end) + 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(end) @@ -4096,7 +4096,7 @@ reserved(class) class(Mailbox) operator(<) constant(Array) ident(file)operator(.)ident(each) operator({) operator(|)ident(para)operator(|) reserved(if) ident(para) operator(=)operator(~) regexp ident(mail) operator(=) constant(Mail)operator(.)ident(new) - ident(mail)operator(.)ident(no) operator(=) operator(()ident(msgno) operator(+)operator(=) integer(1)operator(\)) + ident(mail)operator(.)ident(no) operator(=) operator(()ident(msgno) operator(+=) integer(1)operator(\)) ident(md) operator(=) constant(Subjectpattern)operator(.)ident(match)operator(()ident(para)operator(\)) reserved(if) ident(md) ident(mail)operator(.)ident(subject) operator(=) ident(md)operator([)integer(1)operator(]) @@ -4152,8 +4152,8 @@ comment(# @@PLEAC@@_11.7) reserved(def) method(mkcounter)operator(()ident(count)operator(\)) ident(start) operator(=) ident(count) ident(bundle) operator(=) operator({) - string operator(=)operator(>) ident(proc) operator({) ident(count) operator(+)operator(=) integer(1) operator(})operator(,) - string operator(=)operator(>) ident(proc) operator({) ident(count) operator(-)operator(=) integer(1) operator(})operator(,) + string operator(=)operator(>) ident(proc) operator({) ident(count) operator(+=) integer(1) operator(})operator(,) + string operator(=)operator(>) ident(proc) operator({) ident(count) operator(-=) integer(1) operator(})operator(,) string operator(=)operator(>) ident(proc) operator({) ident(count) operator(=) ident(start) operator(}) operator(}) ident(bundle)operator([)stringoperator(]) operator(=) ident(bundle)operator([)stringoperator(]) @@ -4412,11 +4412,11 @@ ident(puts) constant(FineTime)operator(.)ident(time) comment(#=> "its a fine tim comment(# @@PLEAC@@_12.12) reserved(def) method(even_only)operator(()ident(n)operator(\)) - ident(raise) stringcontent( is not even)delimiter(")> reserved(if) operator(()ident(n) operator(&) integer(1)operator(\)) operator(!)operator(=) integer(0) comment(# one way to test) + ident(raise) stringcontent( is not even)delimiter(")> reserved(if) operator(()ident(n) operator(&) integer(1)operator(\)) operator(!=) integer(0) comment(# one way to test) comment(# ...) reserved(end) reserved(def) method(even_only)operator(()ident(n)operator(\)) - global_variable($stderr)operator(.)ident(puts) stringcontent( is not even)delimiter(")> reserved(if) operator(()ident(n) operator(&) integer(1)operator(\)) operator(!)operator(=) integer(0) + global_variable($stderr)operator(.)ident(puts) stringcontent( is not even)delimiter(")> reserved(if) operator(()ident(n) operator(&) integer(1)operator(\)) operator(!=) integer(0) comment(# ...) reserved(end) @@ -4462,7 +4462,7 @@ reserved(class) class(Person) comment(# object constructor) reserved(def) method(initialize)operator(()ident(age)operator(,) ident(name)operator(,) ident(alive) operator(=) pre_constant(true)operator(\)) comment(# Default arg like in C++) instance_variable(@age)operator(,) instance_variable(@name)operator(,) instance_variable(@alive) operator(=) ident(age)operator(,) ident(name)operator(,) ident(alive) comment(# Object attributes are prefixed by '@') - class_variable(@@person_counter) operator(+)operator(=) integer(1) + class_variable(@@person_counter) operator(+=) integer(1) comment(# There is no '++' operator in Ruby. The '++'/'--' operators are in fact ) comment(# hidden assignments which affect variables, not objects. You cannot accomplish) comment(# assignment via method. Since everything in Ruby is object, '++' and '--' ) @@ -4608,12 +4608,12 @@ reserved(class) class(Person) class_variable(@@person_counter) reserved(end) reserved(def) method(initialize) - class_variable(@@person_counter) operator(+)operator(=) integer(1) + class_variable(@@person_counter) operator(+=) integer(1) 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(\)) - class_variable(@@person_counter) operator(-)operator(=) integer(1) + class_variable(@@person_counter) operator(-=) integer(1) reserved(end) reserved(end) ident(people) operator(=) operator([)operator(]) @@ -4957,11 +4957,11 @@ reserved(class) class(TimeNumber) ident(hours) operator(=) instance_variable(@hours) operator(+) ident(other)operator(.)ident(hours) reserved(if) ident(seconds) operator(>)operator(=) integer(60) ident(seconds) operator(%=) integer(60) - ident(minutes) operator(+)operator(=) integer(1) + ident(minutes) operator(+=) integer(1) reserved(end) reserved(if) ident(minutes) operator(>)operator(=) integer(60) ident(minutes) operator(%=) integer(60) - ident(hours) operator(+)operator(=) integer(1) + ident(hours) operator(+=) integer(1) reserved(end) reserved(return) constant(TimeNumber)operator(.)ident(new)operator(()ident(hours)operator(,) ident(minutes)operator(,) ident(seconds)operator(\)) reserved(end) @@ -5526,7 +5526,7 @@ ident(element) ident(readme) operator(=) constant(IO)operator(.)ident(popen)operator(()stringoperator(\)) ident(output) operator(=) string reserved(while) ident(readme)operator(.)ident(gets) reserved(do) - ident(output) operator(+)operator(=) global_variable($_) + ident(output) operator(+=) global_variable($_) reserved(end) ident(readme)operator(.)ident(close) @@ -5563,7 +5563,7 @@ ident(raise) stringdelimiter(")> reserved(if) operator(()global_variable($?) operator(&) integer(127)operator(\)) operator(!)operator(=) integer(0) +ident(raise) stringdelimiter(")> reserved(if) operator(()global_variable($?) operator(&) integer(127)operator(\)) operator(!=) integer(0) ident(pid) operator(=) ident(fork) operator({) ident(trap)operator(()stringoperator(,) stringoperator(\)) @@ -5630,7 +5630,7 @@ reserved(def) method(head)operator(()ident(lines) operator(=) integer(20)operato reserved(else) reserved(while) ident(gets)operator(()operator(\)) reserved(do) ident(pid)operator(.)ident(print) - ident(lines) operator(-)operator(=) integer(1) + ident(lines) operator(-=) integer(1) reserved(break) reserved(if) ident(lines) operator(==) integer(0) reserved(end) reserved(end) @@ -5785,7 +5785,7 @@ comment(#-----------------------------) reserved(begin) ident(fh) operator(=) constant(Kernel)operator(.)ident(open)operator(()string operator(+) ident(program_and_options)operator(,) stringoperator(\)) reserved(rescue) - reserved(if) operator(()global_variable($@) operator(~)operator(=) regexpoperator(\)) + reserved(if) operator(()global_variable($@) operator(~=) regexpoperator(\)) global_variable($stderr)operator(.)ident(puts) stringcontent( )char(\\n)content( )inlinecontent( )char(\\n)delimiter(")> reserved(break) reserved(end) @@ -5943,7 +5943,7 @@ reserved(class) class(Preforker) instance_variable(@reaper) operator(=) ident(proc) operator({) ident(trap)operator(()stringoperator(,) instance_variable(@reaper)operator(\)) ident(pid) operator(=) constant(Process)operator(.)ident(wait) - instance_variable(@child_count) operator(-)operator(=) integer(1) + instance_variable(@child_count) operator(-=) integer(1) operator(}) instance_variable(@huntsman) operator(=) ident(proc) operator({) @@ -5970,7 +5970,7 @@ reserved(class) class(Preforker) reserved(def) method(make_new_child) comment(# wish: sigprocmask block SIGINT) - instance_variable(@child_count) operator(+)operator(=) integer(1) + instance_variable(@child_count) operator(+=) integer(1) ident(pid) operator(=) ident(fork) reserved(do) ident(child_handler) reserved(end) -- cgit v1.2.1