regexp_parser 1.7.0 → 2.8.3

data/lib/regexp_parser/scanner/char_type.rl

@@ -10,17 +10,17 @@
   # --------------------------------------------------------------------------
   char_type := |*
     char_type_char {
-      case text = text(data, ts, te, 1).first
-      when '\d'; emit(:type, :digit,      text, ts - 1, te)
-      when '\D'; emit(:type, :nondigit,   text, ts - 1, te)
-      when '\h'; emit(:type, :hex,        text, ts - 1, te)
-      when '\H'; emit(:type, :nonhex,     text, ts - 1, te)
-      when '\s'; emit(:type, :space,      text, ts - 1, te)
-      when '\S'; emit(:type, :nonspace,   text, ts - 1, te)
-      when '\w'; emit(:type, :word,       text, ts - 1, te)
-      when '\W'; emit(:type, :nonword,    text, ts - 1, te)
-      when '\R'; emit(:type, :linebreak,  text, ts - 1, te)
-      when '\X'; emit(:type, :xgrapheme,  text, ts - 1, te)
+      case text = copy(data, ts-1, te)
+      when '\d'; emit(:type, :digit,      text)
+      when '\D'; emit(:type, :nondigit,   text)
+      when '\h'; emit(:type, :hex,        text)
+      when '\H'; emit(:type, :nonhex,     text)
+      when '\s'; emit(:type, :space,      text)
+      when '\S'; emit(:type, :nonspace,   text)
+      when '\w'; emit(:type, :word,       text)
+      when '\W'; emit(:type, :nonword,    text)
+      when '\R'; emit(:type, :linebreak,  text)
+      when '\X'; emit(:type, :xgrapheme,  text)
       end
       fret;
     };

data/lib/regexp_parser/scanner/errors/premature_end_error.rb

@@ -0,0 +1,8 @@
+class Regexp::Scanner
+  # Unexpected end of pattern
+  class PrematureEndError < ScannerError
+    def initialize(where = '')
+      super "Premature end of pattern at #{where}"
+    end
+  end
+end

data/lib/regexp_parser/scanner/errors/scanner_error.rb

@@ -0,0 +1,6 @@
+require 'regexp_parser/error'
+
+class Regexp::Scanner
+  # General scanner error (catch all)
+  class ScannerError < Regexp::Parser::Error; end
+end

data/lib/regexp_parser/scanner/errors/validation_error.rb

@@ -0,0 +1,63 @@
+class Regexp::Scanner
+  # Base for all scanner validation errors
+  class ValidationError < ScannerError
+    # Centralizes and unifies the handling of validation related errors.
+    def self.for(type, problem, reason = nil)
+      types.fetch(type).new(problem, reason)
+    end
+
+    def self.types
+      @types ||= {
+        backref:      InvalidBackrefError,
+        group:        InvalidGroupError,
+        group_option: InvalidGroupOption,
+        posix_class:  UnknownPosixClassError,
+        property:     UnknownUnicodePropertyError,
+        sequence:     InvalidSequenceError,
+      }
+    end
+  end
+
+  # Invalid sequence format. Used for escape sequences, mainly.
+  class InvalidSequenceError < ValidationError
+    def initialize(what = 'sequence', where = '')
+      super "Invalid #{what} at #{where}"
+    end
+  end
+
+  # Invalid group. Used for named groups.
+  class InvalidGroupError < ValidationError
+    def initialize(what, reason)
+      super "Invalid #{what}, #{reason}."
+    end
+  end
+
+  # Invalid groupOption. Used for inline options.
+  # TODO: should become InvalidGroupOptionError in v3.0.0 for consistency
+  class InvalidGroupOption < ValidationError
+    def initialize(option, text)
+      super "Invalid group option #{option} in #{text}"
+    end
+  end
+
+  # Invalid back reference. Used for name a number refs/calls.
+  class InvalidBackrefError < ValidationError
+    def initialize(what, reason)
+      super "Invalid back reference #{what}, #{reason}"
+    end
+  end
+
+  # The property name was not recognized by the scanner.
+  class UnknownUnicodePropertyError < ValidationError
+    def initialize(name, _)
+      super "Unknown unicode character property name #{name}"
+    end
+  end
+
+  # The POSIX class name was not recognized by the scanner.
+  class UnknownPosixClassError < ValidationError
+    def initialize(text, _)
+      super "Unknown POSIX class #{text}"
+    end
+  end
+end