regexp-examples 0.2.3 → 0.2.4

data/lib/regexp-examples/parser.rb

@@ -54,11 +54,16 @@ module RegexpExamples
       when BackslashCharMap.keys.include?(regexp_string[@current_position])
         group = CharGroup.new(
           BackslashCharMap[regexp_string[@current_position]])
-      when rest_of_string =~ /\Ac(.)/ # Control character
-        @current_position += 1
-        group = parse_single_char_group( parse_control_character($1) )
-        # TODO: There are also a bunch of multi-char matches to watch out for:
+      when rest_of_string =~ /\A(c|C-)(.)/ # Control character
         # http://en.wikibooks.org/wiki/Ruby_Programming/Syntax/Literals
+        @current_position += $1.length
+        group = parse_single_char_group( parse_control_character($2) )
+      when rest_of_string =~ /\Ax(\h{1,2})/ # Escape sequence
+        @current_position += $1.length
+        group = parse_single_char_group( parse_escape_sequence($1) )
+      when rest_of_string =~ /\Au(\h{4})/ # Unicode sequence
+        @current_position += 4
+        group = parse_single_char_group( parse_unicode_sequence($1) )
       else
         group = parse_single_char_group( regexp_string[@current_position] )
         # TODO: What about cases like \A, \z, \Z ?
@@ -152,8 +157,16 @@ module RegexpExamples
     end
 
     def parse_control_character(char)
-      # TODO: Is there a better way of doing this? I.e. not just brute-force
-      (0..255).detect { |x| x.chr =~ Regexp.new("\\c#{char}") }.chr
+      (char.ord % 32).chr # Black magic!
+      # eval "?\\C-#{char.chr}" # Doesn't work for e.g. char = "?"
+    end
+
+    def parse_escape_sequence(match)
+      eval "?\\x#{match}"
+    end
+
+    def parse_unicode_sequence(match)
+      eval "?\\u#{match}"
     end
 
     def parse_star_repeater(group)

data/lib/regexp-examples/version.rb

@@ -1,3 +1,3 @@
 module RegexpExamples
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/regexp-examples_spec.rb

@@ -129,8 +129,27 @@ RSpec.describe Regexp, "#examples" do
         /\c9/,
         /\c[/,
         /\c#/,
-        /\c?/
+        /\c?/,
+        /\C-a/,
+        /\C-&/
       )
     end
+
+    context "for escape sequences" do
+      examples_exist_and_match(
+        /\x42/,
+        /\x1D/,
+        /\x3word/,
+        /#{"\x80".force_encoding("ASCII-8BIT")}/
+      )
+    end
+
+    context "for unicode sequences" do
+      examples_exist_and_match(
+      /\u6829/,
+      /\uabcd/
+      )
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regexp-examples
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tom Lord
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Extends the Regexp class with '#examples'