rack-mount 0.2.0 → 0.2.1

data/lib/rack/mount/analysis/splitting.rb

@@ -62,21 +62,21 @@ module Rack::Mount
             if part.is_a?(Reginald::Group)
               if index > 0
                 previous = parts[index-1]
-                if previous.is_a?(Reginald::Character)
-                  boundaries << previous.to_str
+                if previous.literal?
+                  boundaries << previous.value
                 end
               end
 
               if inside = part[0][0]
-                if inside.is_a?(Reginald::Character)
-                  boundaries << inside.to_str
+                if inside.literal?
+                  boundaries << inside.value
                 end
               end
 
               if index < parts.length
                 following = parts[index+1]
-                if following.is_a?(Reginald::Character)
-                  boundaries << following.to_str
+                if following.literal?
+                  boundaries << following.value
                 end
               end
             end
@@ -99,11 +99,15 @@ module Rack::Mount
                 buf = nil
                 break
               end
+            when Reginald::CharacterClass
+              break if separators.any? { |s| part.include?(s) }
+              buf = nil
+              segments << part.to_regexp
             when Reginald::Character
               if separators.any? { |s| part.include?(s) }
                 segments << join_buffer(buf, regexp) if buf
                 peek = parts[index+1]
-                if peek.is_a?(Reginald::Character) && separators.include?(peek)
+                if peek.is_a?(Reginald::Character) && separators.include?(peek.value)
                   segments << ''
                 end
                 buf = nil
@@ -126,10 +130,6 @@ module Rack::Mount
               else
                 break
               end
-            when Reginald::CharacterClass
-              break if separators.any? { |s| part.include?(s) }
-              buf = nil
-              segments << part.to_regexp
             else
               break
             end

data/lib/rack/mount/generatable_regexp.rb

@@ -68,10 +68,12 @@ module Rack::Mount
             when Reginald::Anchor
               # ignore
             when Reginald::Character
+              throw :halt unless part.literal?
+
               if s.last.is_a?(String)
-                s.last << part.dup
+                s.last << part.value.dup
               else
-                s << part.dup
+                s << part.value.dup
               end
             when Reginald::Group
               if part.name

data/lib/rack/mount/utils.rb

@@ -126,7 +126,7 @@ module Rack::Mount
       end
 
       expression
-    rescue Racc::ParseError
+    rescue Racc::ParseError, Reginald::Parser::ScanError
       []
     end
     module_function :parse_regexp

data/lib/rack/mount/vendor/reginald/reginald.rb

@@ -1,55 +1,58 @@
 module Reginald
   autoload :Alternation, 'reginald/alternation'
   autoload :Anchor, 'reginald/anchor'
+  autoload :Atom, 'reginald/atom'
   autoload :Character, 'reginald/character'
   autoload :CharacterClass, 'reginald/character_class'
   autoload :Expression, 'reginald/expression'
   autoload :Group, 'reginald/group'
   autoload :Parser, 'reginald/parser'
 
-  begin
-    eval('/(?<foo>.*)/').named_captures
+  class << self
+    begin
+      eval('/(?<foo>.*)/').named_captures
 
-    def self.regexp_supports_named_captures?
-      true
+      def regexp_supports_named_captures?
+        true
+      end
+    rescue SyntaxError, NoMethodError
+      def regexp_supports_named_captures?
+        false
+      end
     end
-  rescue SyntaxError, NoMethodError
-    def self.regexp_supports_named_captures?
-      false
+
+    def parse(regexp)
+      regexp = strip_extended_whitespace_and_comments(regexp)
+
+      parser = Parser.new
+      parser.capture_index = 0
+      parser.capture_index_stack = []
+      expression = parser.scan_str(regexp.source)
+
+      expression.ignorecase = regexp.casefold?
+
+      expression
     end
-  end
 
