Change @scanner.match to respond nil/@scanner in order to impro…

…ve processing speed.
ruby · Jan 14, 2024 · ec62e37 · ec62e37
1 parent 1b435a0
commit ec62e37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
@@ -274,8 +274,8 @@ def pull_event
             return [ :elementdecl, @source.match( ELEMENTDECL_PATTERN, true )[1] ]
 
           when ENTITY_START
-            match = @source.match( ENTITYDECL, true ).compact
-            match[0] = :entitydecl
+            match = @source.match( ENTITYDECL, true )
+            match = match.nil? ? [:entitydecl] : [:entitydecl, *match.captures.compact]
             ref = false
             if match[1] == '%'
               ref = true

diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
@@ -74,7 +74,7 @@ def match(pattern, cons=false)
       else
         @scanner.check(pattern)
       end
-      @scanner.matched? ? [@scanner.matched, *@scanner.captures] : nil
+      @scanner.matched? ? @scanner : nil
     end
 
     # @return true if the Source is exhausted
@@ -175,7 +175,7 @@ def match( pattern, cons=false )
         end
       end
 
-      @scanner.matched? ? [@scanner.matched, *@scanner.captures] : nil
+      @scanner.matched? ? @scanner : nil
     end
 
     def empty?