1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parser.y (struct parser_params): parser never modify input string.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-10-20 13:15:19 +00:00
parent e29bce0750
commit 14029df930
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Oct 20 22:14:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parser.y (struct parser_params): parser never modify input string.
Thu Oct 20 11:41:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> Thu Oct 20 11:41:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* class.c, eval.c, hash.c, st.c, variable.c: changed /* ??? */ stuff * class.c, eval.c, hash.c, st.c, variable.c: changed /* ??? */ stuff

35
parse.y
View File

@ -149,9 +149,9 @@ struct parser_params {
int parser_toksiz; int parser_toksiz;
VALUE parser_lex_input; VALUE parser_lex_input;
VALUE parser_lex_lastline; VALUE parser_lex_lastline;
char *parser_lex_pbeg; const char *parser_lex_pbeg;
char *parser_lex_p; const char *parser_lex_p;
char *parser_lex_pend; const char *parser_lex_pend;
int parser_heredoc_end; int parser_heredoc_end;
int parser_command_start; int parser_command_start;
int parser_lex_gets_ptr; int parser_lex_gets_ptr;
@ -167,7 +167,7 @@ struct parser_params {
/* Ripper only */ /* Ripper only */
int parser_ruby_sourceline; int parser_ruby_sourceline;
VALUE parser_ruby_sourcefile; VALUE parser_ruby_sourcefile;
char *tokp; const char *tokp;
VALUE delayed; VALUE delayed;
int delayed_line; int delayed_line;
int delayed_col; int delayed_col;
@ -4461,7 +4461,7 @@ static void
ripper_dispatch_delayed_token(struct parser_params *parser, int t) ripper_dispatch_delayed_token(struct parser_params *parser, int t)
{ {
int saved_line = ruby_sourceline; int saved_line = ruby_sourceline;
char *saved_tokp = parser->tokp; const char *saved_tokp = parser->tokp;
ruby_sourceline = parser->delayed_line; ruby_sourceline = parser->delayed_line;
parser->tokp = lex_pbeg + parser->delayed_col; parser->tokp = lex_pbeg + parser->delayed_col;
@ -4492,7 +4492,8 @@ static int
parser_yyerror(struct parser_params *parser, const char *msg) parser_yyerror(struct parser_params *parser, const char *msg)
{ {
#ifndef RIPPER #ifndef RIPPER
char *p, *pe, *buf; const char *p, *pe;
char *buf;
int len, i; int len, i;
rb_compile_error("%s", msg); rb_compile_error("%s", msg);
@ -4511,17 +4512,18 @@ parser_yyerror(struct parser_params *parser, const char *msg)
len = pe - p; len = pe - p;
if (len > 4) { if (len > 4) {
char *p2;
buf = ALLOCA_N(char, len+2); buf = ALLOCA_N(char, len+2);
MEMCPY(buf, p, char, len); MEMCPY(buf, p, char, len);
buf[len] = '\0'; buf[len] = '\0';
rb_compile_error_append("%s", buf); rb_compile_error_append("%s", buf);
i = lex_p - p; i = lex_p - p;
p = buf; pe = p + len; p2 = buf; pe = buf + len;
while (p < pe) { while (p2 < pe) {
if (*p != '\t') *p = ' '; if (*p2 != '\t') *p2 = ' ';
p++; p2++;
} }
buf[i] = '^'; buf[i] = '^';
buf[i+1] = '\0'; buf[i+1] = '\0';
@ -5292,7 +5294,7 @@ static int
parser_whole_match_p(struct parser_params *parser, parser_whole_match_p(struct parser_params *parser,
const char *eos, int len, int indent) const char *eos, int len, int indent)
{ {
char *p = lex_pbeg; const char *p = lex_pbeg;
int n; int n;
if (indent) { if (indent) {
@ -5308,7 +5310,7 @@ static int
parser_here_document(struct parser_params *parser, NODE *here) parser_here_document(struct parser_params *parser, NODE *here)
{ {
int c, func, indent = 0; int c, func, indent = 0;
char *eos, *p, *pend; const char *eos, *p, *pend;
long len; long len;
VALUE str = 0; VALUE str = 0;
@ -6570,7 +6572,7 @@ parser_yylex(struct parser_params *parser)
c = '_'; c = '_';
/* fall through */ /* fall through */
case '~': /* $~: match-data */ case '~': /* $~: match-data */
local_cnt(c); (void)local_cnt(c);
/* fall through */ /* fall through */
case '*': /* $*: argv */ case '*': /* $*: argv */
case '$': /* $$: pid */ case '$': /* $$: pid */
@ -8362,6 +8364,7 @@ char *
rb_id2name(ID id) rb_id2name(ID id)
{ {
char *name; char *name;
st_data_t data;
if (id < tLAST_TOKEN) { if (id < tLAST_TOKEN) {
int i = 0; int i = 0;
@ -8372,8 +8375,8 @@ rb_id2name(ID id)
} }
} }
if (st_lookup(global_symbols.rev, id, (st_data_t *)&name)) if (st_lookup(global_symbols.rev, id, &data))
return name; return (char *)data;
if (is_attrset_id(id)) { if (is_attrset_id(id)) {
ID id2 = (id & ~ID_SCOPE_MASK) | ID_LOCAL; ID id2 = (id & ~ID_SCOPE_MASK) | ID_LOCAL;
@ -8686,7 +8689,7 @@ rb_parser_free(struct parser_params *parserp, void *ptr)
{ {
NODE **prev = &parserp->heap, *n; NODE **prev = &parserp->heap, *n;
while (n = *prev) { while ((n = *prev) != NULL) {
if (n->u1.node == ptr) { if (n->u1.node == ptr) {
*prev = n->u2.node; *prev = n->u2.node;
rb_gc_force_recycle((VALUE)n); rb_gc_force_recycle((VALUE)n);