-  def self.parse(regexp)
-    # TODO: The parser should be aware of extended expressions
-    # instead of having to sanitize them before.
-    if regexp.options & Regexp::EXTENDED != 0
-      source = regexp.source
-      source.gsub!(/#.+$/, '')
-      source.gsub!(/\s+/, '')
-      source.gsub!(/\\\//, '/')
+    def compile(source)
       regexp = Regexp.compile(source)
+      expression = parse(regexp)
+      Regexp.compile(expression.to_s_without_options, expression.options)
     end
 
-    parser = Parser.new
-    expression = parser.scan_str(regexp.source)
-    expression.ignorecase = regexp.casefold?
-
-    capture_index = 0
-    tag_captures = Proc.new do |expr|
-      expr.each do |atom|
-        if atom.is_a?(Group)
-          if atom.capture
-            atom.index = capture_index
-            capture_index += 1
-          end
-          tag_captures.call(atom)
-        elsif atom.is_a?(Expression)
-          tag_captures.call(atom)
+    private
+      # TODO: The parser should be aware of extended expressions
+      # instead of having to sanitize them before.
+      def strip_extended_whitespace_and_comments(regexp)
+        if regexp.options & Regexp::EXTENDED != 0
+          source = regexp.source
+          source.gsub!(/#.+$/, '')
+          source.gsub!(/\s+/, '')
+          source.gsub!(/\\\//, '/')
+          regexp = Regexp.compile(source)
+        else
+          regexp
         end
       end
-    end
-    tag_captures.call(expression)
-
-    expression
   end
 end

data/lib/rack/mount/vendor/reginald/reginald/alternation.rb

@@ -11,7 +11,7 @@ module Reginald
     end
 
     def initialize(*args)
-      if args.length == 1 && args.first.is_a?(Array)
+      if args.length == 1 && args.first.instance_of?(Array)
         super(args.first)
       else
         super(args)

data/lib/rack/mount/vendor/reginald/reginald/anchor.rb

@@ -1,20 +1,4 @@
 module Reginald
-  class Anchor < Struct.new(:value)
-    def to_s
-      "#{value}"
-    end
-
-    def inspect
-      to_s.inspect
-    end
-
-    def literal?
-      false
-    end
-
-    def freeze
-      value.freeze
-      super
-    end
+  class Anchor < Atom
   end
 end

data/lib/rack/mount/vendor/reginald/reginald/atom.rb

@@ -0,0 +1,20 @@
+module Reginald
+  class Atom < Struct.new(:value)
+    def literal?
+      false
+    end
+
+    def to_s
+      "#{value}"
+    end
+
+    def inspect
+      "#<#{self.class.to_s.sub('Reginald::', '')} #{to_s.inspect}>"
+    end
+
+    def freeze
+      value.freeze
+      super
+    end
+  end
+end

data/lib/rack/mount/vendor/reginald/reginald/character.rb

@@ -1,34 +1,25 @@
 module Reginald
-  class Character < String
+  class Character < Atom
     attr_accessor :quantifier
 
-    def initialize(char)
-      raise ArgumentError if char.length != 1
-      super
-    end
-
     def literal?
       quantifier.nil?
     end
 
     def to_s
-      "#{super}#{quantifier}"
+      "#{value}#{quantifier}"
     end
 
     def to_regexp
       Regexp.compile("\\A#{to_s}\\Z")
     end
 
-    def inspect
-      to_s.inspect
-    end
-
     def match(char)
       to_regexp.match(char)
     end
 
     def include?(char)
-      to_str == char
+      value == char
     end
 
     def ==(other)
@@ -41,8 +32,9 @@ module Reginald
     end
 
     def eql?(other)
-      other.is_a?(self.class) && super &&
-        self.quantifier == other.quantifier
+      other.is_a?(self.class) &&
+        value.eql?(other.value) &&
+        quantifier.eql?(other.quantifier)
     end
 
     def freeze

data/lib/rack/mount/vendor/reginald/reginald/character_class.rb

@@ -1,6 +1,21 @@
 module Reginald
-  class CharacterClass < Struct.new(:value)
-    attr_accessor :negate, :quantifier
+  class CharacterClass < Character
+    ALNUM = new(':alnum:').freeze
+    ALPHA = new(':alpha:').freeze
+    ASCII = new(':ascii:').freeze
+    BLANK = new(':blank:').freeze
+    CNTRL = new(':cntrl:').freeze
+    DIGIT = new(':digit:').freeze
+    GRAPH = new(':graph:').freeze
+    LOWER = new(':lower:').freeze
+    PRINT = new(':print:').freeze
+    PUNCT = new(':punct:').freeze
+    SPACE = new(':space:').freeze
+    UPPER = new(':upper:').freeze
+    WORD = new(':word:').freeze
+    XDIGIT = new(':xdigit:').freeze
+
+    attr_accessor :negate
 
     def negated?
       negate ? true : false
@@ -11,50 +26,26 @@ module Reginald
     end
 
     def to_s
-      if value == '.' || value == '\d'
-        "#{value}#{quantifier}"
+      if value == '.' || value =~ /^\\[dDsSwW]$/
+        super
       else
         "[#{negate && '^'}#{value}]#{quantifier}"
       end
     end
 
-    def to_regexp
-      Regexp.compile("\\A#{to_s}\\Z")
-    end
-
-    def inspect
-      to_s.inspect
-    end
-
-    def match(char)
-      to_regexp.match(char)
-    end
-
     def include?(char)
       re = quantifier ? to_s.sub(/#{Regexp.escape(quantifier)}$/, '') : to_s
       Regexp.compile("\\A#{re}\\Z").match(char)
     end
 
-    def ==(other)
-      case other
-      when String
-        other == to_s
-      else
-        eql?(other)
-      end
-    end
-
     def eql?(other)
       other.is_a?(self.class) &&
-        self.value == other.value &&
-        self.negate == other.negate &&
-        self.quantifier == other.quantifier
+        negate == other.negate &&
+        super
     end
 
     def freeze
-      value.freeze
       negate.freeze
-      quantifier.freeze
       super
     end
   end

data/lib/rack/mount/vendor/reginald/reginald/expression.rb

@@ -1,6 +1,6 @@
 module Reginald
   class Expression < Array
-    attr_accessor :ignorecase
+    attr_accessor :multiline, :ignorecase, :extended
 
     def self.reduce(expression_or_atom, atom = nil)
       if expression_or_atom.is_a?(Expression)
@@ -14,11 +14,12 @@ module Reginald
     end
 
     def initialize(*args)
-      @ignorecase = false
+      @multiline = @ignorecase = @extended = false
 
-      if args.length == 1 && args.first.is_a?(Array)
+      if args.length == 1 && args.first.instance_of?(Array)
         super(args.first)
       else
+        args = args.map { |e| e.instance_of?(String) ? Character.new(e) : e }
         super(args)
       end
     end
@@ -27,12 +28,36 @@ module Reginald
       ignorecase == false && all? { |e| e.literal? }
     end
 
-    def to_s
+    def options
+      flag = 0
+      flag |= Regexp::MULTILINE if multiline
+      flag |= Regexp::IGNORECASE if ignorecase
+      flag |= Regexp::EXTENDED if extended
+      flag
+    end
+
+    def to_s_without_options
       map { |e| e.to_s }.join
     end
 
+    def to_s
+      if options == 0
+        to_s_without_options
+      else
+        with, without = [], []
+        multiline ? (with << 'm') : (without << 'm')
+        ignorecase ? (with << 'i') : (without << 'i')
+        extended ? (with << 'x') : (without << 'x')
+
+        with = with.join
+        without = without.any? ? "-#{without.join}" : ''
+
+        "(?#{with}#{without}:#{to_s_without_options})"
+      end
+    end
+
     def to_regexp
-      Regexp.compile("\\A#{to_s}\\Z")
+      Regexp.compile("\\A#{to_s_without_options}\\Z", options)
     end
 
     def inspect
@@ -64,7 +89,9 @@ module Reginald
 
     def eql?(other)
       other.is_a?(self.class) && super &&
-        self.ignorecase == other.ignorecase
+        self.multiline == other.multiline &&
+        self.ignorecase == other.ignorecase &&
+        self.extended == other.extended
     end
 
     def freeze

data/lib/rack/mount/vendor/reginald/reginald/group.rb

@@ -12,7 +12,13 @@ module Reginald
     end
 
     def to_s
-      "(#{capture ? '' : '?:'}#{expression.to_s})#{quantifier}"
+      if expression.options == 0
+        "(#{capture ? '' : '?:'}#{expression.to_s_without_options})#{quantifier}"
+      elsif capture == false
+        "#{expression.to_s}#{quantifier}"
+      else
+        "(#{expression.to_s})#{quantifier}"
+      end
     end
 
     def to_regexp

data/lib/rack/mount/vendor/reginald/reginald/parser.rb

@@ -7,124 +7,153 @@
 require 'racc/parser.rb'
 
 require 'reginald/tokenizer'
+
 module Reginald
   class Parser < Racc::Parser
+
+attr_accessor :capture_index
+attr_accessor :capture_index_stack
 ##### State transition tables begin ###
 
 racc_action_table = [
-     5,    31,    11,     6,     7,     9,    40,    10,    45,    14,
-     5,    12,    11,     6,     7,     9,    41,    10,    37,    14,
-     5,    12,    11,     6,     7,     9,    28,    10,    47,    14,
-     5,    12,    11,     6,     7,     9,    48,    10,    46,   nil,
-     5,    12,    11,     6,     7,     9,    13,    10,    14,   nil,
-     5,    12,    11,     6,     7,     9,    27,    10,    38,    39,
-     5,    12,    11,     6,     7,     9,    19,    10,   nil,    19,
-   nil,    12,    17,    18,    20,    17,    18,    20,    32,   nil,
-   nil,    34,    33,    35,    42,   nil,   nil,    34,    33,    35,
-    22,   nil,    24,    23,    25,    24,    23,    25 ]
+     1,    17,    18,    18,     7,     8,    10,    11,    46,    18,
+     1,    43,     2,     4,     7,     8,    10,    11,    58,    45,
+     1,    53,     2,     4,     7,     8,    10,    11,    47,    18,
+     1,    61,     2,     4,     7,     8,    10,    11,    59,    18,
+     1,    27,     2,     4,     7,     8,    10,    11,    62,    15,
+     1,    34,     2,     4,     7,     8,    10,    11,    31,    25,
+     1,   nil,     2,     4,     7,     8,    10,    11,   nil,   nil,
+     1,   nil,     2,     4,     7,     8,    10,    11,    40,    41,
+    29,   nil,     2,     4,    30,    20,    42,    35,    37,    39,
+    21,    22,    24,    20,    49,    35,    37,    39,    21,    22,
+    24,    13,   nil,    14,    44,   nil,    15,   nil,    30,    56,
+    35,    37,    39,    35,    37,    39,    35,    37,    39,    35,
+    37,    39,    35,    37,    39,    35,    37,    39,    35,    37,
+    39 ]
 
 racc_action_check = [
-     0,    20,     0,     0,     0,     0,    31,     0,    40,    26,
-    39,     0,    39,    39,    39,    39,    31,    39,    26,    44,
-     2,    39,     2,     2,     2,     2,    13,     2,    44,    43,
-    14,     2,    14,    14,    14,    14,    45,    14,    43,   nil,
-    29,    14,    29,    29,    29,    29,     1,    29,     1,   nil,
-    10,    29,    10,    10,    10,    10,    10,    10,    27,    27,
-    38,    10,    38,    38,    38,    38,     3,    38,   nil,    15,
-   nil,    38,     3,     3,     3,    15,    15,    15,    21,   nil,
-   nil,    21,    21,    21,    36,   nil,   nil,    36,    36,    36,
-     5,   nil,     5,     5,     5,    22,    22,    22 ]
+     0,     3,    26,     3,     0,     0,     0,     0,    34,    50,
+    47,    26,     0,     0,    47,    47,    47,    47,    50,    34,
+    41,    46,    47,    47,    41,    41,    41,    41,    36,    51,
+     5,    53,    41,    41,     5,     5,     5,     5,    51,    54,
+    32,    13,     5,     5,    32,    32,    32,    32,    54,    14,
+    11,    24,    32,    32,    11,    11,    11,    11,    17,    11,
+    18,   nil,    11,    11,    18,    18,    18,    18,   nil,   nil,
+    40,   nil,    18,    18,    40,    40,    40,    40,    25,    25,
+    16,   nil,    40,    40,    16,    19,    25,    25,    25,    25,
+    19,    19,    19,     6,    38,    38,    38,    38,     6,     6,
+     6,     1,   nil,     1,    28,   nil,     1,   nil,    28,    48,
+    48,    48,    48,    52,    52,    52,    56,    56,    56,    57,
+    57,    57,    60,    60,    60,    49,    49,    49,    42,    42,
+    42 ]
 
 racc_action_pointer = [
-    -3,    46,    17,    57,   nil,    85,   nil,   nil,   nil,   nil,
-    47,   nil,   nil,    26,    27,    60,   nil,   nil,   nil,   nil,
-    -7,    74,    88,   nil,   nil,   nil,     7,    46,   nil,    37,
-   nil,    -2,   nil,   nil,   nil,   nil,    80,   nil,    57,     7,
-     0,   nil,   nil,    27,    17,    18,   nil,   nil,   nil ]
+    -3,    97,   nil,     1,   nil,    27,    81,   nil,   nil,   nil,
+   nil,    47,   nil,    36,    40,   nil,    75,    58,    57,    73,
+   nil,   nil,   nil,   nil,    42,    65,     0,   nil,    99,   nil,
+   nil,   nil,    37,   nil,    -1,   nil,    15,   nil,    73,   nil,
+    67,    17,   106,   nil,   nil,   nil,    12,     7,    88,   103,
+     7,    27,    91,    11,    37,   nil,    94,    97,   nil,   nil,
+   100,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -30,   -30,    -2,    -6,    -7,   -30,   -10,   -11,   -12,   -13,
-   -30,   -23,   -24,   -30,   -30,    -4,    -5,   -25,   -26,   -27,
-   -30,   -30,   -30,   -17,   -18,   -19,   -30,   -30,    49,    -1,
-    -3,   -30,    -8,   -14,   -15,   -16,   -30,   -20,   -30,   -30,
-   -30,   -29,    -9,   -30,   -30,   -30,   -21,   -22,   -28 ]
+   -35,   -35,   -21,   -35,   -22,    -2,    -6,   -11,   -12,    -7,
+   -14,   -35,   -13,   -35,   -35,   -16,   -35,   -35,   -35,    -4,
+   -25,   -23,   -24,    -5,   -35,   -35,   -35,    -8,   -35,    -9,
+   -15,    66,    -1,    -3,   -35,   -32,   -35,   -33,   -35,   -34,
+   -35,   -35,   -35,   -17,   -10,   -27,   -35,   -35,   -35,   -35,
+   -35,   -35,   -35,   -35,   -35,   -31,   -35,   -35,   -19,   -20,
+   -35,   -26,   -18,   -30,   -29,   -28 ]
 
 racc_goto_table = [
-     1,    15,    21,    16,    29,   nil,   nil,   nil,   nil,   nil,
-    26,   nil,   nil,   nil,   nil,    30,   nil,   nil,   nil,    36,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    15,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    43,    44 ]
+     3,    38,    19,    16,    23,    36,    32,   nil,   nil,   nil,
+   nil,    26,   nil,   nil,    48,   nil,    28,    33,    52,   nil,
+   nil,   nil,   nil,   nil,    55,    57,   nil,   nil,    60,    19,
+   nil,   nil,    63,    64,   nil,   nil,    65,   nil,   nil,   nil,
+    50,    51,   nil,   nil,   nil,   nil,   nil,    54 ]
 
 racc_goto_check = [
-     1,     3,     6,     4,     2,   nil,   nil,   nil,   nil,   nil,
-     1,   nil,   nil,   nil,   nil,     4,   nil,   nil,   nil,     6,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     3,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     1,     1 ]
+     1,     9,     3,     6,     4,     8,     2,   nil,   nil,   nil,
+   nil,     1,   nil,   nil,     9,   nil,     6,     4,     9,   nil,
+   nil,   nil,   nil,   nil,     9,     9,   nil,   nil,     9,     3,
+   nil,   nil,     9,     9,   nil,   nil,     9,   nil,   nil,   nil,
+     1,     1,   nil,   nil,   nil,   nil,   nil,     1 ]
 
 racc_goto_pointer = [
-   nil,     0,   -10,    -1,     0,   nil,    -3,   nil ]
+   nil,     0,   -12,    -3,    -2,   nil,     2,   nil,   -20,   -24 ]
 
 racc_goto_default = [
-   nil,   nil,     2,     3,   nil,     4,   nil,     8 ]
+   nil,   nil,     5,     6,   nil,     9,   nil,    12,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 20, :_reduce_1,
-  1, 20, :_reduce_2,
-  3, 21, :_reduce_3,
-  2, 21, :_reduce_4,
-  2, 21, :_reduce_5,
-  1, 21, :_reduce_none,
-  1, 22, :_reduce_none,
-  3, 22, :_reduce_8,
-  4, 22, :_reduce_9,
-  1, 22, :_reduce_10,
-  1, 22, :_reduce_11,
-  1, 22, :_reduce_12,
-  1, 22, :_reduce_13,
-  2, 25, :_reduce_14,
-  2, 25, :_reduce_15,
-  2, 25, :_reduce_16,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  3, 24, :_reduce_20,
-  5, 24, :_reduce_21,
-  5, 24, :_reduce_22,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  5, 23, :_reduce_28,
-  3, 23, :_reduce_29 ]
-
-racc_reduce_n = 30
-
-racc_shift_n = 49
+  3, 26, :_reduce_1,
+  1, 26, :_reduce_2,
+  3, 27, :_reduce_3,
+  2, 27, :_reduce_4,
+  2, 27, :_reduce_5,
+  1, 27, :_reduce_none,
+  1, 28, :_reduce_none,
+  3, 28, :_reduce_8,
+  3, 28, :_reduce_9,
+  4, 28, :_reduce_10,
+  1, 28, :_reduce_11,
+  1, 28, :_reduce_12,
+  1, 28, :_reduce_13,
+  1, 28, :_reduce_14,
+  2, 31, :_reduce_15,
+  1, 31, :_reduce_none,
+  3, 30, :_reduce_17,
+  6, 30, :_reduce_18,
+  5, 30, :_reduce_19,
+  5, 30, :_reduce_20,
+  1, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 29, :_reduce_none,
+  1, 29, :_reduce_none,
+  1, 29, :_reduce_none,
+  5, 29, :_reduce_26,
+  3, 29, :_reduce_27,
+  4, 33, :_reduce_28,
+  4, 33, :_reduce_29,
+  4, 33, :_reduce_30,
+  3, 33, :_reduce_31,
+  1, 34, :_reduce_32,
+  1, 34, :_reduce_33,
+  1, 34, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 66
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :BAR => 2,
   :LBRACK => 3,
