regextest 0.1.5 → 0.1.6

data/lib/regextest/front/parser.y

@@ -62,6 +62,7 @@ rule
          | LEX_NAMED_REFER        {BackRefer.new(:LEX_NAMED_REFER,  val[0])}
          | LEX_NAMED_GENERATE     {BackRefer.new(:LEX_NAMED_GENERATE, val[0])}
          | LEX_CONTROL_LETTER     {TLetter.new(:LEX_CONTROL_LETTER, val[0])}
+         | LEX_META_CONTROL_LETTER {TLetter.new(:LEX_META_CONTROL_LETTER, val[0])}
          | LEX_META_LETTER        {TLetter.new(:LEX_CONTROL_LETTER, val[0])}
          | LEX_ESCAPED_LETTER     {TLetter.new(:LEX_ESCAPED_LETTER, val[0])}
          | LEX_UNICODE            {TLetter.new(:LEX_UNICODE,        val[0])}
@@ -77,7 +78,7 @@ rule
          | LEX_ANC_STRING_END2    {Anchor.new(:LEX_ANC_STRING_END2, val[0])}
          | LEX_ANC_LOOK_BEHIND2   {Anchor.new(:LEX_ANC_LOOK_BEHIND2, val[0])}
          | LEX_ANC_MATCH_START    {Anchor.new(:LEX_ANC_MATCH_START, val[0])}
-         | LEX_SPECIAL_LETTER     {TLetter.new(:LEX_SPECIAL_LETTER, val[0])}
+         | LEX_SPECIAL_LETTER     {SpecialLetter.new(val[0])}
          | LEX_MINUS              {TLetter.new(:LEX_CHAR,           val[0])}  # no special meaning at basic mode
          | LEX_AND_AND            {TLetter.new(:LEX_AND_AND,        val[0])}
          | LEX_SPACE              {TLetter.new(:LEX_SPACE,          val[0])}
@@ -156,7 +157,7 @@ rule
          | LEX_ANC_STRING_END2    {Anchor.new(:LEX_ANC_STRING_END2, val[0])}
          | LEX_ANC_LOOK_BEHIND2   {Anchor.new(:LEX_ANC_LOOK_BEHIND2, val[0])}
          | LEX_ANC_MATCH_START    {Anchor.new(:LEX_ANC_MATCH_START, val[0])}
-         | LEX_SPECIAL_LETTER     {TLetter.new(:LEX_SPECIAL_LETTER, val[0])}
+         | LEX_SPECIAL_LETTER     {SpecialLetter.new(val[0])}
          | LEX_MINUS              {TLetter.new(:LEX_CHAR,           val[0])}
          | LEX_AND_AND            {TLetter.new(:LEX_AND_AND,        val[0])}
          | LEX_NEW_LINE           {TEmpty.new}                                # ignore new line at extended mode
@@ -166,10 +167,12 @@ rule
          | LEX_SHARP reg_comment_ex  {TEmpty.new}
   
   # comment of extended mode
-  reg_comment_ex: LEX_NEW_LINE    # end of the comment
+  reg_comment_ex:
+         | LEX_NEW_LINE    # end of the comment
          | LEX_CHAR               reg_comment_ex
          | LEX_OCTET              reg_comment_ex
          | LEX_BACK_REFER         reg_comment_ex
+         | LEX_SPECIAL_LETTER     reg_comment_ex
          | LEX_CODE_LITERAL       reg_comment_ex
          | LEX_NAMED_REFER        reg_comment_ex
          | LEX_NAMED_GENERATE     reg_comment_ex
@@ -217,6 +220,7 @@ require 'regextest/front/sequence'       # parser class for a sequence of elemen
 require 'regextest/front/bracket'        # parser class for a character class (bracket)
 require 'regextest/front/anchor'         # parser class for a anchor
 require 'regextest/front/back-refer'     # parser class for a back reference
+require 'regextest/front/special-letter' # parser class for a special letter
 require 'regextest/front/bracket-parser' # bracket parser
 
 ---- inner
@@ -231,6 +235,7 @@ include Regextest::Front::Sequence
 include Regextest::Front::Bracket
 include Regextest::Front::Anchor
 include Regextest::Front::BackRefer
+include Regextest::Front::SpecialLetter
 
 # execute to parse
 def parse(lex_words, options)

