ruby_grammar_builder 1.1.11 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58d3e3e3fe4b1e992aa23abace8ae7ad9d0e7ca6b3e6b1237e1f9f800317fd81
-  data.tar.gz: 2b2423273398cc66d8637d97e41434d7a62c270477b224d5343c339e7f51a33b
+  metadata.gz: 11a8a1b576e0b4aa298d5216fab27ecafbdfb89bdbcbe1604699b17f944e6773
+  data.tar.gz: 705f94bbb89097d41510042c581bab138bfbcb74bd703e540df429524547c6fd
 SHA512:
-  metadata.gz: 21fb51484f36fcdf93a619ac6e29a96ac2fb50d26dfd3e2a8eb79d2ef7a0c83ec930817045d7340abf9aff5edc9369cb09d2ca4d34fb2c90c280b67527cd817b
-  data.tar.gz: 10c1c631a8bca900ff2c40d9f38ada75cdd310bbcab36cace76f80d745b655f55fbe338fa5d015932a2eef694bbee5434c084e500f0afeb03803b9671b24a0bf
+  metadata.gz: e3121cb4e1efddf789f32c6c79a77ebd35bee9417ba654f33d6d99b4672ebffc09d4f54254826477f44ac75b38ff06c3efab0a1e73c73e56627021bc7c8e4411
+  data.tar.gz: 20de057ae05b377087bcbe77e3d42ddd12069640538e98a0507d05d90ffe75c2092be09820d9b7341327294ff86d4671896aeea21be4007d59954dee76196a45

data/lib/ruby_grammar_builder/pattern_variations/base_pattern.rb

@@ -42,7 +42,7 @@ class PatternBase
     # @return [Boolean] can this capture become capture group 0
     #
     def optimize_outer_group?
-        needs_to_capture? and @next_pattern.nil?
+        self.needs_to_capture? and @next_pattern.nil?
     end
 
     #
@@ -73,18 +73,6 @@ class PatternBase
         new_pattern.insert!(pattern).freeze
     end
 
-    #
-    # Adds a capture group if needed
-    #
-    # @param [String] regex_as_string the pattern as a string
-    #
-    # @return [String] the pattern, potentially with a capture group
-    #
-    def add_capture_group_if_needed(regex_as_string)
-        regex_as_string = "(#{regex_as_string})" if needs_to_capture?
-        regex_as_string
-    end
-
     #
     # Uses a block to transform all Patterns in the list
     #
@@ -306,7 +294,7 @@ class PatternBase
     #
     def to_tag
         output = {
-            match: evaluate,
+            match: self.evaluate(),
         }
 
         output[:captures] = convert_group_attributes_to_captures(collect_group_attributes)
@@ -570,7 +558,12 @@ class PatternBase
     def do_evaluate_self(groups)
         match = @match
         match = match.evaluate(groups) if match.is_a? PatternBase
-        add_capture_group_if_needed(match)
+        if self.needs_to_capture?
+            match = "(#{match})"
+        elsif not string_single_entity?(match)
+            match = "(?:#{match})"
+        end
+        return match
     end
 
     #
@@ -611,7 +604,7 @@ class PatternBase
 
     # (see string_single_entity)
     def single_entity?
-        string_single_entity? evaluate
+        return string_single_entity?( self.evaluate() )
     end
 
     # does this pattern contain no capturing groups
@@ -696,7 +689,7 @@ class PatternBase
     #
     def do_collect_self_groups(next_group)
         groups = []
-        groups << {group: next_group}.merge(@arguments) if needs_to_capture?
+        groups << {group: next_group}.merge(@arguments) if self.needs_to_capture?
         groups
     end
 

data/lib/ruby_grammar_builder/pattern_variations/repeatable_pattern.rb

@@ -152,7 +152,13 @@ class RepeatablePattern < PatternBase
 
     # (see PatternBase#do_evaluate_self)
     def do_evaluate_self(groups)
-        add_capture_group_if_needed(add_quantifier_options_to(@match, groups))
+        match = add_quantifier_options_to(@match, groups)
+        if self.needs_to_capture?
+            match = "(#{match})"
+        elsif not string_single_entity?(match)
+            match = "(?:#{match})"
+        end
+        return match
     end
 
     # controls weather @arguments[:at_most] et. al. set @at_most et. al.

data/lib/ruby_grammar_builder/util.rb

@@ -52,21 +52,23 @@ end
 # @return [Boolean] if the string represents an single regex entity
 def string_single_entity?(regex_string)
     normal_char = '[a-zA-Z0-9_\-@&%#\'"<>=\/\.,`~\s;:!]'
+    escape_sequence = '\\\\[\w\W]'
+    character_class_that_doesnt_contain_bracket = '\[[^\]]*\]'
     # normal char
     if regex_string =~ /^#{normal_char}$/
         return true
     end
     # escape sequence (all are valid, even stuff like \@ ("\\@") or "\\" + "\n" )
-    if regex_string =~ /^\\[\w\W]$/
+    if regex_string =~ /^#{escape_sequence}$/
         return true
     end
     # character class that doesn't contain ]
-    if regex_string =~ /^\[[^\]]*\]$/
+    if regex_string =~ /^#{character_class_that_doesnt_contain_bracket}$/
         return true
     end
     
     # fail if more than one of any of the above
-    if regex_string =~ /^(#{normal_char}|\\[\w\W]|\[[^\]]*\]){2,}$/
+    if regex_string =~ /^(#{normal_char}|#{escape_sequence}|#{character_class_that_doesnt_contain_bracket}){2,}$/
         return false
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_grammar_builder
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.1.12
 platform: ruby
 authors:
 - Jeff Hykin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_clone