kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: adjust error indicator

Browse source 
* parse.y (parser_yylex): adjust the error indicator of unexpected
  fraction part.

before:
~~~
1.2.3
^~~
~~~

after:
~~~
1.2.3
   ^~
~~~
This commit is contained in:
Nobuyoshi Nakada 2019-05-26 18:45:59 +09:00
parent 5830889915
commit 2ce6365f9c
No known key found for this signature in database
GPG key ID: 4BC7D6DF58D8DF60
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
parse.y
View file

@ -7106,14 +7106,6 @@ number_literal_suffix(struct parser_params *p, int mask)
return 0; return 0;
} }
pushback(p, c); pushback(p, c);
if (c == '.') {
c = peekc_n(p, 1);
if (ISDIGIT(c)) {
yyerror0("unexpected fraction part after numeric literal");
p->lex.pcur += 2;
while (parser_is_identchar(p)) nextc(p);
}
}
break; break;
} }
return result; return result;
@ -8959,8 +8951,18 @@ parser_yylex(struct parser_params *p)
} }
pushback(p, c); pushback(p, c);
if (c != -1 && ISDIGIT(c)) { if (c != -1 && ISDIGIT(c)) {
char prev = p->lex.pcur-1 > p->lex.pbeg ? *(p->lex.pcur-2) : 0;
parse_numeric(p, '.');
if (ISDIGIT(prev)) {
yyerror0("unexpected fraction part after numeric literal");
}
else {
yyerror0("no .<digit> floating literal anymore; put 0 before dot"); yyerror0("no .<digit> floating literal anymore; put 0 before dot");
} }
SET_LEX_STATE(EXPR_END);
p->lex.ptok = p->lex.pcur;
goto retry;
}
set_yylval_id('.'); set_yylval_id('.');
SET_LEX_STATE(EXPR_DOT); SET_LEX_STATE(EXPR_DOT);
return '.'; return '.';

2
test/irb/test_color.rb
View file

@ -35,7 +35,7 @@ module TestIRB
'"foo#{a} #{b}"' => "#{RED}\"#{CLEAR}#{RED}foo#{CLEAR}#{RED}\#{#{CLEAR}a#{RED}}#{CLEAR}#{RED} #{CLEAR}#{RED}\#{#{CLEAR}b#{RED}}#{CLEAR}#{RED}\"#{CLEAR}", '"foo#{a} #{b}"' => "#{RED}\"#{CLEAR}#{RED}foo#{CLEAR}#{RED}\#{#{CLEAR}a#{RED}}#{CLEAR}#{RED} #{CLEAR}#{RED}\#{#{CLEAR}b#{RED}}#{CLEAR}#{RED}\"#{CLEAR}",
'/r#{e}g/' => "#{RED}#{BOLD}/#{CLEAR}#{RED}r#{CLEAR}#{RED}\#{#{CLEAR}e#{RED}}#{CLEAR}#{RED}g#{CLEAR}#{RED}#{BOLD}/#{CLEAR}", '/r#{e}g/' => "#{RED}#{BOLD}/#{CLEAR}#{RED}r#{CLEAR}#{RED}\#{#{CLEAR}e#{RED}}#{CLEAR}#{RED}g#{CLEAR}#{RED}#{BOLD}/#{CLEAR}",
"'a\nb'" => "#{RED}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}'#{CLEAR}", "'a\nb'" => "#{RED}'#{CLEAR}#{RED}a#{CLEAR}\n#{RED}b#{CLEAR}#{RED}'#{CLEAR}",
"4.5.6" => "#{MAGENTA}#{BOLD}4.5.6#{CLEAR}", "4.5.6" => "4.5.6",
"[1]]]" => "[1]]]", "[1]]]" => "[1]]]",
"\e[0m\n" => "^[[#{BLUE}#{BOLD}0#{CLEAR}m\n", "\e[0m\n" => "^[[#{BLUE}#{BOLD}0#{CLEAR}m\n",
"%w[a b]" => "#{RED}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}]#{CLEAR}", "%w[a b]" => "#{RED}%w[#{CLEAR}#{RED}a#{CLEAR} #{RED}b#{CLEAR}#{RED}]#{CLEAR}",

3
test/ruby/test_parse.rb
View file

@ -1086,6 +1086,9 @@ x = __ENCODING__
assert_raise_with_message(SyntaxError, /^ \^~~\z/) do assert_raise_with_message(SyntaxError, /^ \^~~\z/) do
eval('1.2i1.1') eval('1.2i1.1')
end end
assert_raise_with_message(SyntaxError, /^ \^~\z/) do
eval('1.2.3')
end
end end
def test_truncated_source_line def test_truncated_source_line