updating tests (oct => octal)

Author: murphy

c/ruby.expected.raydebug

@@ -382,39 +382,44 @@ def complete_test scanner, code, name
           end
         end
 
-        if ENV['assert']
-          assert(ok, "Scan error: unexpected output".red)
-        elsif not ok
-          @hints << '%s: %s (%s)' % [
-            'Scanner returned unexpected result'.red,
-            "open #{File.join 'test', 'scanners', self.class.lang, diff}.html".cyan,
-            debug_diff.scan(/^\+/).join.green + debug_diff.scan(/^-/).join.red
-          ]
-        end
-        
         print "\b" * 'complete...'.size
-        known_issue = expected_filename.sub(/\.expected\..*/, '.known-issue.yaml')
-        if !ok && File.exist?(known_issue)
-          known_issue = YAML.load_file(known_issue)
-          ticket_url = known_issue['ticket_url']
-          @known_issue_description = known_issue['description']
-          if ticket_url && ticket_url[/(\d+)\/?$/]
-            @known_issue_ticket_url = ticket_url
-            ticket_info = 'see #' + $1
+        if !ok
+          known_issue_file = expected_filename.sub(/\.expected\..*/, '.known-issue.yaml')
+          if File.exist?(known_issue_file)
+            known_issue = YAML.load_file(known_issue_file)
+            ticket_url = known_issue['ticket_url']
+            @known_issue_description = known_issue['description']
+            if ticket_url && ticket_url[/(\d+)\/?$/]
+              @known_issue_ticket_url = ticket_url
+              ticket_info = 'see #' + $1
+            else
+              ticket_info = 'ticket ?'
+            end
+            print ticket_info.rjust('complete'.size).yellow
+            print ', '.green
           else
-            ticket_info = 'ticket ?'
+            print 'complete, '.green_or_red(ok)
           end
-          print ticket_info.rjust('complete'.size).yellow
-          print ', '.green
         else
           print 'complete, '.green_or_red(ok)
+          known_issue = nil
         end
       else
         File.open(expected_filename, 'wb') { |f| f.write result }
         print "\b" * 'complete...'.size, "new test".blue, ", ".green
         ok = true
       end
 
+      if ENV['assert']
+        assert(ok, "Scan error: unexpected output".red)
+      elsif !ok && !known_issue
+        @hints << '%s: %s (%s)' % [
+          'Scanner returned unexpected result'.red,
+          "open #{File.join 'test', 'scanners', self.class.lang, diff}.html".cyan,
+          debug_diff.scan(/^\+/).join.green + debug_diff.scan(/^-/).join.red
+        ]
+      end
+      
       return tokens, ok, changed_lines
     end
 

coderay_suite.rb