-  :RBRACK => 4,
-  :L_ANCHOR => 5,
-  :CHAR_CLASS => 6,
-  :DOT => 7,
-  :CHAR => 8,
-  :QMARK => 9,
+  :LC_CTYPE => 4,
+  :RBRACK => 5,
+  :NEGATE => 6,
+  :CCLASS => 7,
+  :DOT => 8,
+  :CHAR => 9,
   :LPAREN => 10,
   :RPAREN => 11,
-  :COLON => 12,
-  :NAME => 13,
-  :R_ANCHOR => 14,
-  :STAR => 15,
-  :PLUS => 16,
-  :LCURLY => 17,
-  :RCURLY => 18 }
-
-racc_nt_base = 19
+  :QMARK => 12,
+  :COLON => 13,
+  :NAME => 14,
+  :L_ANCHOR => 15,
+  :R_ANCHOR => 16,
+  :STAR => 17,
+  :PLUS => 18,
+  :LCURLY => 19,
+  :RCURLY => 20,
+  :MINUS => 21,
+  :MULTILINE => 22,
+  :IGNORECASE => 23,
+  :EXTENDED => 24 }
+
+racc_nt_base = 25
 
 racc_use_result_var = true
 
@@ -149,21 +178,27 @@ Racc_token_to_s_table = [
   "error",
   "BAR",
   "LBRACK",
+  "LC_CTYPE",
   "RBRACK",
-  "L_ANCHOR",
-  "CHAR_CLASS",
+  "NEGATE",
+  "CCLASS",
   "DOT",
   "CHAR",
-  "QMARK",
   "LPAREN",
   "RPAREN",
+  "QMARK",
   "COLON",
   "NAME",
+  "L_ANCHOR",
   "R_ANCHOR",
   "STAR",
   "PLUS",
   "LCURLY",
   "RCURLY",
+  "MINUS",
+  "MULTILINE",
+  "IGNORECASE",
+  "EXTENDED",
   "$start",
   "expression",
   "branch",
@@ -171,7 +206,9 @@ Racc_token_to_s_table = [
   "quantifier",
   "group",
   "bracket_expression",
-  "anchor" ]
+  "anchor",
+  "options",
+  "modifier" ]
 
 Racc_debug_parser = false
 
