Change StringScanner.new to a call in the initialize method.

lib/rexml/parsers/baseparser.rb

@@ -392,6 +392,7 @@ def pull_event
               unless md
                 raise REXML::ParseException.new("malformed XML: missing tag start", @source)
               end
+              tag = md[1]
               @document_status = :in_element
               prefixes = Set.new
               prefixes << md[2] if md[2]
@@ -405,23 +406,20 @@ def pull_event
               end
 
               if closed
-                @closed = md[1]
+                @closed = tag
                 @nsstack.shift
               else
-                @tags.push( md[1] )
+                @tags.push( tag )
               end
-              return [ :start_element, md[1], attributes ]
+              return [ :start_element, tag, attributes ]
             end
           else
             md = @source.match( TEXT_PATTERN, true )
+            text = md[1]
             if md[0].length == 0
               @source.match( /(\s+)/, true )
             end
-            #STDERR.puts "GOT #{md[1].inspect}" unless md[0].length == 0
-            #return [ :text, "" ] if md[0].length == 0
-            # unnormalized = Text::unnormalize( md[1], self )
-            # return PullEvent.new( :text, md[1], unnormalized )
-            return [ :text, md[1] ]
+            return [ :text, text ]
           end
         rescue REXML::UndefinedNamespaceException
           raise

lib/rexml/source.rb

@@ -42,6 +42,7 @@ class Source
     # value, overriding all encoding detection
     def initialize(arg, encoding=nil)
       @orig = @buffer = arg
+      @scanner = StringScanner.new(@buffer)
       if encoding
         self.encoding = encoding
       else
@@ -62,7 +63,7 @@ def read
     end
 
     def match(pattern, cons=false)
-      @scanner = StringScanner.new(@buffer)
+      @scanner.string = @buffer
       @scanner.scan(pattern)
       @buffer = @scanner.rest if cons and @scanner.matched?
 
@@ -151,7 +152,7 @@ def read
     end
 
     def match( pattern, cons=false )
-      @scanner = StringScanner.new(@buffer)
+      @scanner.string = @buffer
       @scanner.scan(pattern)
       @buffer = @scanner.rest if cons and @scanner.matched?
       while !@scanner.matched? and @source