Skip to content

Commit b034854

Browse files
author
murphy
committed
changed :reserved to :keyword in Ruby scanner (issue #43)
1 parent 23e2de5 commit b034854

20 files changed

+27611
-27611
lines changed

‎ruby/1.expected.raydebug

Lines changed: 325 additions & 325 deletions
Large diffs are not rendered by default.

‎ruby/besetzung.expected.raydebug

-2 Bytes
Binary file not shown.

‎ruby/class.expected.raydebug

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,78 @@ constant(CodeRay)operator(::)constant(Encoders)operator([)symbol(:html)operator(
66
ident(require) string<delimiter(')content(test/unit)delimiter(')>
77
ident(include) constant(Test)operator(::)constant(Unit)
88

9-
reserved(class) class(CodeRaySuite) operator(<) constant(TestCase)
9+
keyword(class) class(CodeRaySuite) operator(<) constant(TestCase)
1010

11-
reserved(def) predefined_constant(self)operator(.)method(dir) operator(&)ident(block)
11+
keyword(def) predefined_constant(self)operator(.)method(dir) operator(&)ident(block)
1212
instance_variable(@dir) operator(||=) constant(File)operator(.)ident(dirname)operator(()instance_variable(@file)operator(\))
13-
reserved(if) ident(block)
13+
keyword(if) ident(block)
1414
constant(Dir)operator(.)ident(chdir) instance_variable(@dir)operator(,) operator(&)ident(block)
15-
reserved(end)
15+
keyword(end)
1616
instance_variable(@dir)
17-
reserved(end)
17+
keyword(end)
1818

19-
reserved(def) method(dir) operator(&)ident(block)
19+
keyword(def) method(dir) operator(&)ident(block)
2020
predefined_constant(self)operator(.)ident(class)operator(.)ident(dir) operator(&)ident(block)
21-
reserved(end)
21+
keyword(end)
2222

23-
reserved(def) method(extension)
23+
keyword(def) method(extension)
2424
string<delimiter(')content(in.)delimiter(')> operator(+) predefined_constant(self)operator(.)ident(class)operator(::)constant(EXTENSION)
25-
reserved(end)
25+
keyword(end)
2626

27-
reserved(def) method(lang)
27+
keyword(def) method(lang)
2828
predefined_constant(self)operator(.)ident(class)operator(::)constant(LANG)
29-
reserved(end)
29+
keyword(end)
3030

31-
reserved(def) method(test_ALL)
31+
keyword(def) method(test_ALL)
3232
constant(CodeRay)operator(::)constant(Scanners)operator(.)ident(load) ident(lang)
3333
ident(tokenizer) operator(=) constant(CodeRay)operator(.)ident(tokens)
3434
ident(highlighter) operator(=) constant(CodeRay)operator(.)ident(html)
3535

36-
ident(dir) reserved(do)
37-
reserved(for) ident(input) reserved(in) constant(Dir)operator([)string<delimiter(")content(*.)inline<inline_delimiter(#{)ident(extension)inline_delimiter(})>delimiter(")>operator(])
36+
ident(dir) keyword(do)
37+
keyword(for) ident(input) keyword(in) constant(Dir)operator([)string<delimiter(")content(*.)inline<inline_delimiter(#{)ident(extension)inline_delimiter(})>delimiter(")>operator(])
3838
ident(name) operator(=) constant(File)operator(.)ident(basename)operator(()ident(input)operator(,) string<delimiter(")content(.)inline<inline_delimiter(#{)ident(extension)inline_delimiter(})>delimiter(")>operator(\))
3939
ident(output) operator(=) ident(name) operator(+) string<delimiter(')content(.out.tok)delimiter(')>
4040
ident(code) operator(=) constant(File)operator(.)ident(read)operator(()ident(input)operator(\))
4141

4242
ident(computed) operator(=) ident(tokenizer)operator(.)ident(encode) ident(code)operator(,) ident(lang)
4343

44-
reserved(if) constant(File)operator(.)ident(exist?) ident(output)
44+
keyword(if) constant(File)operator(.)ident(exist?) ident(output)
4545
ident(expected) operator(=) constant(File)operator(.)ident(read) ident(output)
4646
ident(assert_equal)operator(()ident(expected)operator(,) ident(computed)operator(\))
47-
reserved(else)
48-
constant(File)operator(.)ident(open)operator(()ident(output)operator(,) string<delimiter(')content(w)delimiter(')>operator(\)) reserved(do) operator(|)ident(f)operator(|) ident(f)operator(.)ident(write) ident(computed) reserved(end)
47+
keyword(else)
48+
constant(File)operator(.)ident(open)operator(()ident(output)operator(,) string<delimiter(')content(w)delimiter(')>operator(\)) keyword(do) operator(|)ident(f)operator(|) ident(f)operator(.)ident(write) ident(computed) keyword(end)
4949
ident(puts) string<delimiter(")content(New test: )inline<inline_delimiter(#{)ident(output)inline_delimiter(})>delimiter(")>
50-
reserved(end)
50+
keyword(end)
5151

5252
ident(highlighted) operator(=) ident(highlighter)operator(.)ident(highlight_page) ident(code)operator(,) ident(lang)
53-
constant(File)operator(.)ident(open)operator(()ident(name) operator(+) string<delimiter(')content(.html)delimiter(')>operator(,) string<delimiter(')content(w)delimiter(')>operator(\)) reserved(do) operator(|)ident(f)operator(|) ident(f)operator(.)ident(write) ident(highlighted) reserved(end)
54-
reserved(end)
55-
reserved(end)
56-
reserved(end)
53+
constant(File)operator(.)ident(open)operator(()ident(name) operator(+) string<delimiter(')content(.html)delimiter(')>operator(,) string<delimiter(')content(w)delimiter(')>operator(\)) keyword(do) operator(|)ident(f)operator(|) ident(f)operator(.)ident(write) ident(highlighted) keyword(end)
54+
keyword(end)
55+
keyword(end)
56+
keyword(end)
5757

58-
reserved(end)
58+
keyword(end)
5959

6060
ident(require) string<delimiter(')content(test/unit/testsuite)delimiter(')>
6161
global_variable($suite) operator(=) constant(TestSuite)operator(.)ident(new)
6262

63-
reserved(def) method(load_suite) ident(name)
64-
reserved(begin)
63+
keyword(def) method(load_suite) ident(name)
64+
keyword(begin)
6565
ident(require) ident(name) operator(+) string<delimiter(')content(/suite.rb)delimiter(')>
66-
reserved(rescue) constant(LoadError)
66+
keyword(rescue) constant(LoadError)
6767
global_variable($stderr)operator(.)ident(puts) string<delimiter(<<-ERR)>string<content(
6868

6969
!! Folder )inline<inline_delimiter(#{)constant(File)operator(.)ident(split)operator(()predefined_constant(__FILE__)operator(\))operator(.)ident(first) operator(+) string<delimiter(')content(/)delimiter(')> operator(+) ident(name)inline_delimiter(})>content( not found
7070
)delimiter(
7171
ERR)>
7272
predefined_constant(false)
73-
reserved(end)
74-
reserved(end)
73+
keyword(end)
74+
keyword(end)
7575

76-
reserved(if) ident(subsuite) operator(=) predefined_constant(ARGV)operator(.)ident(first)
77-
ident(load_suite)operator(()ident(subsuite)operator(\)) reserved(or) ident(exit)
78-
reserved(else)
76+
keyword(if) ident(subsuite) operator(=) predefined_constant(ARGV)operator(.)ident(first)
77+
ident(load_suite)operator(()ident(subsuite)operator(\)) keyword(or) ident(exit)
78+
keyword(else)
7979
constant(Dir)operator([)string<delimiter(')content(*/)delimiter(')>operator(])operator(.)ident(each) operator({) operator(|)ident(suite)operator(|) ident(load_suite) ident(suite) operator(})
80-
reserved(end)
80+
keyword(end)
8181

8282
ident(require) string<delimiter(')content(test/unit/ui/console/testrunner)delimiter(')>
8383
constant(UI)operator(::)constant(Console)operator(::)constant(TestRunner)operator(.)ident(run) global_variable($suite)

‎ruby/comment.expected.raydebug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ comment(=begin test
33

44
ident(bla)
55

6-
operator(=)reserved(begin)
6+
operator(=)keyword(begin)
77

88
ident(__END__)
99

‎ruby/def.expected.raydebug

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
11
comment(# simple method definitions)
22

3-
reserved(def) method(method) ident(param1)operator(,) ident(param2)
3+
keyword(def) method(method) ident(param1)operator(,) ident(param2)
44
comment(# code)
5-
reserved(end)
5+
keyword(end)
66

7-
reserved(def) method(method)operator(()ident(args)operator(,) operator(*)ident(rest)operator(,) operator(&)ident(block)operator(\))
7+
keyword(def) method(method)operator(()ident(args)operator(,) operator(*)ident(rest)operator(,) operator(&)ident(block)operator(\))
88
comment(# code)
9-
reserved(end)
9+
keyword(end)
1010

11-
reserved(def)
11+
keyword(def)
1212
method(method)operator(()ident(param1)operator(,) ident(param2)operator(\))
1313
comment(# code)
14-
reserved(end)
14+
keyword(end)
1515

16-
reserved(def) \
16+
keyword(def) \
1717
method(method)operator(()ident(param1)operator(,) ident(param2)operator(\))
1818
comment(# code)
19-
reserved(end)
19+
keyword(end)
2020

21-
reserved(def) comment(# comment)
21+
keyword(def) comment(# comment)
2222
method(method)operator(()ident(param1)operator(,) ident(param2)operator(\))
2323
comment(# code)
24-
reserved(end)
24+
keyword(end)
2525

26-
reserved(def) method([])operator(;)reserved(end)
27-
reserved(def) method(def)operator(;)reserved(end)
28-
reserved(def) method(end?)operator(;)reserved(end)
29-
reserved(def) method(a)operator(()operator(*)operator(\)) reserved(end)
30-
reserved(def) method(!)operator(;) reserved(end) comment(# Ruby 1.9)
26+
keyword(def) method([])operator(;)keyword(end)
27+
keyword(def) method(def)operator(;)keyword(end)
28+
keyword(def) method(end?)operator(;)keyword(end)
29+
keyword(def) method(a)operator(()operator(*)operator(\)) keyword(end)
30+
keyword(def) method(!)operator(;) keyword(end) comment(# Ruby 1.9)
3131

3232

3333
comment(# singleton methods)
3434

35-
reserved(def) constant(Class)operator(.)method(method)
36-
reserved(end)
35+
keyword(def) constant(Class)operator(.)method(method)
36+
keyword(end)
3737

38-
reserved(def) predefined_constant(self)operator(.)method(method)
39-
reserved(end)
38+
keyword(def) predefined_constant(self)operator(.)method(method)
39+
keyword(end)
4040

41-
reserved(def) ident(object)operator(.)method(method)
42-
reserved(end)
41+
keyword(def) ident(object)operator(.)method(method)
42+
keyword(end)
4343

44-
reserved(def) ident(object)operator(.)method(Method)
45-
reserved(end)
44+
keyword(def) ident(object)operator(.)method(Method)
45+
keyword(end)
4646

47-
reserved(def) global_variable($~)operator(.)method(method)
48-
reserved(end)
47+
keyword(def) global_variable($~)operator(.)method(method)
48+
keyword(end)
4949

50-
reserved(def) predefined_constant(nil)operator(.)method(method)
51-
reserved(end)
52-
reserved(def) predefined_constant(true)operator(.)method(method)
53-
reserved(end)
54-
reserved(def) predefined_constant(false)operator(.)method(method)
55-
reserved(end)
56-
reserved(def) predefined_constant(__FILE__)operator(.)method(method)
57-
reserved(end)
58-
reserved(def) predefined_constant(__LINE__)operator(.)method(method)
59-
reserved(end)
60-
reserved(def) predefined_constant(__ENCODING__)operator(.)method(method)
61-
reserved(end)
62-
reserved(def) predefined_constant(__ENCODING__)operator(.)method(method)
63-
reserved(end)
50+
keyword(def) predefined_constant(nil)operator(.)method(method)
51+
keyword(end)
52+
keyword(def) predefined_constant(true)operator(.)method(method)
53+
keyword(end)
54+
keyword(def) predefined_constant(false)operator(.)method(method)
55+
keyword(end)
56+
keyword(def) predefined_constant(__FILE__)operator(.)method(method)
57+
keyword(end)
58+
keyword(def) predefined_constant(__LINE__)operator(.)method(method)
59+
keyword(end)
60+
keyword(def) predefined_constant(__ENCODING__)operator(.)method(method)
61+
keyword(end)
62+
keyword(def) predefined_constant(__ENCODING__)operator(.)method(method)
63+
keyword(end)
6464

65-
reserved(def) instance_variable(@instance_variable)operator(.)method(method)
66-
reserved(end)
65+
keyword(def) instance_variable(@instance_variable)operator(.)method(method)
66+
keyword(end)
6767

68-
reserved(def) instance_variable(@class_variable)operator(.)method(method)
69-
reserved(end)
68+
keyword(def) instance_variable(@class_variable)operator(.)method(method)
69+
keyword(end)
7070

71-
reserved(def) operator(()constant(Module)operator(::)constant(Class)operator(\))operator(.)method(method)
72-
reserved(end)
71+
keyword(def) operator(()constant(Module)operator(::)constant(Class)operator(\))operator(.)method(method)
72+
keyword(end)
7373

74-
reserved(def) operator(()ident(complex)operator(.)ident(expression)operator(\))operator(.)method(method)
75-
reserved(end)
74+
keyword(def) operator(()ident(complex)operator(.)ident(expression)operator(\))operator(.)method(method)
75+
keyword(end)
7676

77-
reserved(def) operator(()ident(complex)operator(.)ident(expression) operator(+) ident(another)operator(()ident(complex)operator(()ident(expression)operator(\))operator(\))operator(\))operator(.)method(method)
78-
reserved(end)
77+
keyword(def) operator(()ident(complex)operator(.)ident(expression) operator(+) ident(another)operator(()ident(complex)operator(()ident(expression)operator(\))operator(\))operator(\))operator(.)method(method)
78+
keyword(end)
7979

8080

8181
comment(# crazy)
8282

83-
reserved(def) operator(()reserved(class) class(Foo)
84-
reserved(def) method(initialize)operator(()ident(args)operator(\))
85-
reserved(def) method(yet_another_method)operator(;) reserved(end)
86-
reserved(end)
87-
reserved(end)operator(\))operator(.)method(method)operator(()ident(args)operator(,) operator(*)ident(rest)operator(,) operator(&)ident(block)operator(\))
88-
reserved(end)
83+
keyword(def) operator(()keyword(class) class(Foo)
84+
keyword(def) method(initialize)operator(()ident(args)operator(\))
85+
keyword(def) method(yet_another_method)operator(;) keyword(end)
86+
keyword(end)
87+
keyword(end)operator(\))operator(.)method(method)operator(()ident(args)operator(,) operator(*)ident(rest)operator(,) operator(&)ident(block)operator(\))
88+
keyword(end)
8989

9090
comment(# wrong)
91-
reserved(def) ident(foo)operator(.)ident(bar)error(.)ident(quux)
92-
reserved(end)
91+
keyword(def) ident(foo)operator(.)ident(bar)error(.)ident(quux)
92+
keyword(end)

‎ruby/diffed.expected.raydebug

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ error(@)error(@) integer(-1)operator(,)integer(6) operator(+)integer(1)operator(
77
operator(+)ident(require) string<delimiter(')content(login_system)delimiter(')>
88
ident(require) string<delimiter(')content(coderay)delimiter(')>
99

10-
reserved(class) class(PastesController) operator(<) constant(ApplicationController)
10+
keyword(class) class(PastesController) operator(<) constant(ApplicationController)
1111
operator(+) ident(include) constant(LoginSystem)
1212
operator(+)
1313
operator(+) ident(before_filter) symbol(:attempt_cookie_login)
@@ -16,15 +16,15 @@ operator(+) ident(before_filter) symbol(:attempt_cookie_login)
1616

1717
error(@)error(@) integer(-10)operator(,)integer(11) operator(+)integer(14)operator(,)integer(7) error(@)error(@)
1818

19-
reserved(def) method(show)
19+
keyword(def) method(show)
2020
instance_variable(@paste) operator(=) constant(Paste)operator(.)ident(find)operator(()ident(params)operator([)symbol(:id)operator(])operator(\))
21-
operator(-) reserved(if) ident(params)operator([)symbol(:key)operator(]) reserved(and) ident(params)operator([)symbol(:key)operator(])operator(==)constant(User)operator(.)ident(new)operator(()instance_variable(@paste)operator(.)ident(nick)operator(\))operator(.)ident(magic_mojo)
21+
operator(-) keyword(if) ident(params)operator([)symbol(:key)operator(]) keyword(and) ident(params)operator([)symbol(:key)operator(])operator(==)constant(User)operator(.)ident(new)operator(()instance_variable(@paste)operator(.)ident(nick)operator(\))operator(.)ident(magic_mojo)
2222
operator(-) ident(session)operator([)symbol(:login)operator(])operator(=)instance_variable(@paste)operator(.)ident(nick)
23-
operator(-) reserved(return) ident(redirect_to)operator(()symbol(:action) operator(=)operator(>) string<delimiter(')content(show)delimiter(')>operator(,) symbol(:id) operator(=)operator(>) instance_variable(@paste)operator(.)ident(id)operator(\))
24-
operator(-) reserved(end)
23+
operator(-) keyword(return) ident(redirect_to)operator(()symbol(:action) operator(=)operator(>) string<delimiter(')content(show)delimiter(')>operator(,) symbol(:id) operator(=)operator(>) instance_variable(@paste)operator(.)ident(id)operator(\))
24+
operator(-) keyword(end)
2525
operator(-)
26-
operator(+) ident(attempt_key_login) reserved(if) reserved(not) ident(logged_in?)
27-
reserved(unless) instance_variable(@paste)operator(.)ident(asset) reserved(or) reserved(not) instance_variable(@paste)operator(.)ident(body)operator(.)ident(blank?)
26+
operator(+) ident(attempt_key_login) keyword(if) keyword(not) ident(logged_in?)
27+
keyword(unless) instance_variable(@paste)operator(.)ident(asset) keyword(or) keyword(not) instance_variable(@paste)operator(.)ident(body)operator(.)ident(blank?)
2828
ident(render) symbol(:action) operator(=)operator(>) string<delimiter(")content(edit)delimiter(")>
29-
reserved(end)
29+
keyword(end)
3030

0 commit comments

Comments
 (0)