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 (parser_tokadd_mbchar): fix for ASCII chars. [ruby-dev:32432]

Browse source 
* parse.y (parser_parse_string, parser_here_document): prevent false
  error messages.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-02 13:08:03 +00:00
parent c650096adf
commit 1524572ce9
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun Dec 2 22:08:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_tokadd_mbchar): fix for ASCII chars. [ruby-dev:32432]
* parse.y (parser_parse_string, parser_here_document): prevent false
error messages.
Sun Dec 2 20:43:22 2007 Tanaka Akira <akr@fsij.org>
* re.c (unescape_escaped_nonascii): fix mbclen argument.

15
parse.y
View file

@ -5304,7 +5304,7 @@ static int
parser_tokadd_mbchar(struct parser_params *parser, int c)
{
int len = parser_mbclen();
if (lex_p + len > lex_pend) {
if (len <= 0 || lex_p + len - 1 > lex_pend) {
compile_error(PARSER_ARG "illegal multibyte char");
return -1;
}
@ -5491,11 +5491,13 @@ parser_parse_string(struct parser_params *parser, NODE *quote)
&enc) == -1) {
ruby_sourceline = nd_line(quote);
if (func & STR_FUNC_REGEXP) {
compile_error(PARSER_ARG "unterminated regexp meets end of file");
if (parser->eofp)
compile_error(PARSER_ARG "unterminated regexp meets end of file");
return tREGEXP_END;
}
else {
compile_error(PARSER_ARG "unterminated string meets end of file");
if (parser->eofp)
compile_error(PARSER_ARG "unterminated string meets end of file");
return tSTRING_END;
}
}
@ -5625,6 +5627,7 @@ parser_here_document(struct parser_params *parser, NODE *here)
if ((c = nextc()) == -1) {
error:
compile_error(PARSER_ARG "can't find string \"%s\" anywhere before EOF", eos);
restore:
heredoc_restore(lex_strterm);
lex_strterm = 0;
return 0;
@ -5678,8 +5681,10 @@ parser_here_document(struct parser_params *parser, NODE *here)
}
do {
pushback(c);
if ((c = tokadd_string(func, '\n', 0, NULL,
&enc)) == -1) goto error;
if ((c = tokadd_string(func, '\n', 0, NULL, &enc)) == -1) {
if (parser->eofp) goto error;
goto restore;
}
if (c != '\n') {
set_yylval_str(STR_NEW3(tok(), toklen(), enc, func));
return tSTRING_CONTENT;