From 096845e09f2a41943d97bbab3bb58d171679eaa2 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Dec 2008 11:37:41 +0000
Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/racc/parser.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/racc/parser.rb')

diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb
index a7408dd00..e87a250e5 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
-- 
cgit