@@ -180,7 +217,7 @@ Racc_debug_parser = false
 # reduce 0 omitted
 
 def _reduce_1(val, _values, result)
- result = Expression.new([Alternation.reduce(val[0], val[2])]) 
+ result = Expression.new(Alternation.reduce(val[0], val[2])) 
     result
 end
 
@@ -213,37 +250,37 @@ end
 # reduce 7 omitted
 
 def _reduce_8(val, _values, result)
- result = CharacterClass.new(val[1]) 
+ result = val[1] 
     result
 end
 
 def _reduce_9(val, _values, result)
- result = CharacterClass.new(val[2]); result.negate = true 
+ result = CharacterClass.new(val[1]) 
     result
 end
 
 def _reduce_10(val, _values, result)
- result = CharacterClass.new(val[0]) 
+ result = CharacterClass.new(val[2]); result.negate = true 
     result
 end
 
 def _reduce_11(val, _values, result)
- result = CharacterClass.new(val[0]) 
+ result = val[0] 
     result
 end
 
 def _reduce_12(val, _values, result)
- result = Anchor.new(val[0]) 
+ result = CharacterClass.new('.') 
     result
 end
 
 def _reduce_13(val, _values, result)
- result = Character.new(val[0]) 
+ result = Anchor.new(val[0]) 
     result
 end
 
 def _reduce_14(val, _values, result)
