racc 1.4.15 → 1.4.16

data/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,14 +116,14 @@ rule
                   @field.msgid = val[1]
                 }
             ;
-  
+
   for       :  /* none */
             | FOR addr
                 {
                   @field.for_ = val[1].address
                 }
             ;
-  
+
   recvdatetime
             :  /* none */
             | ';' datetime
@@ -131,7 +131,7 @@ rule
                   @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}"

data/test/assets/mof.y

@@ -33,7 +33,7 @@ class MOF::Parser
 	octalValue
 	decimalValue
 	hexValue
-	
+
 rule
 
   /* Returns a Hash of filename and MofResult */
@@ -47,7 +47,7 @@ rule
 	    result[@name] = @result
 	  }
         ;
-	
+
   mofProduction
         : compilerDirective
 	| classDeclaration
@@ -66,7 +66,7 @@ rule
  * compilerDirective
  *
  */
- 
+
   compilerDirective
 	: "#" PRAGMA INCLUDE pragmaParameters_opt
 	  { raise MOF::Helper::Error.new(@name,@lineno,@line,"Missing filename after '#pragma include'") unless val[3]
@@ -107,7 +107,7 @@ rule
  * classDeclaration
  *
  */
- 
+
   classDeclaration
 	: qualifierList_opt CLASS className alias_opt superClass_opt "{" classFeatures "}" ";"
 	  { qualifiers = val[0]
@@ -151,7 +151,7 @@ rule
 	    result << val[2] if val[2]
 	  }
         ;
-	
+
   qualifier
 	: qualifierName qualifierParameter_opt flavor_opt
 	  { # Get qualifier decl
@@ -242,7 +242,7 @@ rule
 	    result = CIM::Property.new(type,val[2],val[0],val[4])
 	  }
         ;
-	
+
   referenceDeclaration
 	: qualifierList_opt objectRef referenceName array_opt defaultValue_opt ";"
 	  { if val[4]
@@ -308,7 +308,7 @@ rule
 	: /* empty */
         | parameterList
         ;
-	
+
   parameterList
 	: parameter parameters
 	  { result = val[1].unshift val[0] }
@@ -367,7 +367,7 @@ rule
 	: /* empty */
         | defaultValue
         ;
-	
+
   defaultValue
 	: "=" initializer
 	  { result = val[1] }
@@ -416,7 +416,7 @@ rule
 	| string stringValue
 	  { result = val[0] + val[1] }
 	;
-	
+
   referenceInitializer
 	: objectHandle
 	| aliasIdentifier
@@ -465,7 +465,7 @@ rule
  * qualifierDeclaration
  *
  */
- 
+
   qualifierDeclaration
           /*      0             1             2     3                 4 */
 	: QUALIFIER qualifierName qualifierType scope defaultFlavor_opt ";"
@@ -534,7 +534,7 @@ rule
  * instanceDeclaration
  *
  */
- 
+
   instanceDeclaration
 	: instance ";"
         ;
@@ -583,7 +583,7 @@ def initialize options = {}
   @includes = options[:includes] || []
   @quiet = options[:quiet]
   @style = options[:style] || :cim  # default to style CIM v2.2 syntax
-  
+
   @lineno = 1
   @file = nil
   @iconv = nil

data/test/assets/nullbug2.y

@@ -6,10 +6,10 @@ class A
 rule
   targ: operation voidhead
       | variable
-  
+
   voidhead : void B
   void:
-  
+
   operation: A
   variable : A
 end

data/test/assets/recv.y

@@ -4,19 +4,19 @@ rule
 
   content: RecvH         received
     ;
-  
+
   datetime: day
     ;
-  
+
   msgid: '<' spec '>';
-  
+
   day:
     | ATOM ','
     ;
-  
+
   received: recvitem_list recvdatetime
     ;
-  
+
   recvitem_list:
     | recvitem_list recvitem
     ;
@@ -26,25 +26,25 @@ rule
   by:
     | BY domain
     ;
-  
+
   via:
     | VIA ATOM
     ;
-  
+
   with: WITH ATOM
     ;
-  
+
   for:
     | FOR addr
     ;
-  
+
   recvdatetime:
     | ';' datetime
     ;
-  
+
   addr: mbox | group ;
 
-  mboxes: mbox     
+  mboxes: mbox
     | mboxes ',' mbox
     ;
 
@@ -59,21 +59,21 @@ rule
   routeaddr: '<' route spec '>'
     | '<' spec '>'
     ;
-  
+
   route: at_domains ':' ;
-  
-  at_domains: '@' domain  
+
+  at_domains: '@' domain
     | at_domains ',' '@' domain
     ;
-  
+
   spec: local '@' domain
-    | local  
+    | local
     ;
-  
+
   local: word
     | local '.' word
     ;
-  
+
   domain: domword
     | domain '.' domword
     ;
@@ -86,12 +86,12 @@ rule
   phrase: word
     | phrase word
     ;
-  
+
   word: atom
     | QUOTED
     | DIGIT
     ;
 
   atom: ATOM | FROM | BY | VIA | WITH | ID | FOR ;
-  
+
 end

data/test/assets/syntax.y

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

data/test/assets/twowaysql.y

@@ -196,7 +196,7 @@ def parse( io )
 
   # @q.push [ false, nil ]
   @q.push [ false, [@s.pos, nil] ]
-    
+
   ## call racc's private parse method
   do_parse
 end

data/test/helper.rb

@@ -1,21 +1,28 @@
+verbose = $VERBOSE
 $VERBOSE = true
-require 'minitest/autorun'
+begin
+
+require 'test/unit'
+begin
+  require_relative './lib/core_assertions'
+  Test::Unit::TestCase.include Test::Unit::CoreAssertions
+rescue LoadError
+end
 require 'racc/static'
 require 'fileutils'
 require 'tempfile'
 require 'timeout'
 
 module Racc
-  class TestCase < MiniTest::Unit::TestCase
+  class TestCase < Test::Unit::TestCase
     PROJECT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-    TEST_DIR = File.join(PROJECT_DIR, 'test')
-
-    RACC      = File.join(PROJECT_DIR, 'bin', 'racc')
-    OUT_DIR   = File.join(TEST_DIR, 'out')
-    TAB_DIR   = File.join(TEST_DIR, 'tab') # generated parsers go here
-    LOG_DIR   = File.join(TEST_DIR, 'log')
-    ERR_DIR   = File.join(TEST_DIR, 'err')
+    test_dir = File.join(PROJECT_DIR, 'test')
+    test_dir = File.join(PROJECT_DIR, 'racc') unless File.exist?(test_dir)
+    TEST_DIR = test_dir
+    racc = File.join(PROJECT_DIR, 'bin', 'racc')
+    racc = File.join(PROJECT_DIR, '..', 'libexec', 'racc') unless File.exist?(racc)
+    RACC = racc
     ASSET_DIR = File.join(TEST_DIR, 'assets') # test grammars
     REGRESS_DIR  = File.join(TEST_DIR, 'regress') # known-good generated outputs
 
@@ -25,32 +32,35 @@ module Racc
     ].join(':')
 
     def setup
-      [OUT_DIR, TAB_DIR, LOG_DIR, ERR_DIR].each do |dir|
-        FileUtils.mkdir_p(dir)
-      end
+      @TEMP_DIR = Dir.mktmpdir("racc")
+      @OUT_DIR  = File.join(@TEMP_DIR, 'out')
+      @TAB_DIR  = File.join(@TEMP_DIR, 'tab') # generated parsers go here
+      @LOG_DIR  = File.join(@TEMP_DIR, 'log')
+      @ERR_DIR  = File.join(@TEMP_DIR, 'err')
+      FileUtils.mkdir_p([@OUT_DIR, @TAB_DIR, @LOG_DIR, @ERR_DIR])
+      FileUtils.cp File.join(TEST_DIR, "src.intp"), @TEMP_DIR
     end
 
     def teardown
-      [OUT_DIR, TAB_DIR, LOG_DIR, ERR_DIR].each do |dir|
-        FileUtils.rm_rf(dir)
-      end
+      FileUtils.rm_f(File.join(@TEMP_DIR, "src.intp"))
+      FileUtils.rm_rf([@OUT_DIR, @TAB_DIR, @LOG_DIR, @ERR_DIR, @TEMP_DIR])
     end
 
-    def assert_compile(asset, args = [])
+    def assert_compile(asset, args = [], **opt)
       file = File.basename(asset, '.y')
       args = ([args].flatten) + [
         "#{ASSET_DIR}/#{file}.y",
         '-Do',
-        "-O#{OUT_DIR}/#{file}",
-        "-o#{TAB_DIR}/#{file}",
+        "-O#{@OUT_DIR}/#{file}",
+        "-o#{@TAB_DIR}/#{file}",
       ]
-      racc "#{args.join(' ')}"
+      racc(*args, **opt)
     end
 
     def assert_debugfile(asset, ok)
       file = File.basename(asset, '.y')
-      Dir.chdir(TEST_DIR) do
-        File.foreach("log/#{file}.y") do |line|
+      Dir.chdir(@LOG_DIR) do
+        File.foreach("#{file}.y") do |line|
           line.strip!
           case line
           when /sr/ then assert_equal "sr#{ok[0]}", line
@@ -66,10 +76,9 @@ module Racc
     end
 
     def assert_exec(asset)
+      lib_path = File.expand_path("../../lib", __FILE__)
       file = File.basename(asset, '.y')
-      Dir.chdir(TEST_DIR) do
-        ruby("#{TAB_DIR}/#{file}")
-      end
+      ruby "-I#{lib_path}", "#{@TAB_DIR}/#{file}"
     end
 
     def strip_version(source)
@@ -77,28 +86,30 @@ module Racc
     end
 
     def assert_output_unchanged(asset)
+      # racc generates the difference results in GitHub Actions
+      omit unless RUBY_PLATFORM =~ /darwin/
+
       file = File.basename(asset, '.y')
 
       expected = File.read("#{REGRESS_DIR}/#{file}")
-      actual   = File.read("#{TAB_DIR}/#{file}")
+      actual   = File.read("#{@TAB_DIR}/#{file}")
       result   = (strip_version(expected) == strip_version(actual))
 
       assert(result, "Output of test/assets/#{file}.y differed from " \
         "expectation. Try compiling it and diff with test/regress/#{file}.")
     end
 
-    def racc(arg)
-      ruby "-S #{RACC} #{arg}"
+    def racc(*arg, **opt)
+      lib_path = File.expand_path("../../lib", __FILE__)
+      ruby "-I#{lib_path}", "-S", RACC, *arg, **opt
     end
 
-    def ruby(arg)
-      Dir.chdir(TEST_DIR) do
-        Tempfile.open 'test' do |io|
-          cmd = "#{ENV['_'] || Gem.ruby} -I #{INC} #{arg} 2>#{io.path}"
-          result = system(cmd)
-          assert(result, io.read)
-        end
-      end
+    def ruby(*arg, **opt)
+      assert_ruby_status(["-C", @TEMP_DIR, *arg], **opt)
     end
   end
 end
+
+ensure
+$VERBOSE = verbose
+end