summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-31 11:44:49 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-31 11:44:49 +0000
commitf072d4e34a70d79a78d06616aad3658dd6b97141 (patch)
treee057c597ca1693829f73ebba7161435fc7176685 /parse.y
parent0d0c31ff8414edc38417b7b172819275e03f4dc3 (diff)
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y10
1 files changed, 5 insertions, 5 deletions
diff --git a/parse.y b/parse.y
index 1834778..94505c7 100644
--- a/parse.y
+++ b/parse.y
@@ -4524,7 +4524,7 @@ yylex()
}
if (lex_state != EXPR_DOT) {
- struct kwtable *kw;
+ const struct kwtable *kw;
/* See if it is a reserved word. */
kw = rb_reserved_word(tok(), toklen());
@@ -5178,7 +5178,7 @@ static void
void_expr0(node)
NODE *node;
{
- char *useless = 0;
+ const char *useless = 0;
if (!RTEST(ruby_verbose)) return;
@@ -5945,7 +5945,7 @@ rb_parser_while_loop(chop, split)
static struct {
ID token;
- char *name;
+ const char *name;
} op_tbl[] = {
{tDOT2, ".."},
{tDOT3, "..."},
@@ -6193,11 +6193,11 @@ rb_intern(name)
return id;
}
-char *
+const char *
rb_id2name(id)
ID id;
{
- char *name;
+ const char *name;
st_data_t data;
if (id < tLAST_TOKEN) {