- result = val.join 
+ result = Character.new(val[0]) 
     result
 end
 
@@ -252,49 +289,93 @@ def _reduce_15(val, _values, result)
     result
 end
 
-def _reduce_16(val, _values, result)
- result = val.join 
+# reduce 16 omitted
+
+def _reduce_17(val, _values, result)
+          result = Group.new(val[1])
+          result.index = @capture_index_stack.pop
+        
     result
 end
 
-# reduce 17 omitted
-
-# reduce 18 omitted
-
-# reduce 19 omitted
-
-def _reduce_20(val, _values, result)
- result = Group.new(val[1]) 
+def _reduce_18(val, _values, result)
+          result = Group.new(val[4]);
+          result.capture = false;
+          options = val[2];
+          result.expression.multiline = options[:multiline];
+          result.expression.ignorecase = options[:ignorecase];
+          result.expression.extended = options[:extended];
+        
     result
 end
 
-def _reduce_21(val, _values, result)
- result = Group.new(val[3]); result.capture = false 
+def _reduce_19(val, _values, result)
+          result = Group.new(val[3]);
+          result.capture = false;
+        
     result
 end
 
-def _reduce_22(val, _values, result)
- result = Group.new(val[3]); result.name = val[2] 
+def _reduce_20(val, _values, result)
+          result = Group.new(val[3]);
+          result.name = val[2];
+          result.index = @capture_index_stack.pop
+        
     result
 end
 
