summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-30 04:47:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-01-30 04:47:44 +0000
commit9b0118a84cdc8f78a07343beaedb5ffb44e735dc (patch)
tree2a2e1867ea240b4882d212dbeba5572561771b4c
parent7c7133b7186a760927316468d850578a7fa09edf (diff)
refine assertions
* test/irb/test_ruby-lex.rb (test_prompt): invert confinue flag by FIXME comments. adjust line numbers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/irb/test_ruby-lex.rb18
1 files changed, 10 insertions, 8 deletions
diff --git a/test/irb/test_ruby-lex.rb b/test/irb/test_ruby-lex.rb
index ec02c6fafea..7e4d486b8dd 100644
--- a/test/irb/test_ruby-lex.rb
+++ b/test/irb/test_ruby-lex.rb
@@ -52,18 +52,18 @@ module TestIRB
prompts << a
end
}
- src = "#{<<-"begin;"}#{<<~'end;'}"
+ src, lineno = "#{<<-"begin;"}#{<<~'end;'}", __LINE__+1
begin;
# #;# LTYPE:INDENT:CONTINUE
- x #;# -:0:* # FIXME: a comment should not `continue'
+ x #;# -:0:- # FIXME: a comment should not `continue'
x( #;# -:0:-
) #;# -:1:*
a \ #;# -:0:-
#;# -:0:*
a; #;# -:0:-
- a #;# -:0:* # FIXME: a semicolon should not `continue'
+ a #;# -:0:- # FIXME: a semicolon should not `continue'
#;# -:0:-
- a #;# -:0:* # FIXME: an empty line should not `continue'
+ a #;# -:0:- # FIXME: an empty line should not `continue'
a = #;# -:0:-
' #;# -:0:*
' #;# ':0:*
@@ -73,18 +73,20 @@ module TestIRB
" #;# -:1:-
" #;# ":1:-
begin #;# -:1:-
- a #;# -:2:* # FIXME: the first line should not be `continue'd
+ a #;# -:2:- # FIXME: the first line should not be `continue'd
a #;# -:2:-
end #;# -:2:-
else #;# -:1:-
- nil #;# -:1:* # FIXME: just after `else' should not be `continue'd
+ nil #;# -:1:- # FIXME: just after `else' should not be `continue'd
end #;# -:1:-
end;
top_level_statement(src.gsub(/[ \t]*#;#.*/, ''))
src.each_line.with_index(1) do |line, i|
p = prompts.shift
- next unless /#;#\s*(?:-|(\S)):(\d+):(?:(\*)|-)/ =~ line
- assert_equal([$1, $2.to_i, true&$3, i], p[0..3], "#{i}:#{p[4]}: #{line}")
+ next unless /#;#\s*(?:-|(?<ltype>\S)):(?<indent>\d+):(?:(?<cont>\*)|-)(?:.*FIXME:(?<fixme>.*))?/ =~ line
+ indent = indent.to_i
+ cont = (fixme && /`continue'/.match?(fixme)) ^ cont
+ assert_equal([ltype, indent, cont, i], p[0..3], "#{lineno+i}:#{p[4]}: #{line}")
end
end