Skip to content

Commit 1152955

Browse files
authored
Merge pull request #522 from aycabta/refactor-parse_constant
Refactor parse_constant
2 parents 90be993 + 3066e1b commit 1152955

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

lib/rdoc/parser/ruby.rb

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -872,21 +872,17 @@ def parse_constant container, tk, comment, ignore_constants = false
872872

873873
return unless name =~ /^\w+$/
874874

875-
eq_tk = get_tk
876-
877-
if :on_op == eq_tk[:kind] && '::' == eq_tk[:text] then
878-
unget_tk eq_tk
875+
if :on_op == peek_tk[:kind] && '::' == peek_tk[:text] then
879876
unget_tk tk
880877

881878
container, name_t, = get_class_or_module container, ignore_constants
882879

883880
name = name_t[:text]
884-
885-
eq_tk = get_tk
886881
end
887882

888883
is_array_or_hash = false
889-
if eq_tk && :on_lbracket == eq_tk[:kind]
884+
if peek_tk && :on_lbracket == peek_tk[:kind]
885+
get_tk
890886
nest = 1
891887
while bracket_tk = get_tk
892888
case bracket_tk[:kind]
@@ -898,14 +894,13 @@ def parse_constant container, tk, comment, ignore_constants = false
898894
end
899895
end
900896
skip_tkspace false
901-
eq_tk = get_tk
902897
is_array_or_hash = true
903898
end
904899

905-
unless eq_tk && :on_op == eq_tk[:kind] && '=' == eq_tk[:text] then
906-
unget_tk eq_tk
900+
unless peek_tk && :on_op == peek_tk[:kind] && '=' == peek_tk[:text] then
907901
return false
908902
end
903+
get_tk
909904

910905
value = ''
911906
con = RDoc::Constant.new name, value, comment

0 commit comments

Comments
 (0)