nolines.rb in rio-0.3.4

- old
+ new

@@ -6,12 +6,12 @@
 
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
 
-class TC_RIO_nolines < Test::Unit::TestCase
-  def tdir() rio(%w/qp nolines/) end
+class TC_RIO_skiplines < Test::Unit::TestCase
+  def tdir() rio(%w/qp skiplines/) end
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
   require 'extensions/symbol'
   def smap(a) a.map( &:to_s ) end
@@ -42,14 +42,14 @@
     lines[1] = "\n"
     lines[6] = "\n"
     file < lines
 
     exp = lines[0..0] + lines[2..5] + lines[7...8]
-    ans = file.chomp.nolines[:empty?]
+    ans = file.chomp.skiplines[:empty?]
     assert_equal(exp.map(&:chomp),ans)
 
-    ans = file.nolines(:empty?).chomp.to_a
+    ans = file.skiplines(:empty?).chomp.to_a
     assert_equal(exp.map(&:chomp),ans)
 
     file.close
     rio('..').chdir
   end
@@ -71,25 +71,25 @@
     exp = lines[1..1] + lines[5...8]
 
     # iterate over the first line and comment lines
     begin
       f0 = file.dup
-      ans = f0.nolines[0,/^\s*#/]
+      ans = f0.skiplines[0,/^\s*#/]
       assert_equal(exp,ans)
     end
 
     begin
       f0 = file.dup
-      ans = f0.nolines[proc { |rec,rnum,rio| rnum == 0 || rec =~ /^\s*#/ }]
+      ans = f0.skiplines[proc { |rec,rnum,rio| rnum == 0 || rec =~ /^\s*#/ }]
       assert_equal(exp,ans)
     end
     begin
       f0 = file.dup
       
       #$trace_states = true
       exp0 = lines[0..1] + lines[5...8] 
-      ans = f0.nolines[/^\s*#/]
+      ans = f0.skiplines[/^\s*#/]
       #p f0.cx
       #$trace_states = false
       assert_equal(exp0,ans)
     end
   end
@@ -100,45 +100,45 @@
     ans = file.lines[proc { |rec,rnum,ario| rec =~ /#{ario.filename}/ }]
     assert_equal(exp1,ans)
 
     exp2 = lines[2..4]
     exp = exp1 - exp2
-    ans = file.lines(proc { |rec,rnum,ario| rec =~ /#{ario.filename}/ }).nolines[/^\s*#/]
+    ans = file.lines(proc { |rec,rnum,ario| rec =~ /#{ario.filename}/ }).skiplines[/^\s*#/]
     assert_equal(exp,ans)
 
-    ans = file.nolines(/^\s*#/).lines[proc { |rec,rnum,ario| rec =~ /#{ario.filename}/ }]
+    ans = file.skiplines(/^\s*#/).lines[proc { |rec,rnum,ario| rec =~ /#{ario.filename}/ }]
     assert_equal(exp,ans)
   end
 
   def test_ranges_ss
 #    $trace_states = true
     lfile,lines = file_lines()
 
-    ans = rio('f1').nolines(2..4).lines[0..2]
+    ans = rio('f1').skiplines(2..4).lines[0..2]
     exp = lines[6..6]
 
-    ans = rio('f1').norecords(0).records(0..2).norecords(2..4).records[6]
+    ans = rio('f1').skiprecords(0).records(0..2).skiprecords(2..4).records[6]
     assert_equal(exp,ans)
 
-    ans = rio('f1').lines(0..2).nolines(0,2..4).lines[6]
+    ans = rio('f1').lines(0..2).skiplines(0,2..4).lines[6]
     assert_equal(exp,ans)
-    ans = rio('f1').nolines(0,2..4).lines[0..2,6]
+    ans = rio('f1').skiplines(0,2..4).lines[0..2,6]
 
     assert_equal(lines[1..1]+lines[6..6],ans)
 
 
-    ans = rio('f1').nolines(0).lines(0..2).nolines(2..4).lines[6]
+    ans = rio('f1').skiplines(0).lines(0..2).skiplines(2..4).lines[6]
     assert_equal(exp,ans)
-    ans = rio('f1').nolines(0).lines(0..2).nolines(2..4).lines[6]
+    ans = rio('f1').skiplines(0).lines(0..2).skiplines(2..4).lines[6]
     assert_equal(exp,ans)
-    ans = rio('f1').records(0..2).norecords(0,2..4).records[6]
+    ans = rio('f1').records(0..2).skiprecords(0,2..4).records[6]
     assert_equal(exp,ans)
-    ans = rio('f1').norecords(0,2..4).records[0..2,6]
+    ans = rio('f1').skiprecords(0,2..4).records[0..2,6]
     assert_equal(lines[1..1]+lines[6..6],ans)
 
     exp = lines[1..1] + lines[5..7]
-    ans = rio('f1').nolines(0,2..4).lines[0..2,6,/f1/]
+    ans = rio('f1').skiplines(0,2..4).lines[0..2,6,/f1/]
     assert_equal(exp,ans)
 
 
     lfile.close
     rio('..').chdir
@@ -167,36 +167,36 @@
   end
   def test_ranges
 #    $trace_states = true
     lfile,lines = file_lines()
 
-    file = lfile.dup.nolines(2..4).lines(0..2)
+    file = lfile.dup.skiplines(2..4).lines(0..2)
     exp = lines[0..1]
     #p "HEE"
 #    breakpoint
     iter_tests(file,exp)
 
-    file = lfile.dup.norecords(0).records(0..2).norecords(2..4).records(6)
+    file = lfile.dup.skiprecords(0).records(0..2).skiprecords(2..4).records(6)
     exp = lines[6..6]
     iter_tests(file,exp)
 
-    file = lfile.dup.lines(0..2).nolines(0,2..4).lines(6)
+    file = lfile.dup.lines(0..2).skiplines(0,2..4).lines(6)
     iter_tests(file,exp)
 
-    file = lfile.dup.nolines(0,2..4).lines(0..2,6)
+    file = lfile.dup.skiplines(0,2..4).lines(0..2,6)
     iter_tests(file,lines[1..1]+lines[6..6])
 
-    file = lfile.dup.nolines(0).lines(0..2).nolines(2..4).lines(6)
+    file = lfile.dup.skiplines(0).lines(0..2).skiplines(2..4).lines(6)
     iter_tests(file,exp)
 
-    file = lfile.dup.records(0..2).norecords(0,2..4).records(6)
+    file = lfile.dup.records(0..2).skiprecords(0,2..4).records(6)
     iter_tests(file,exp)
 
-    file = lfile.dup.norecords(0,2..4).records(0..2,6)
+    file = lfile.dup.skiprecords(0,2..4).records(0..2,6)
     iter_tests(file,lines[1..1]+lines[6..6])
 
     exp = lines[1..1] + lines[5..7]
-    file = lfile.dup.nolines(0,2..4).lines(0..2,6,/f1/)
+    file = lfile.dup.skiplines(0,2..4).lines(0..2,6,/f1/)
     iter_tests(file,exp)
 
 
     lfile.close
     rio('..').chdir