From e5f2b421c0b5134a58a4cf45234f54c376fd1297 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 26 Jun 2006 14:15:49 +0000 Subject: * ext/socket/socket.c (sock_accept): revert to avoid ambiguity of argument evaluation order. [ruby-dev:28861] * ext/socket/socket.c (sock_accept_nonblock): ditto. * io.c (pipe_open): avoid closing uninitialized file descriptors. a patch from [ruby-dev:28600] * parse.y: replace terminal token names with more descriptive name, i.e. kEND to keyword_end. [ruby-list:42477] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/ripper/eventids2.c | 94 +++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'ext/ripper') diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c index ba9c90269a..629040127b 100644 --- a/ext/ripper/eventids2.c +++ b/ext/ripper/eventids2.c @@ -137,53 +137,53 @@ static struct token_assoc { {';', &ripper_id_semicolon}, {'`', &ripper_id_backtick}, {'\n', &ripper_id_nl}, - {kALIAS, &ripper_id_kw}, - {kAND, &ripper_id_kw}, - {kBEGIN, &ripper_id_kw}, - {kBREAK, &ripper_id_kw}, - {kCASE, &ripper_id_kw}, - {kCLASS, &ripper_id_kw}, - {kDEF, &ripper_id_kw}, - {kDEFINED, &ripper_id_kw}, - {kDO, &ripper_id_kw}, - {kDO_BLOCK, &ripper_id_kw}, - {kDO_COND, &ripper_id_kw}, - {kELSE, &ripper_id_kw}, - {kELSIF, &ripper_id_kw}, - {kEND, &ripper_id_kw}, - {kENSURE, &ripper_id_kw}, - {kFALSE, &ripper_id_kw}, - {kFOR, &ripper_id_kw}, - {kIF, &ripper_id_kw}, - {kIF_MOD, &ripper_id_kw}, - {kIN, &ripper_id_kw}, - {kMODULE, &ripper_id_kw}, - {kNEXT, &ripper_id_kw}, - {kNIL, &ripper_id_kw}, - {kNOT, &ripper_id_kw}, - {kOR, &ripper_id_kw}, - {kREDO, &ripper_id_kw}, - {kRESCUE, &ripper_id_kw}, - {kRESCUE_MOD, &ripper_id_kw}, - {kRETRY, &ripper_id_kw}, - {kRETURN, &ripper_id_kw}, - {kSELF, &ripper_id_kw}, - {kSUPER, &ripper_id_kw}, - {kTHEN, &ripper_id_kw}, - {kTRUE, &ripper_id_kw}, - {kUNDEF, &ripper_id_kw}, - {kUNLESS, &ripper_id_kw}, - {kUNLESS_MOD, &ripper_id_kw}, - {kUNTIL, &ripper_id_kw}, - {kUNTIL_MOD, &ripper_id_kw}, - {kWHEN, &ripper_id_kw}, - {kWHILE, &ripper_id_kw}, - {kWHILE_MOD, &ripper_id_kw}, - {kYIELD, &ripper_id_kw}, - {k__FILE__, &ripper_id_kw}, - {k__LINE__, &ripper_id_kw}, - {klBEGIN, &ripper_id_kw}, - {klEND, &ripper_id_kw}, + {keyword_alias, &ripper_id_kw}, + {keyword_and, &ripper_id_kw}, + {keyword_begin, &ripper_id_kw}, + {keyword_break, &ripper_id_kw}, + {keyword_case, &ripper_id_kw}, + {keyword_class, &ripper_id_kw}, + {keyword_def, &ripper_id_kw}, + {keyword_defined, &ripper_id_kw}, + {keyword_do, &ripper_id_kw}, + {keyword_do_block, &ripper_id_kw}, + {keyword_do_cond, &ripper_id_kw}, + {keyword_else, &ripper_id_kw}, + {keyword_elsif, &ripper_id_kw}, + {keyword_end, &ripper_id_kw}, + {keyword_ensure, &ripper_id_kw}, + {keyword_false, &ripper_id_kw}, + {keyword_for, &ripper_id_kw}, + {keyword_if, &ripper_id_kw}, + {modifier_if, &ripper_id_kw}, + {keyword_in, &ripper_id_kw}, + {keyword_module, &ripper_id_kw}, + {keyword_next, &ripper_id_kw}, + {keyword_nil, &ripper_id_kw}, + {keyword_not, &ripper_id_kw}, + {keyword_or, &ripper_id_kw}, + {keyword_redo, &ripper_id_kw}, + {keyword_rescue, &ripper_id_kw}, + {modifier_rescue, &ripper_id_kw}, + {keyword_retry, &ripper_id_kw}, + {keyword_return, &ripper_id_kw}, + {keyword_self, &ripper_id_kw}, + {keyword_super, &ripper_id_kw}, + {keyword_then, &ripper_id_kw}, + {keyword_true, &ripper_id_kw}, + {keyword_undef, &ripper_id_kw}, + {keyword_unless, &ripper_id_kw}, + {modifier_unless, &ripper_id_kw}, + {keyword_until, &ripper_id_kw}, + {modifier_until, &ripper_id_kw}, + {keyword_when, &ripper_id_kw}, + {keyword_while, &ripper_id_kw}, + {modifier_while, &ripper_id_kw}, + {keyword_yield, &ripper_id_kw}, + {keyword__FILE__, &ripper_id_kw}, + {keyword__LINE__, &ripper_id_kw}, + {keyword_BEGIN, &ripper_id_kw}, + {keyword_END, &ripper_id_kw}, {tAMPER, &ripper_id_op}, {tANDOP, &ripper_id_op}, {tAREF, &ripper_id_op}, -- cgit v1.2.3