Strip trailing whitespaces at the last line of actions

Author: nobu

lib/racc/grammarfileparser.rb

@@ -450,6 +450,7 @@ def scan_action
             nest -= 1
             if nest == 0
               @in_block = nil
+              buf.sub!(/[ \t\f]+\z/, '')
               return buf
             end
             buf << (pre = ch)

sample/calc-ja.y

@@ -26,7 +26,7 @@ end
 ---- header
 # $Id$
 ---- inner
-  
+
   def evaluate(str)
     @tokens = []
     until str.empty?

sample/calc.y

@@ -24,7 +24,7 @@ end
 ---- header
 # $Id$
 ---- inner
-  
+
   def parse(str)
     @q = []
     until str.empty?

sample/hash.y

@@ -7,7 +7,7 @@ class HashParser
 rule
   hash    : '{' contents '}'   { val[1] }
           | '{' '}'            { Hash.new }
-           
+
                   # Racc can handle string over 2 bytes.
   contents: IDENT '=>' IDENT              { {val[0] => val[2]} }
           | contents ',' IDENT '=>' IDENT { val[0][val[2]] = val[4]; val[0] }

sample/syntax.y

@@ -28,7 +28,7 @@ rule
               print 'cba'
             }
         | cont
-  
+
   cont  : A c2 B c2 C
 
   c2    : C C C C C

setup.rb

@@ -660,7 +660,7 @@ def command(*args)
   def ruby(*args)
     command config('rubyprog'), *args
   end
-  
+
   def make(task = nil)
     command(*[config('makeprog'), task].compact)
   end
@@ -723,7 +723,7 @@ def srcexist?(path)
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file?(srcfile(path))
   end
@@ -827,7 +827,7 @@ def invoke
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     @config.load_script "#{@ardir}/metaconfig"
   end
@@ -1405,7 +1405,7 @@ def mapdir(ents)
   end
 
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
+  JUNK_FILES = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$

test/assets/intp.y

@@ -27,7 +27,7 @@ rule
                   result.push val[1]
                 }
             | stmt_list EOL
-  
+
   stmt      : expr
             | assign
             | IDENT realprim
@@ -38,7 +38,7 @@ rule
             | if_stmt
             | while_stmt
             | defun
-  
+
   if_stmt   : IF stmt THEN EOL stmt_list else_stmt END
                 {
                   result = IfNode.new( @fname, val[0][0],
@@ -261,7 +261,7 @@ module Intp
 
   class Core
 
-    def initialize 
+    def initialize
       @ftab = {}
       @obj = Object.new
       @stack = []
@@ -318,7 +318,7 @@ module Intp
     def lvar?(name)
       @lvars.key? name
     end
-    
+
     def [](key)
       @lvars[key]
     end

test/assets/mailp.y

@@ -35,7 +35,7 @@ rule
                   @field.domain = mb.domain
                 }
             ;
-  
+
   datetime  : day DIGIT ATOM DIGIT hour zone
             # 0   1     2    3     4    5
             #     day  month year
@@ -44,11 +44,11 @@ rule
                   result = (t + val[4] - val[5]).localtime
                 }
             ;
-  
+
   day       :  /* none */
             | ATOM ','
             ;
-  
+
   hour      : DIGIT ':' DIGIT
                 {
                   result = (result.to_i * 60 * 60) + (val[2].to_i * 60)
@@ -60,16 +60,16 @@ rule
                            + val[4].to_i
                 }
             ;
-  
+
   zone      : ATOM
                 {
                   result = ::TMail.zonestr2i( val[0] ) * 60
                 }
             ;
-  
+
   received  : from by via with id for recvdatetime
             ;
-  
+
   from      : /* none */
             | FROM domain
                 {
@@ -84,28 +84,28 @@ rule
                   @field.from = Address.join( val[1] )
                 }
             ;
-  
+
   by        :  /* none */
             | BY domain
                 {
                   @field.by = Address.join( val[1] )
                 }
             ;
-  
+
   via       :  /* none */
             | VIA ATOM
                 {
                   @field.via = val[1]
                 }
             ;
-  
+
   with      : /* none */
             | WITH ATOM
                 {
                   @field.with.push val[1]
                 }
             ;
-  
+
   id        :  /* none */
             | ID msgid
                 {
@@ -116,22 +116,22 @@ rule
                   @field.msgid = val[1]
                 }
             ;
-  
+
   for       :  /* none */
             | FOR addr
                 {
                   @field.for_ = val[1].address
                 }
             ;
-  
+
   recvdatetime
             :  /* none */
             | ';' datetime
                 {
                   @field.date = val[1]
                 }
             ;
-  
+
   returnpath: '<' '>'
             | routeaddr
                 {
@@ -173,7 +173,7 @@ rule
                 }
           # |    phrase ':' ';' { result = AddressGroup.new( result ) }
             ;
-  
+
   routeaddr : '<' route spec '>'
                 {
                   result = val[2]
@@ -184,22 +184,22 @@ rule
                   result = val[1]
                 }
             ;
-  
+
   route     : at_domains ':'
             ;
-  
+
   at_domains: '@' domain                { result = [ val[1] ] }
             | at_domains ',' '@' domain { result.push val[3] }
             ;
-  
+
   spec      : local '@' domain { result = Address.new( val[0], val[2] ) }
             | local            { result = Address.new( result, nil ) }
             ;
-  
+
   local     : word           { result = val }
             | local '.' word { result.push val[2] }
             ;
-  
+
   domain    : domword            { result = val }
             | domain '.' domword { result.push val[2] }
             ;
@@ -215,11 +215,11 @@ rule
                   result = val.join('')
                 }
             ;
-  
+
   phrase    : word
             | phrase word { result << ' ' << val[1] }
             ;
-  
+
   word      : atom
             | QUOTED
             | DIGIT
@@ -228,7 +228,7 @@ rule
   keys      : phrase
             | keys ',' phrase
             ;
-  
+
   enc       : word
                 {
                   @field.encrypter = val[0]
@@ -258,7 +258,7 @@ rule
                   @field.sub  = ''
                 }
             ;
-  
+
   params    : /* none */
             | params ';' TOKEN '=' value
                 {
@@ -281,7 +281,7 @@ rule
                   @field.disposition = val[0]
                 }
             ;
-  
+
   disp_params
             :  /* none */
             | disp_params ';' disp_param
@@ -293,7 +293,7 @@ rule
                   @field.params[ val[0].downcase ] = val[2]
                 }
             ;
-  
+
   atom      : ATOM
             | FROM
             | BY
@@ -302,7 +302,7 @@ rule
             | ID
             | FOR
             ;
-  
+
 end
 
 
@@ -382,7 +382,7 @@ module TMail
       @scanner.scan @pass_array
     end
   end
-  
+
   def on_error( tok, val, vstack )
     raise ParseError,
       "\nparse error in '#{@field.name}' header, on token #{val.inspect}"