* test/bench.y: remove dependency on amstd.

* test/chk.y: ditto.
* test/echk.y: ditto.
* test/ichk.y: ditto.
* test/intp.y: ditto.
* test/opt.y: ditto.
* test/percent.y: ditto.


git-svn-id: file:///Users/aaron/Desktop/public/racc/trunk@2089 1b9489fe-b721-0410-924e-b54b9192deb8

Author: aamine

ChangeLog

@@ -1,3 +1,19 @@
+Wed Nov  5 19:50:35 2003  Minero Aoki  <[email protected]>
+
+	* test/bench.y: remove dependency on amstd.
+
+	* test/chk.y: ditto.
+
+	* test/echk.y: ditto.
+
+	* test/ichk.y: ditto.
+
+	* test/intp.y: ditto.
+
+	* test/opt.y: ditto.
+
+	* test/percent.y: ditto.
+
 Wed Nov  5 19:11:15 2003  Minero Aoki  <[email protected]>
 
 	* bin/racc (get_options): remove --no-extensions option;

test/bench.y

@@ -1,5 +1,4 @@
-
-class Bench
+class BenchmarkParser
 
 rule
 
@@ -30,9 +29,8 @@ end
 
 ---- footer
 
-require 'amstd/bench'
+require 'benchmark'
 
-p = Bench.new
-benchmark( 'do', 1 ) {
-  p.parse
-}
+Benchmark.bm do |x|
+  x.report { BenchmarkParser.new.parse }
+end

test/chk.y

@@ -23,7 +23,7 @@ rule
          | exp '/' exp { result /= val[2] }
          | '(' { $emb = true } exp ')'
              {
-               bug! unless $emb
+               raise 'must not happen' unless $emb
                result = val[2]
              }
          | '-' NUMBER  { result = -val[1] }
@@ -32,28 +32,25 @@ rule
 
 end
 
------- prepare -----------------------------
+----header
 
-require 'amstd/bug'
+class Number; end
 
-class Number ; end
-
------- inner -------------------------------
+----inner
 
   def parse( src )
     $emb = false
-    @plus = @str = nil
-
+    @plus = nil
+    @str = nil
     @src = src
-    ret = do_parse
-    if @plus then
-      @plus == 'plus' or bug! 'string parse failed'
+    result = do_parse
+    if @plus
+      raise 'string parse failed' unless @plus == 'plus'
     end
-    if @str then
-      @str == 'string test' or bug! 'string parse failed'
+    if @str
+      raise 'string parse failed' unless @str == 'string test'
     end
-
-    ret
+    result
   end
 
   def next_token
@@ -64,17 +61,15 @@ class Number ; end
     @yydebug = true
   end
 
------- driver -------------------------------
+----footer
 
 $parser = Calcp.new
-$tidx = 1
+$test_number = 1
 
 def chk( src, ans )
-  ret = $parser.parse( src )
-  unless ret == ans then
-    bug! "test #{$tidx} fail"
-  end
-  $tidx += 1
+  result = $parser.parse(src)
+  raise "test #{$test_number} fail" unless result == ans
+  $test_number += 1
 end
 
 chk(

test/echk.y

@@ -23,7 +23,7 @@ rule
          | exp '/' exp { result /= val[2] }
          | '(' { $emb = true } exp ')'
              {
-               bug! unless $emb
+               raise 'must not heppen' unless $emb
                result = val[2]
              }
          | '-' NUMBER  { result = -val[1] }
@@ -32,14 +32,11 @@ rule
 
 end
 
------- prepare -----------------------------
-
-require 'amstd/bug'
-
+----header
 
 class Number ; end
 
------- inner -------------------------------
+----inner
 
   def parse( src )
     @src = src
@@ -54,7 +51,7 @@ class Number ; end
     @yydebug = true
   end
 
------- driver -------------------------------
+----footer
 
 $parser = Calcp.new
 $tidx = 1

test/ichk.y

@@ -32,14 +32,11 @@ rule
 
 end
 
------- prepare -----------------------------
+----header
 
-require 'amstd/bug'
+class Number; end
 
-
-class Number ; end
-
------- inner -------------------------------
+----inner
 
   def parse( src )
     @src = src
@@ -55,17 +52,15 @@ class Number ; end
     @yydebug = true
   end
 
------- driver -------------------------------
+----footer
 
 $parser = Calcp.new
-$tidx = 1
+$test_number = 1
 
 def chk( src, ans )
-  ret = $parser.parse( src )
-  unless ret == ans then
-    bug! "test #{$tidx} fail"
-  end
-  $tidx += 1
+  result = $parser.parse( src )
+  raise "test #{$test_number} fail" unless result == ans
+  $test_number += 1
 end
 
 chk(

test/intp.y

@@ -185,9 +185,6 @@ end
 #
 # intp/parser.rb
 #
-                     ####
-require 'amstd/bug'  ####
-                     ####
 
 ---- inner
 
@@ -248,10 +245,6 @@ require 'amstd/bug'  ####
       lineno += 1
     end
     @q.push [ false, '$' ]
-if $DEBUG then                 #####
-# $stderr.puts @q.inspect        #####
-@yydebug = true                #####
-end                            #####
 
     do_parse
   end

test/opt.y

@@ -25,7 +25,7 @@ rule
          | exp '/' exp { chk(val[0] / val[2]) }
          | '(' { $emb = true } exp ')'
              {
-               bug! unless $emb
+	       raise 'must not happen' unless $emb
                val[2]
              }
          | '-' NUMBER  { -val[1] }
@@ -34,13 +34,11 @@ rule
 
 end
 
------- prepare -----------------------------
+----header
 
-require 'amstd/bug'
+class Number; end
 
-class Number ; end
-
------- inner -------------------------------
+----inner
 
   def parse( src )
     @src = src
@@ -60,17 +58,15 @@ class Number ; end
     i
   end
 
------- driver -------------------------------
+----footer
 
 $parser = Calcp.new
-$tidx = 1
+$test_number = 1
 
 def chk( src, ans )
-  ret = $parser.parse( src )
-  unless ret == ans then
-    bug! "test #{$tidx} fail"
-  end
-  $tidx += 1
+  result = $parser.parse(src)
+  raise "test #{$test_number} failed" unless result == ans
+  $test_number += 1
 end
 
 chk(

test/percent.y

@@ -1,17 +1,17 @@
-class P
+class ScannerChecker
 rule
   target: A
       {
         i = 7
         i %= 4
-        i.must_be 3
-        tmp = %-percent string-
-        tmp.must_be 'percent string'
+	raise 'assert failed' unless i == 3
+        tmp = %-This is percent string.-
+	raise 'assert failed' unless tmp == 'This is percent string.'
         a = 5; b = 3
-        (a%b).must_be 2    #A
-      # (a %b).must_be 2    is % string
-        (a% b).must_be 2   #B
-        (a % b).must_be 2  #C
+        assert_equal(2,(a%b))    #A
+      # assert_equal(2,(a %b))   # is %-string
+        assert_equal(2,(a% b))   #B
+        assert_equal(2,(a % b))  #C
       }
 end
 
@@ -26,7 +26,10 @@ end
     @q.shift
   end
 
+  def assert_equal( expect, real )
+    raise "expect #{expect.inspect} but #{real.inspect}" unless expect == real
+  end
+
 ---- footer ----
 
-require 'amstd/must'
-parser = P.new.parse
+parser = ScannerChecker.new.parse