+# reduce 21 omitted
+
+# reduce 22 omitted
+
 # reduce 23 omitted
 
 # reduce 24 omitted
 
 # reduce 25 omitted
 
-# reduce 26 omitted
+def _reduce_26(val, _values, result)
+ result = val.join 
+    result
+end
 
-# reduce 27 omitted
+def _reduce_27(val, _values, result)
+ result = val.join 
+    result
+end
 
 def _reduce_28(val, _values, result)
- result = val.join 
+ result = { val[1] => false, val[2] => false, val[3] => false } 
     result
 end
 
 def _reduce_29(val, _values, result)
- result = val.join 
+ result = { val[0] => true, val[2] => false, val[3] => false } 
+    result
+end
+
+def _reduce_30(val, _values, result)
+ result = { val[0] => true, val[1] => true, val[3] => false } 
+    result
+end
+
+def _reduce_31(val, _values, result)
+ result = { val[0] => true, val[1] => true, val[2] => true } 
+    result
+end
+
+def _reduce_32(val, _values, result)
+ result = :multiline 
+    result
+end
+
+def _reduce_33(val, _values, result)
+ result = :ignorecase 
+    result
+end
+
+def _reduce_34(val, _values, result)
+ result = :extended 
     result
 end
 

data/lib/rack/mount/vendor/reginald/reginald/tokenizer.rb

