diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:41 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:41 +0000 |
| commit | ebfda42d044a684f71afe0640b91608c12fb6e1b (patch) | |
| tree | 2da96933c7d0ba4d6cc44b41e143d323016d3241 /lib/racc | |
| parent | bd938eccaf3aa8848faf9eebd6d7d15c24614561 (diff) | |
merges r20859 from trunk into ruby_1_9_1.
* lib/optparse/version.rb: remove variable shadowing to stop
warning. [ruby-core:20612]
* lib/irb/completion.rb, lib/net/imap.rb, lib/prime.rb,
lib/rinda/ring.rb, lib/racc/parser.rb,
lib/shell/command-processor.rb, lib/yaml/yamlnode.rb: ditto.
* lib/racc/parser.rb: remove space before parentheses.
* lib/shell/command-processor.rb, lib/shell/process-controller.rb:
use parentheses around arguments.
* lib/irb/ext/change-ws.rb, lib/rexml/validation/relaxng.rb,
lib/yaml/baseemitter.rb: indentation fix.
* lib/matrix.rb: small cosmetic change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/racc')
| -rw-r--r-- | lib/racc/parser.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb index a7408dd00a..e87a250e56 100644 --- a/lib/racc/parser.rb +++ b/lib/racc/parser.rb @@ -159,7 +159,6 @@ module Racc reduce_n, use_result, * = arg _racc_init_sysvars - tok = nil act = nil i = nil nerr = 0 @@ -189,7 +188,7 @@ module Racc ; end - while not (i = action_pointer[@racc_state[-1]]) or + while not(i = action_pointer[@racc_state[-1]]) or not @racc_read_next or @racc_t == 0 # $ unless i and i += @racc_t and |