diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-01-17 08:37:53 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-01-17 08:37:53 +0000 |
commit | dde62bcd2efbb3825d982326896ab774e73e4218 (patch) | |
tree | 6a421d3818dd390cf8f6b2c5544726a8950e1401 /parse.y | |
parent | e43877719bd4bbd12e493e896a0f98c5b349937b (diff) | |
download | ruby-dde62bcd2efbb3825d982326896ab774e73e4218.tar.gz |
2000-01-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 25 |
1 files changed, 13 insertions, 12 deletions
@@ -3007,11 +3007,8 @@ yylex() case ':': c = nextc(); if (c == ':') { - if (lex_state == EXPR_BEG || lex_state == EXPR_MID) { - lex_state = EXPR_BEG; - return tCOLON3; - } - if (lex_state == EXPR_ARG && space_seen) { + if (lex_state == EXPR_BEG || lex_state == EXPR_MID || + (lex_state == EXPR_ARG && space_seen)) { lex_state = EXPR_BEG; return tCOLON3; } @@ -3284,7 +3281,7 @@ yylex() tokfix(); { - int result; + int result = 0; switch (tok()[0]) { case '$': @@ -3312,22 +3309,25 @@ yylex() } } - if (ISUPPER(tok()[0])) { - result = tCONSTANT; - } - else if (toklast() == '!' || toklast() == '?') { + if (toklast() == '!' || toklast() == '?') { result = tFID; } else { - result = tIDENTIFIER; if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) { if ((c = nextc()) == '=' && !peek('=')) { + result = tIDENTIFIER; tokadd(c); } else { pushback(c); } } + if (result == 0 && ISUPPER(tok()[0])) { + result = tCONSTANT; + } + else { + result = tIDENTIFIER; + } } if (lex_state == EXPR_BEG || lex_state == EXPR_DOT || @@ -3841,6 +3841,7 @@ arg_concat(node1, node2) NODE *node1; NODE *node2; { + if (!node2) return node1; return NEW_ARGSCAT(node1, node2); } @@ -3854,7 +3855,7 @@ arg_add(node1, node2) return list_append(node1, node2); } else { - return NEW_ARGSCAT(node1, node2); + return NEW_ARGSPUSH(node1, node2); } } |