data/lib/regextest/front/range.rb

@@ -14,6 +14,7 @@ module Regextest::Front::Range
     # Constructor
     def initialize(letter_begin, letter_end = nil)
       TstLog("TRange: #{letter_begin}-#{letter_end}")
+      @options = nil
       @begin = parse_letter(letter_begin)
       if letter_end 
         @end = parse_letter(letter_end)
@@ -46,10 +47,27 @@ module Regextest::Front::Range
       (@begin..@end).to_a
     end
     
+    # set options
+    def set_options(options)
+      TstLog("Range set_options: #{options[:reg_options].inspect}")
+      @options = options
+    end
+    
     # transform to json format (using codepoints of Unicode)
     def json
       @@id += 1
-      "{\"type\": \"LEX_RANGE\", \"id\": \"G#{@@id}\", \"begin\": #{@begin}, \"end\": #{@end}}"
+      if @options
+        charset = @options[:reg_options].charset
+      else
+        charset = "d"
+      end
+      "{" +
+        "\"type\": \"LEX_RANGE\", " +
+        "\"id\": \"G#{@@id}\", " +
+        "\"begin\": #{@begin}, " +
+        "\"end\": #{@end}, " +
+        "\"charset\": \"#{charset}\"" +
+      "}"
     end
   end
 end

data/lib/regextest/front/scanner.rb