@@ -51,23 +51,23 @@ class Parser < Racc::Parser
     token = case @state
     when nil
       case
-      when (text = @ss.scan(/\\c/))
-         action { [:CHAR_CLASS, text] }
+      when (text = @ss.scan(/\\d/))
+         action { [:CCLASS, CharacterClass.new('\d')] }
+
+      when (text = @ss.scan(/\\D/))
+         action { [:CCLASS, CharacterClass.new('\D')] }
 
       when (text = @ss.scan(/\\s/))
-         action { [:CHAR_CLASS, text] }
+         action { [:CCLASS, CharacterClass.new('\s')] }
 
       when (text = @ss.scan(/\\S/))
-         action { [:CHAR_CLASS, text] }
-
-      when (text = @ss.scan(/\\d/))
-         action { [:CHAR_CLASS, text] }
+         action { [:CCLASS, CharacterClass.new('\S')] }
 
       when (text = @ss.scan(/\\w/))
-         action { [:CHAR_CLASS, text] }
+         action { [:CCLASS, CharacterClass.new('\w')] }
 
       when (text = @ss.scan(/\\W/))
-         action { [:CHAR_CLASS, text] }
+         action { [:CCLASS, CharacterClass.new('\W')] }
 
       when (text = @ss.scan(/\^/))
          action { [:L_ANCHOR, text] }
@@ -85,16 +85,19 @@ class Parser < Racc::Parser
          action { [:NAME, @ss[1]] }
 
       when (text = @ss.scan(/\(/))
-         action { [:LPAREN,  text] }
+         action {
+    @capture_index_stack << @capture_index
+    @capture_index += 1
+    @state = :OPTIONS if @ss.peek(1) == '?';
+    [:LPAREN, text]
+  }
+
 
       when (text = @ss.scan(/\)/))
          action { [:RPAREN,  text] }
 
       when (text = @ss.scan(/\[/))
-         action { [:LBRACK,  text] }
-
-      when (text = @ss.scan(/\]/))
-         action { [:RBRACK,  text] }
+         action { @state = :CCLASS; [:LBRACK,  text] }
 
       when (text = @ss.scan(/\{/))
          action { [:LCURLY,  text] }
@@ -117,9 +120,6 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\*/))
          action { [:STAR,  text] }
 