@@ -4026,7 +4026,7 @@ operator({)
 	keyword(if) operator((!)ident(filename) operator(||) operator(!*)ident(filename)operator(\))
 		keyword(return) predefined_constant(NULL)operator(;)
 
-  predefined_type(int) ident(fd) operator(=) ident(open) operator(()ident(filename)operator(,) ident(O_CREAT)operator(|)ident(O_TRUNC)operator(|)ident(O_WRONLY)operator(|)ident(O_NONBLOCK)operator(,) oct(0644)operator(\);)
+  predefined_type(int) ident(fd) operator(=) ident(open) operator(()ident(filename)operator(,) ident(O_CREAT)operator(|)ident(O_TRUNC)operator(|)ident(O_WRONLY)operator(|)ident(O_NONBLOCK)operator(,) octal(0644)operator(\);)
 
 	ident(FileStreamDescriptor) operator(*)ident(fsd) operator(=) keyword(new) ident(FileStreamDescriptor) operator(()ident(fd)operator(,) local_variable(this)operator(\);)
   keyword(if) operator((!)ident(fsd)operator(\))

cpp/eventmachine.expected.raydebug

@@ -985,7 +985,7 @@ comment(// any field of a calendar is incrementable via add(\) and roll(\) metho
 ident(cal) operator(=) predefined_type(Calendar)operator(.)ident(instance)
 ident(df) operator(=) keyword(new) predefined_type(SimpleDateFormat)operator(()operator(\))
 ident(printCal) operator(=) operator({)ident(cal) operator(->) ident(df)operator(.)ident(format)operator(()ident(cal)operator(.)ident(time)operator(\))operator(})
-ident(cal)operator(.)ident(set)operator(()integer(2000)operator(,) integer(0)operator(,) integer(1)operator(,) oct(00)operator(,) oct(01)operator(,) integer(0)operator(\))
+ident(cal)operator(.)ident(set)operator(()integer(2000)operator(,) integer(0)operator(,) integer(1)operator(,) octal(00)operator(,) octal(01)operator(,) integer(0)operator(\))
 keyword(assert) ident(printCal)operator(()ident(cal)operator(\)) operator(==) string<delimiter(')content(1/01/00 00:01)delimiter(')>
 comment(// roll minute back by 2 but don't adjust other fields)
 ident(cal)operator(.)ident(roll)operator(()predefined_type(Calendar)operator(.)ident(MINUTE)operator(,) operator(-)integer(2)operator(\))
@@ -6199,7 +6199,7 @@ type(class) class(PetLover4) operator({)
             ident(append)operator(()string<delimiter(')content(Age)delimiter(')>operator(,) ident(age)operator(\))
     operator(})
 operator(})
-ident(println) keyword(new) ident(PetLover4)operator(()key(name)operator(:)string<delimiter(')content(Jason)delimiter(')>operator(,) key(dob)operator(:)keyword(new) predefined_type(Date)operator(()integer(83)operator(,)oct(03)operator(,)oct(04)operator(\))operator(,) key(pets)operator(:)operator([)key(dog)operator(:)string<delimiter(')content(Rover)delimiter(')>operator(,)key(cat)operator(:)string<delimiter(')content(Garfield)delimiter(')>operator(])operator(\))
+ident(println) keyword(new) ident(PetLover4)operator(()key(name)operator(:)string<delimiter(')content(Jason)delimiter(')>operator(,) key(dob)operator(:)keyword(new) predefined_type(Date)operator(()integer(83)operator(,)octal(03)operator(,)octal(04)operator(\))operator(,) key(pets)operator(:)operator([)key(dog)operator(:)string<delimiter(')content(Rover)delimiter(')>operator(,)key(cat)operator(:)string<delimiter(')content(Garfield)delimiter(')>operator(])operator(\))
 comment(// => PetLover4@fdfc58[Pet Lover's name=Jason,Pets={cat=Garfield, dog=Rover},Age=23])
 comment(//----------------------------------------------------------------------------------)
 

groovy/pleac.expected.raydebug

@@ -13281,7 +13281,7 @@ comment(// ----- Ruby Class Methods --------------------------------------------
             ident(newDir) operator(=) keyword(new) predefined_type(File)operator(()ident(newDir)operator(.)ident(getPath)operator(()operator(\))operator(\))operator(;)
         operator(})
 
-        type(int) ident(mode) operator(=) ident(args)operator(.)ident(length) operator(==) integer(2) operator(?) operator(()operator(()type(int)operator(\)) ident(args)operator([)integer(1)operator(])operator(.)ident(convertToInteger)operator(()operator(\))operator(.)ident(getLongValue)operator(()operator(\))operator(\)) operator(:) oct(0777)operator(;)
+        type(int) ident(mode) operator(=) ident(args)operator(.)ident(length) operator(==) integer(2) operator(?) operator(()operator(()type(int)operator(\)) ident(args)operator([)integer(1)operator(])operator(.)ident(convertToInteger)operator(()operator(\))operator(.)ident(getLongValue)operator(()operator(\))operator(\)) operator(:) octal(0777)operator(;)
 
         keyword(if) operator(()ident(runtime)operator(.)ident(getPosix)operator(()operator(\))operator(.)ident(mkdir)operator(()ident(newDir)operator(.)ident(getAbsolutePath)operator(()operator(\))operator(,) ident(mode)operator(\)) operator(<) integer(0)operator(\)) operator({)
             comment(// FIXME: This is a system error based on errno)
@@ -16273,7 +16273,7 @@ comment(//        })
         comment(// rename via Java API call wasn't successful, let's try some tricks, similar to MRI )
 
         keyword(if) operator(()ident(newFile)operator(.)ident(exists)operator(()operator(\))operator(\)) operator({)
-            ident(runtime)operator(.)ident(getPosix)operator(()operator(\))operator(.)ident(chmod)operator(()ident(newNameString)operator(.)ident(toString)operator(()operator(\))operator(,) oct(0666)operator(\))operator(;)
+            ident(runtime)operator(.)ident(getPosix)operator(()operator(\))operator(.)ident(chmod)operator(()ident(newNameString)operator(.)ident(toString)operator(()operator(\))operator(,) octal(0666)operator(\))operator(;)
             ident(newFile)operator(.)ident(delete)operator(()operator(\))operator(;)
         operator(})
 
@@ -39924,7 +39924,7 @@ directive(public) type(class) class(RubyRegexp) directive(extends) ident(RubyObj
                     ident(sb)operator(.)ident(append)operator(()operator(()type(char)operator(\))operator(()ident(s)operator([)ident(p)operator(])operator(&)hex(0xFF)operator(\))operator(\))operator(;)
                 operator(}) keyword(else) keyword(if)operator(()operator(!)predefined_type(Character)operator(.)ident(isWhitespace)operator(()operator(()type(char)operator(\))operator(()ident(s)operator([)ident(p)operator(])operator(&)hex(0xFF)operator(\))operator(\))operator(\)) operator({)
                     ident(sb)operator(.)ident(append)operator(()string<delimiter(')char(\\\\)delimiter(')>operator(\))operator(;)
-                    ident(sb)operator(.)ident(append)operator(()predefined_type(Integer)operator(.)ident(toString)operator(()operator(()type(int)operator(\))operator(()ident(s)operator([)ident(p)operator(])operator(&)oct(0377)operator(\))operator(,)integer(8)operator(\))operator(\))operator(;)
+                    ident(sb)operator(.)ident(append)operator(()predefined_type(Integer)operator(.)ident(toString)operator(()operator(()type(int)operator(\))operator(()ident(s)operator([)ident(p)operator(])operator(&)octal(0377)operator(\))operator(,)integer(8)operator(\))operator(\))operator(;)
                 operator(}) keyword(else) operator({)
                     ident(sb)operator(.)ident(append)operator(()operator(()type(char)operator(\))operator(()ident(s)operator([)ident(p)operator(])operator(&)hex(0xFF)operator(\))operator(\))operator(;)
                 operator(})
@@ -40427,7 +40427,7 @@ directive(public) type(class) class(RubyRegexp) directive(extends) ident(RubyObj
                 operator(}) keyword(else) keyword(if) operator(()ident(enc)operator(.)ident(isPrint)operator(()ident(str)operator(.)ident(bytes)operator([)ident(p)operator(]) operator(&) hex(0xff)operator(\))operator(\)) operator({)
                     ident(ss)operator(.)ident(cat)operator(()ident(str)operator(.)ident(bytes)operator(,)ident(p)operator(,)integer(1)operator(\))operator(;)
                 operator(}) keyword(else) keyword(if) operator(()operator(!)ident(enc)operator(.)ident(isSpace)operator(()ident(str)operator(.)ident(bytes)operator([)ident(p)operator(]) operator(&) hex(0xff)operator(\))operator(\)) operator({)
-                    ident(ss)operator(.)ident(cat)operator(()ident(ByteList)operator(.)ident(create)operator(()predefined_type(Integer)operator(.)ident(toString)operator(()ident(str)operator(.)ident(bytes)operator([)ident(p)operator(]) operator(&) oct(0377)operator(,) integer(8)operator(\))operator(\))operator(\))operator(;)
+                    ident(ss)operator(.)ident(cat)operator(()ident(ByteList)operator(.)ident(create)operator(()predefined_type(Integer)operator(.)ident(toString)operator(()ident(str)operator(.)ident(bytes)operator([)ident(p)operator(]) operator(&) octal(0377)operator(,) integer(8)operator(\))operator(\))operator(\))operator(;)
                 operator(}) keyword(else) operator({)
                     ident(ss)operator(.)ident(cat)operator(()ident(str)operator(.)ident(bytes)operator(,) ident(p)operator(,) integer(1)operator(\))operator(;)
                 operator(})

java/jruby.expected.raydebug

@@ -3,8 +3,8 @@ comment(# from http://docs.python.org/reference/lexical_analysis.html#literals)
 ident(re)operator(.)ident(compile)operator(()string<delimiter(")content([A-Za-z_])delimiter(")>       comment(# letter or underscore)
            string<delimiter(")content([A-Za-z0-9_]*)delimiter(")>   comment(# letter, digit or underscore)
           operator(\))
-integer(7)     integer(2147483647)                        oct(0177)
-integer(3L)    integer(79228162514264337593543950336L)    oct(0377L)   hex(0x100000000L)
+integer(7)     integer(2147483647)                        octal(0177)
+integer(3L)    integer(79228162514264337593543950336L)    octal(0377L)   hex(0x100000000L)
       integer(79228162514264337593543950336)             hex(0xdeadbeef)
 
 float(3.14)    float(10.)    float(.001)    float(1e100)    float(3.14e-10)    float(0e0)

python/literals.expected.raydebug

@@ -1297,7 +1297,7 @@ keyword(print) ident(datetime)operator(.)ident(date)operator(()integer(2003)oper
 comment(#=> 1095 days, 0:00:00)
 
 comment(#----------------------------- )
-ident(birthtime) operator(=) ident(datetime)operator(.)ident(datetime)operator(()integer(1973)operator(,) oct(01)operator(,) integer(18)operator(,) integer(3)operator(,) integer(45)operator(,) integer(50)operator(\))   comment(# 1973-01-18 03:45:50)
+ident(birthtime) operator(=) ident(datetime)operator(.)ident(datetime)operator(()integer(1973)operator(,) octal(01)operator(,) integer(18)operator(,) integer(3)operator(,) integer(45)operator(,) integer(50)operator(\))   comment(# 1973-01-18 03:45:50)
 
 ident(interval) operator(=) ident(datetime)operator(.)ident(timedelta)operator(()ident(seconds)operator(=)integer(5)operator(,) ident(minutes)operator(=)integer(17)operator(,) ident(hours)operator(=)integer(2)operator(,) ident(days)operator(=)integer(55)operator(\)) 
 ident(then) operator(=) ident(birthtime) operator(+) ident(interval)
@@ -4264,25 +4264,25 @@ ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)opera
 comment(#-----------------------------)
 ident(myfile) operator(=) predefined(open)operator(()ident(path)operator(,) string<delimiter(")content(w)delimiter(")>operator(\))
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_TRUNC)operator(|)ident(os)operator(.)ident(O_CREAT)operator(\))
-ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_TRUNC)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) oct(0600)operator(\))
+ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_TRUNC)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) octal(0600)operator(\))
 comment(#-----------------------------)
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_EXCL)operator(|)ident(os)operator(.)ident(O_CREAT)operator(\))
-ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_EXCL)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) oct(0600)operator(\))
+ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_EXCL)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) octal(0600)operator(\))
 comment(#-----------------------------)
 ident(myfile) operator(=) predefined(open)operator(()ident(path)operator(,) string<delimiter(")content(a)delimiter(")>operator(\))
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_APPEND)operator(|)ident(os)operator(.)ident(O_CREAT)operator(\))
-ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_APPEND)operator(|)ident(s)operator(.)ident(O_CREAT)operator(,) oct(0600)operator(\))
+ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_APPEND)operator(|)ident(s)operator(.)ident(O_CREAT)operator(,) octal(0600)operator(\))
 comment(#-----------------------------)
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_WRONLY)operator(|)ident(os)operator(.)ident(O_APPEND)operator(\))
 comment(#-----------------------------)
 ident(myfile) operator(=) predefined(open)operator(()ident(path)operator(,) string<delimiter(")content(rw)delimiter(")>operator(\))
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(\))
 comment(#-----------------------------)
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(|)ident(os)operator(.)ident(O_CREAT)operator(\))
-ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) oct(0600)operator(\))
+ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) octal(0600)operator(\))
 comment(#-----------------------------)
 ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(|)ident(os)operator(.)ident(O_EXCL)operator(|)ident(os)operator(.)ident(O_CREAT)operator(\))
-ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(|)ident(os)operator(.)ident(O_EXCL)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) oct(0600)operator(\))
+ident(fd) operator(=) ident(os)operator(.)ident(open)operator(()ident(path)operator(,) ident(os)operator(.)ident(O_RDWR)operator(|)ident(os)operator(.)ident(O_EXCL)operator(|)ident(os)operator(.)ident(O_CREAT)operator(,) octal(0600)operator(\))
 comment(#-----------------------------)
 
 comment(# @@PLEAC@@_7.2)
@@ -5181,7 +5181,7 @@ keyword(import) include(os)
 ident(mode)operator(,) ident(ino)operator(,) ident(dev)operator(,) ident(nlink)operator(,) ident(uid)operator(,) ident(gid)operator(,) ident(size)operator(,) \
 ident(atime)operator(,) ident(mtime)operator(,) ident(ctime) operator(=) ident(os)operator(.)ident(stat)operator(()ident(filename)operator(\))
 
-ident(mode) operator(&=) oct(07777)               comment(# discard file type info)
+ident(mode) operator(&=) octal(07777)               comment(# discard file type info)
 
 comment(#-----------------------------)
 ident(info) operator(=) ident(os)operator(.)ident(stat)operator(()ident(filename)operator(\))
@@ -5201,11 +5201,11 @@ keyword(def) method(is_safe)operator(()ident(path)operator(\))operator(:)
 
     comment(# check whether group or other can write file.)
     comment(# use 066 to detect either reading or writing)
-    keyword(if) ident(info)operator(.)ident(st_mode) operator(&) oct(022)operator(:)  comment(# someone else can write this)
+    keyword(if) ident(info)operator(.)ident(st_mode) operator(&) octal(022)operator(:)  comment(# someone else can write this)
         keyword(if) keyword(not) ident(os)operator(.)ident(path)operator(.)ident(isdir)operator(()ident(path)operator(\))operator(:)  comment(# non-directories aren't safe)
             keyword(return) predefined_constant(False)
         comment(# but directories with the sticky bit (01000\) are)
-        keyword(if) keyword(not) operator(()ident(info)operator(.)ident(st_mode) operator(&) oct(01000)operator(\))operator(:)
+        keyword(if) keyword(not) operator(()ident(info)operator(.)ident(st_mode) operator(&) octal(01000)operator(\))operator(:)
             keyword(return) predefined_constant(False)
     keyword(return) predefined_constant(True)
 comment(#-----------------------------)