@@ -20,13 +20,15 @@ class Regextest::Front::Scanner
     [:LEX_CODE_LITERAL,
      LexCodeLiteral ],
     [:LEX_NAMED_REFER,
-     %r!\\k[<'](?:\-?\d+|\w+)(?:[\+\-]\d+)?[>']! ],
+     %r!(?u:\\k[<'](?:\-?\d+|\w+)(?:[\+\-]\d+)?[>'])! ],
     [:LEX_NAMED_GENERATE,
-     %r!\\g[<'][\+\-]?\w+[>']! ],
+     %r!(?u:\\g[<'][\+\-]?\w+[>'])! ],
     [:LEX_CONTROL_LETTER,
-     %r!\\c[a-zA-Z]|\\C-[a-zA-Z]|\\c\\\\|\\C-\\\\! ],
+     %r!\\c\\\\|\\C-\\\\|\\c[0-~]|\\C-[0-~]! ],
+    [:LEX_META_CONTROL_LETTER,
+     %r!\\M-\\C-[0-~]! ],
     [:LEX_META_LETTER,
-     %r!\\M-(?:[a-zA-Z]|\\C-[a-zA-Z])! ],
+     %r!\\M-[0-~]! ],
     [:LEX_ESCAPED_LETTER,
      %r!\\[tvnrfae #\{\}\[\]\(\)]! ],   # \b is an anchor out of bracket
     [:LEX_UNICODE,
@@ -50,15 +52,16 @@ class Regextest::Front::Scanner
     [:LEX_PAREN_START_EX2,
      %r!\(\?[imxdau]*(?:\-(?=\w*x)[imx]+)?(?::|(?=\)))! ],   # (?im-x: ... )
     [:LEX_PAREN_START,
-     %r!\(\?<\w+>|
-        \(\?'\w+'|
-        \(\?\(\d+\)|
-        \(\?\(<\w+>\)|
-        \(\?\('\w+'\)|
-        \(\?[imdau]*(?:\-[im]*)?(?::|(?=\)))|    # expressions independent of "x"
-        \(\?\<[\=\!]|
-        \(\?.|    # for better error message
-        \(
+     %r!(?u:\(\?<\w+>|
+            \(\?'\w+'|
+            \(\?\(\d+\)|
+            \(\?\(<\w+>\)|
+            \(\?\('\w+'\)|
+            \(\?[imdau]*(?:\-[im]*)?(?::|(?=\)))|    # expressions independent of "x"
+            \(\?\<[\=\!]|
+            \(\?.|    # for better error message
+            \(
+        )
        !x ],
     [:LEX_PAREN_END,
      %r!\)! ],

data/lib/regextest/front/special-letter.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+# Copyright (C) 2016 Mikio Ikoma
+
+require 'regextest/common'
+require 'regextest/front'
+
+# Parse special letter element (\R / \X etc.)
+module Regextest::Front::SpecialLetter
+  class SpecialLetter
+    include Regextest::Common
+    @@id = 0   # a class variable for generating unique name of element
+    
+    # Constructor
+    def initialize(value)
+      TstLog("SpecialLetter: #{value}")
+      @value = value[0]
+      @offset = value[1]
+      @length = value[2]
+      @options = @@parse_options
+      @string = nil
+      @obj = nil
+    end
+    
+    attr_reader :offset, :length
+    
+    # set string
+    def set_string(options)
+      reg_options = options[:reg_options]
+      case @value
+      when "\\R"
+        if reg_options.is_unicode?
+          '(?:\x0d\x0a|[\x0a-\x0c\u{85}\u{2028}\u{2029}]|\x0d(?!\x0a))'
+        else
+          '(?:\x0d\x0a|\x0d(?!\x0a)|[\x0a-\x0c])'
+        end
+      when "\\X"
+        # Unicode mode is not implemented yet
+        '(?m:.)'
+      else
+        raise "Internal error. Invalid special letter(#{value})"
+      end
+    end
+    
+    # set options
+    def set_options(options)
+      TstLog("SpecialLetter set_options: #{options[:reg_options].inspect}")
+      @string = set_string(options)
+      @obj = Regextest::Front.new(@string, options)
+      self
+    end
+    
+    # transform to json format
+    def json
+      @obj.get_json_regex
+    end
+  end
+end
+
+# Test suite (execute when this file is specified in command line)
+if __FILE__ == $0 
+end
+

data/lib/regextest/regex-option.rb

@@ -88,6 +88,33 @@ class Regextest::RegexOption
     @reg_options |= options
   end
       
+  # generate prefix regex
+  def prefix_reg
+    prefix = ""
+    prefix += "i" if is_ignore?
+    prefix += "m" if is_multiline?
+    prefix += "x" if is_extended?
+    
+    if prefix.size > 0
+      "(?#{prefix})"
+    else
+      ""
+    end
+  end
+      
+  # get charset ("a", "u", or "d")
+  def charset
+    case @char_set
+    when TstRegOptDefault
+      "d"
+    when TstRegOptAscii
+      "a"
+    when TstRegOptUnicode
+      "u"
+    else
+      raise "Internal error. Invalid char_set (#{@char_set})"
+    end
+  end
 
   # methods for checking each flag
   def is_ignore?

data/lib/regextest/unicode.rb

@@ -6,6 +6,11 @@ class Regextest::Unicode
   # Generate hash of properties
   def self.property(class_name)
     case class_name.downcase
+    # Regextest defined char classes (from underscore)
+    when "_asciiprint"
+      ([[32, 126]])
+      
+    # Unicode.org defined char classes
         when "alpha"
           ([[65, 90], [97, 122], [170, 170], [181, 181], [186, 186], [192, 214], [216, 246], [248, 705], [710, 721], [736, 740], [748, 748], [750, 750], [837, 837], [880, 884], [886, 887], [890, 893], [902, 902], [904, 906], [908, 908], [910, 929], [931, 1013], [1015, 1153], [1162, 1319], [1329, 1366], [1369, 1369], [1377, 1415], [1456, 1469], [1471, 1471], [1473, 1474], [1476, 1477], [1479, 1479], [1488, 1514], [1520, 1522], [1552, 1562], [1568, 1623], [1625, 1631], [1646, 1747], [1749, 1756], [1761, 1768], [1773, 1775], [1786, 1788], [1791, 1791], [1808, 1855], [1869, 1969], [1994, 2026], [2036, 2037], [2042, 2042], [2048, 2071], [2074, 2092], [2112, 2136], [2208, 2208], [2210, 2220], [2276, 2281], [2288, 2302], [2304, 2363], [2365, 2380], [2382, 2384], [2389, 2403], [2417, 2423], [2425, 2431], [2433, 2435], [2437, 2444], [2447, 2448], [2451, 2472], [2474, 2480], [2482, 2482], [2486, 2489], [2493, 2500], [2503, 2504], [2507, 2508], [2510, 2510], [2519, 2519], [2524, 2525], [2527, 2531], [2544, 2545], [2561, 2563], [2565, 2570], [2575, 2576], [2579, 2600], [2602, 2608], [2610, 2611], [2613, 2614], [2616, 2617], [2622, 2626], [2631, 2632], [2635, 2636], [2641, 2641], [2649, 2652], [2654, 2654], [2672, 2677], [2689, 2691], [2693, 2701], [2703, 2705], [2707, 2728], [2730, 2736], [2738, 2739], [2741, 2745], [2749, 2757], [2759, 2761], [2763, 2764], [2768, 2768], [2784, 2787], [2817, 2819], [2821, 2828], [2831, 2832], [2835, 2856], [2858, 2864], [2866, 2867], [2869, 2873], [2877, 2884], [2887, 2888], [2891, 2892], [2902, 2903], [2908, 2909], [2911, 2915], [2929, 2929], [2946, 2947], [2949, 2954], [2958, 2960], [2962, 2965], [2969, 2970], [2972, 2972], [2974, 2975], [2979, 2980], [2984, 2986], [2990, 3001], [3006, 3010], [3014, 3016], [3018, 3020], [3024, 3024], [3031, 3031], [3073, 3075], [3077, 3084], [3086, 3088], [3090, 3112], [3114, 3123], [3125, 3129], [3133, 3140], [3142, 3144], [3146, 3148], [3157, 3158], [3160, 3161], [3168, 3171], [3202, 3203], [3205, 3212], [3214, 3216], [3218, 3240], [3242, 3251], [3253, 3257], [3261, 3268], [3270, 3272], [3274, 3276], [3285, 3286], [3294, 3294], [3296, 3299], [3313, 3314], [3330, 3331], [3333, 3340], [3342, 3344], [3346, 3386], [3389, 3396], [3398, 3400], [3402, 3404], [3406, 3406], [3415, 3415], [3424, 3427], [3450, 3455], [3458, 3459], [3461, 3478], [3482, 3505], [3507, 3515], [3517, 3517], [3520, 3526], [3535, 3540], [3542, 3542], [3544, 3551], [3570, 3571], [3585, 3642], [3648, 3654], [3661, 3661], [3713, 3714], [3716, 3716], [3719, 3720], [3722, 3722], [3725, 3725], [3732, 3735], [3737, 3743], [3745, 3747], [3749, 3749], [3751, 3751], [3754, 3755], [3757, 3769], [3771, 3773], [3776, 3780], [3782, 3782], [3789, 3789], [3804, 3807], [3840, 3840], [3904, 3911], [3913, 3948], [3953, 3969], [3976, 3991], [3993, 4028], [4096, 4150], [4152, 4152], [4155, 4159], [4176, 4194], [4197, 4200], [4206, 4230], [4238, 4238], [4252, 4253], [4256, 4293], [4295, 4295], [4301, 4301], [4304, 4346], [4348, 4680], [4682, 4685], [4688, 4694], [4696, 4696], [4698, 4701], [4704, 4744], [4746, 4749], [4752, 4784], [4786, 4789], [4792, 4798], [4800, 4800], [4802, 4805], [4808, 4822], [4824, 4880], [4882, 4885], [4888, 4954], [4959, 4959], [4992, 5007], [5024, 5108], [5121, 5740], [5743, 5759], [5761, 5786], [5792, 5866], [5870, 5872], [5888, 5900], [5902, 5907], [5920, 5939], [5952, 5971], [5984, 5996], [5998, 6000], [6002, 6003], [6016, 6067], [6070, 6088], [6103, 6103], [6108, 6108], [6176, 6263], [6272, 6314], [6320, 6389], [6400, 6428], [6432, 6443], [6448, 6456], [6480, 6509], [6512, 6516], [6528, 6571], [6576, 6601], [6656, 6683], [6688, 6750], [6753, 6772], [6823, 6823], [6912, 6963], [6965, 6979], [6981, 6987], [7040, 7081], [7084, 7087], [7098, 7141], [7143, 7153], [7168, 7221], [7245, 7247], [7258, 7293], [7401, 7404], [7406, 7411], [7413, 7414], [7424, 7615], [7680, 7957], [7960, 7965], [7968, 8005], [8008, 8013], [8016, 8023], [8025, 8025], [8027, 8027], [8029, 8029], [8031, 8061], [8064, 8116], [8118, 8124], [8126, 8126], [8130, 8132], [8134, 8140], [8144, 8147], [8150, 8155], [8160, 8172], [8178, 8180], [8182, 8188], [8305, 8305], [8319, 8319], [8336, 8348], [8450, 8450], [8455, 8455], [8458, 8467], [8469, 8469], [8473, 8477], [8484, 8484], [8486, 8486], [8488, 8488], [8490, 8493], [8495, 8505], [8508, 8511], [8517, 8521], [8526, 8526], [8544, 8584], [9398, 9449], [11264, 11310], [11312, 11358], [11360, 11492], [11499, 11502], [11506, 11507], [11520, 11557], [11559, 11559], [11565, 11565], [11568, 11623], [11631, 11631], [11648, 11670], [11680, 11686], [11688, 11694], [11696, 11702], [11704, 11710], [11712, 11718], [11720, 11726], [11728, 11734], [11736, 11742], [11744, 11775], [11823, 11823], [12293, 12295], [12321, 12329], [12337, 12341], [12344, 12348], [12353, 12438], [12445, 12447], [12449, 12538], [12540, 12543], [12549, 12589], [12593, 12686], [12704, 12730], [12784, 12799], [13312, 19893], [19968, 40908], [40960, 42124], [42192, 42237], [42240, 42508], [42512, 42527], [42538, 42539], [42560, 42606], [42612, 42619], [42623, 42647], [42655, 42735], [42775, 42783], [42786, 42888], [42891, 42894], [42896, 42899], [42912, 42922], [43000, 43009], [43011, 43013], [43015, 43018], [43020, 43047], [43072, 43123], [43136, 43203], [43250, 43255], [43259, 43259], [43274, 43306], [43312, 43346], [43360, 43388], [43392, 43442], [43444, 43455], [43471, 43471], [43520, 43574], [43584, 43597], [43616, 43638], [43642, 43642], [43648, 43710], [43712, 43712], [43714, 43714], [43739, 43741], [43744, 43759], [43762, 43765], [43777, 43782], [43785, 43790], [43793, 43798], [43808, 43814], [43816, 43822], [43968, 44010], [44032, 55203], [55216, 55238], [55243, 55291], [63744, 64109], [64112, 64217], [64256, 64262], [64275, 64279], [64285, 64296], [64298, 64310], [64312, 64316], [64318, 64318], [64320, 64321], [64323, 64324], [64326, 64433], [64467, 64829], [64848, 64911], [64914, 64967], [65008, 65019], [65136, 65140], [65142, 65276], [65313, 65338], [65345, 65370], [65382, 65470], [65474, 65479], [65482, 65487], [65490, 65495], [65498, 65500], [65536, 65547], [65549, 65574], [65576, 65594], [65596, 65597], [65599, 65613], [65616, 65629], [65664, 65786], [65856, 65908], [66176, 66204], [66208, 66256], [66304, 66334], [66352, 66378], [66432, 66461], [66464, 66499], [66504, 66511], [66513, 66517], [66560, 66717], [67584, 67589], [67592, 67592], [67594, 67637], [67639, 67640], [67644, 67644], [67647, 67669], [67840, 67861], [67872, 67897], [67968, 68023], [68030, 68031], [68096, 68099], [68101, 68102], [68108, 68115], [68117, 68119], [68121, 68147], [68192, 68220], [68352, 68405], [68416, 68437], [68448, 68466], [68608, 68680], [69632, 69701], [69762, 69816], [69840, 69864], [69888, 69938], [70016, 70079], [70081, 70084], [71296, 71349], [73728, 74606], [74752, 74850], [77824, 78894], [92160, 92728], [93952, 94020], [94032, 94078], [94099, 94111], [110592, 110593], [119808, 119892], [119894, 119964], [119966, 119967], [119970, 119970], [119973, 119974], [119977, 119980], [119982, 119993], [119995, 119995], [119997, 120003], [120005, 120069], [120071, 120074], [120077, 120084], [120086, 120092], [120094, 120121], [120123, 120126], [120128, 120132], [120134, 120134], [120138, 120144], [120146, 120485], [120488, 120512], [120514, 120538], [120540, 120570], [120572, 120596], [120598, 120628], [120630, 120654], [120656, 120686], [120688, 120712], [120714, 120744], [120746, 120770], [120772, 120779], [126464, 126467], [126469, 126495], [126497, 126498], [126500, 126500], [126503, 126503], [126505, 126514], [126516, 126519], [126521, 126521], [126523, 126523], [126530, 126530], [126535, 126535], [126537, 126537], [126539, 126539], [126541, 126543], [126545, 126546], [126548, 126548], [126551, 126551], [126553, 126553], [126555, 126555], [126557, 126557], [126559, 126559], [126561, 126562], [126564, 126564], [126567, 126570], [126572, 126578], [126580, 126583], [126585, 126588], [126590, 126590], [126592, 126601], [126603, 126619], [126625, 126627], [126629, 126633], [126635, 126651], [131072, 173782], [173824, 177972], [177984, 178205], [194560, 195101]])
         when "blank"

data/lib/regextest/version.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2016 Mikio Ikoma
 
 class Regextest
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/tst-reg-test.rb

@@ -6,10 +6,12 @@ require 'regextest'
 require 'kconv'
 require 'timeout'
 require 'pp'
+require 'csv'
 
 class Regextest::Test
   def initialize(min_test, max_test)
-    results = {
+    @csv_file = "test_history.csv"
+    @results = {
       success: [],
       bug: [],
       failed: [],
@@ -19,15 +21,48 @@ class Regextest::Test
       timeout: [],
       perl_syntax: [],
     }
-    time_out = 1
-    do_test(results, min_test, max_test, time_out)
-    print_results(results)
+    time_out = 2
+    do_test(@results, min_test, max_test, time_out)
   end
   
-  def print_results(results)
+  def append_to_csv(results = @results)
+    results2 = []
+    results.each do | key, values |
+      values.each do | value |
+        value[:reason] = key
+        results2.push value
+      end
+    end
+    results2.sort!{|x, y| x[:index] <=> y[:index]}
+    if FileTest.exist?(@csv_file)
+      old_data = CSV.read(@csv_file, "rb:UTF-8")
+      CSV.open(@csv_file, "wb:UTF-8") do |csv|
+        csv << (old_data.shift) + [Time.now.to_s]
+        results2.each do | result |
+          old_row = old_data.shift
+          break if !old_row || old_row.size == 0
+          regex = result[:test] || result[:reg]
+          if old_row[0].to_i != result[:index]
+            raise "regex not matched. csv: #{old_row}, new: #{result}"
+          end
+          csv << old_row + [result[:reason]]
+        end
+      end
+    else
+      CSV.open(@csv_file, "wb:UTF-8") do |csv|
+        csv << ["ID", "REGEXP", Time.now.to_s]
+        results2.each do | result |
+          regex = result[:test] || result[:reg]
+          csv << [result[:index], regex, result[:reason]]
+        end
+      end
+    end
+  end
+  
+  def print_results(results = @results)
     puts ""
     (results[:failed] + results[:bug]).each do | failed_hash |
-      regex = failed_hash[:test] || failed_hash[:result][:reg]
+      regex = failed_hash[:reg] || failed_hash[:result][:reg]
       puts "======="
       puts "  type: #{failed_hash[:type] || failed_hash[:result][:result]}"
       puts "  test: #{regex}"
@@ -51,6 +86,7 @@ class Regextest::Test
     get_lines(results).each_with_index do | line, i |
       next if(i < min_test || i > max_test)
       puts line
+      reg = line.gsub(/^\s*(?:x1|x2|n)\(\"|\"\)\s*$/, "")
       begin
         rc = nil
         timeout(timeout_seconds){
@@ -63,43 +99,44 @@ class Regextest::Test
         end
       rescue Timeout::Error => ex
         warn "Timeout::Error #{ex}. \nline:#{line}"
-        results[:timeout].push({result: :timeout, message: ex, reg: line, index: i})
+        results[:timeout].push({result: :timeout, message: ex, reg: reg, index: i})
       rescue RegexpError => ex
         warn "RegexpError #{ex}. \nline:#{line}"
-        results[:not_scope].push({result: :regexp_error, message: ex, reg: line, index: i})
+        results[:not_scope].push({result: :regexp_error, message: ex, reg: reg, index: i})
       rescue ArgumentError => ex
         warn "ArgumentError #{ex}. \nline: line"
-        results[:failed].push({type: :argument_error, info: ex, test: line, index: i})
+        results[:failed].push({type: :argument_error, info: ex, reg: reg, index: i})
       #rescue Regextest::Common::RegextestTimeout => ex
       #  warn "RegextestTimeout #{ex}. \nline:#{line}"
-      #  results[:failed].push({ type: :timeout, test: line, info: ex, index: i})
+      #  results[:failed].push({ type: :timeout, reg: reg, info: ex, index: i})
       rescue Regextest::RegextestError => ex
         warn "RegextestError #{ex}. \nline:#{line}"
-        results[:impossible].push({ type: Regextest::RegextestError, test: line, info: ex, index: i})
+        results[:impossible].push({ type: Regextest::RegextestError, reg: reg, info: ex, index: i})
       rescue Regextest::RegextestFailedToGenerate => ex
         warn "RegextestFailedToGenerate #{ex}. \nline:#{line}"
-        results[:failed].push({ type: Regextest::RegextestFailedToGenerate, test: line, info: ex, index: i})
+        results[:failed].push({ type: Regextest::RegextestFailedToGenerate, reg: reg, info: ex, index: i})
       rescue RuntimeError => ex
         warn "RuntimeError #{ex}. \nline:#{line}"
-        results[:bug].push({ type: RuntimeError, test: line, info: ex, index: i})
+        results[:bug].push({ type: RuntimeError, reg: reg, info: ex, index: i})
       rescue SyntaxError => ex
         warn "SyntaxError #{ex}. \nline:#{line}"
-        results[:failed].push({ type: SyntaxError, test: line, info: ex, index: i})
+        results[:failed].push({ type: SyntaxError, reg: reg, info: ex, index: i})
       rescue NameError => ex
         warn "NameError #{ex}. \nline:#{line}"
-        results[:failed].push({ type: NameError, test: line, info: ex, index: i})
+        results[:failed].push({ type: NameError, reg: reg, info: ex, index: i})
       rescue TypeError => ex
         warn "TypeError #{ex}. \nline:#{line}"
-        results[:failed].push({ type: TypeError, test: line, info: ex, index: i})
+        results[:failed].push({ type: TypeError, reg: reg, info: ex, index: i})
       rescue Encoding::CompatibilityError => ex
         warn "Encoding::CompatibilityError #{ex}. \nline:#{line}"
-        results[:failed].push({ type: Encoding::CompatibilityError, test: line, info: ex, index: i})
+        results[:failed].push({ type: Encoding::CompatibilityError, reg: reg, info: ex, index: i})
       end
     end
   end
 
   def get_lines(results)
     lines = []
+    perl_index = 9000
     # py_source = IO.read("../contrib/Onigmo/testpy.py")
     File::open("../contrib/Onigmo/testpy.py") do |f|
       f.each do |line|
@@ -111,7 +148,8 @@ class Regextest::Test
           end
         else
           warn "Perl syntax. \nline:#{line}"
-          results[:perl_syntax].push({ type: :perl_syntax, test: line, info: nil})
+          results[:perl_syntax].push({ type: :perl_syntax, test: line, info: nil, index: perl_index})
+          perl_index += 1
         end
       end
     end
@@ -153,7 +191,14 @@ end
 
 # Test suite (execute when this file is specified in command line)
 if __FILE__ == $0
-  min_test = ARGV[1]?(ARGV[0].to_i):0
-  max_test = ARGV[1]?(ARGV[1].to_i):(ARGV[0]?(ARGV[0].to_i):99999999)
-  Regextest::Test.new(min_test, max_test)
+  if ARGV.size == 0 || ARGV[0].match(/^\d+$/)
+    min_test = ARGV[1]?(ARGV[0].to_i):0
+    max_test = ARGV[1]?(ARGV[1].to_i):(ARGV[0]?(ARGV[0].to_i):99999999)
+    test_obj = Regextest::Test.new(min_test, max_test)
+    test_obj.print_results
+  elsif ARGV[0] == "csv"
+    test_obj = Regextest::Test.new(0, 99999999)
+    test_obj.print_results
+    test_obj.append_to_csv
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regextest
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - IKOMA, Mikio
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby
@@ -162,6 +162,7 @@ files:
 - lib/regextest/front/scanner.rb
 - lib/regextest/front/selectable.rb
 - lib/regextest/front/sequence.rb
+- lib/regextest/front/special-letter.rb
 - lib/regextest/regex-option.rb
 - lib/regextest/regexp.rb
 - lib/regextest/unicode.rb