-      when (text = @ss.scan(/\:/))
-         action { [:COLON, text] }
-
       when (text = @ss.scan(/\\(.)/))
          action { [:CHAR, @ss[1]] }
 
@@ -131,6 +131,102 @@ class Parser < Racc::Parser
         raise  ScanError, "can not match: '" + text + "'"
       end  # if
 
+    when :CCLASS
+      case
+      when (text = @ss.scan(/\]/))
+         action { @state = nil; [:RBRACK, text] }
+
+      when (text = @ss.scan(/\^/))
+         action { [:NEGATE, text] }
+
+      when (text = @ss.scan(/:alnum:/))
+         action { [:LC_CTYPE, CharacterClass::ALNUM] }
+
+      when (text = @ss.scan(/:alpha:/))
+         action { [:LC_CTYPE, CharacterClass::ALPHA] }
+
+      when (text = @ss.scan(/:ascii:/))
+         action { [:LC_CTYPE, CharacterClass::ASCII] }
+
+      when (text = @ss.scan(/:blank:/))
+         action { [:LC_CTYPE, CharacterClass::BLANK] }
+
+      when (text = @ss.scan(/:cntrl:/))
+         action { [:LC_CTYPE, CharacterClass::CNTRL] }
+
+      when (text = @ss.scan(/:digit:/))
+         action { [:LC_CTYPE, CharacterClass::DIGIT] }
+
+      when (text = @ss.scan(/:graph:/))
+         action { [:LC_CTYPE, CharacterClass::GRAPH] }
+
+      when (text = @ss.scan(/:lower:/))
+         action { [:LC_CTYPE, CharacterClass::LOWER] }
+
+      when (text = @ss.scan(/:print:/))
+         action { [:LC_CTYPE, CharacterClass::PRINT] }
+
+      when (text = @ss.scan(/:punct:/))
+         action { [:LC_CTYPE, CharacterClass::PUNCT] }
+
+      when (text = @ss.scan(/:space:/))
+         action { [:LC_CTYPE, CharacterClass::SPACE] }
+
+      when (text = @ss.scan(/:upper:/))
+         action { [:LC_CTYPE, CharacterClass::UPPER] }
+
+      when (text = @ss.scan(/:word;/))
+         action { [:LC_CTYPE, CharacterClass::WORD] }
+
+      when (text = @ss.scan(/:xdigit:/))
+         action { [:LC_CTYPE, CharacterClass::XDIGIT] }
+
+      when (text = @ss.scan(/\\(.)/))
+         action { [:CHAR, @ss[1]] }
+
+      when (text = @ss.scan(/./))
+         action { [:CHAR,     text] }
+
+      else
+        text = @ss.string[@ss.pos .. -1]
+        raise  ScanError, "can not match: '" + text + "'"
+      end  # if
+
+    when :OPTIONS
+      case
+      when (text = @ss.scan(/\?/))
+         action {
+    @state = nil unless @ss.peek(1) =~ /-|m|i|x|:/
+    [:QMARK, text]
+  }
+
+
+      when (text = @ss.scan(/\-/))
+         action { [:MINUS, text] }
+
+      when (text = @ss.scan(/m/))
+         action { [:MULTILINE, text] }
+
+      when (text = @ss.scan(/i/))
+         action { [:IGNORECASE, text] }
+
+      when (text = @ss.scan(/x/))
+         action { [:EXTENDED, text] }
+
+      when (text = @ss.scan(/\:/))
+         action {
+    @capture_index_stack.pop
+    @capture_index -= 1
+    @state = nil;
+    [:COLON, text]
+  }
+
+
+      else
+        text = @ss.string[@ss.pos .. -1]
+        raise  ScanError, "can not match: '" + text + "'"
+      end  # if
+
     else
       raise  ScanError, "undefined state: '" + state.to_s + "'"
     end  # case state

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -08:00
+date: 2009-11-22 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ files:
 - lib/rack/mount/vendor/multimap/nested_multimap.rb
 - lib/rack/mount/vendor/reginald/reginald/alternation.rb
 - lib/rack/mount/vendor/reginald/reginald/anchor.rb
+- lib/rack/mount/vendor/reginald/reginald/atom.rb
 - lib/rack/mount/vendor/reginald/reginald/character.rb
 - lib/rack/mount/vendor/reginald/reginald/character_class.rb
 - lib/rack/mount/vendor/reginald/reginald/expression.rb