Changeset 219:68433480f3f5

Timestamp:

04/25/03 00:39:07 (6 years ago)

Author:

ser

Branch:

3.0

convert_revision:

svn:877f57f0-f5bd-0310-8c13-bb9e5bdefd87/rexml/branches/3.0@781

Message:

* Lightparser needed a rewind method.
* Fixes to base parser, and improved error reporting.
* Fixes to require_with_version, to allow it to grab the highest version of

a package even when not specifically asked for.

* Minor doc fixes -- not the ones we really need.

Files:

• INSTALL (modified) (1 diff)
• README (modified) (1 diff)
• src/require_with_version.rb (modified) (1 diff)
• src/rexml/parsers/baseparser.rb (modified) (3 diffs)
• src/rexml/parsers/lightparser.rb (modified) (1 diff)

INSTALL

@@ -1 @@
-Run bin/install.rb
+Run "bin/install.rb --help"
+
+If you want to upgrade REXML (or install it as the default version of REXML)
+run install.rb with no arguments.  If you want to have multiple versions of
+REXML installed at the same time, run install.rb with the "-c" argument.  If
+you do this, you will need to require REXML differently, since you will need
+a "require" command that supports versioning.  This is installed with REXML;
+all you need to do is:
+
+        require "require_with_version"
+        require "rexml"
+
+or
+
+        require( "rexml" ) { |v| v >= "2.7" }
+
+to place restrictions on the version of REXML that you are loading.

README

@@ -31 +31 @@
 http://www.germane-software.com/software/rexml_doc_ja.
 
+This is the third major iteration of REXML.
+
 --- SER

src/require_with_version.rb

@@ -91 +91 @@
                 base = File.basename( file )
                 files = []
+                $:.each {|dir|
+                        files += Dir.new(dir).entries.delete_if {|f| 
+                                fpath = File.join( dir, f )
+                                f !~ /^#{package}/ or !File.directory?(fpath) or 
+                                Dir.new(fpath).entries.include?( file+".rb" )
+                        } if File.exists? dir
+                }
+                files.uniq!
     if b #block_given?
-      $:.each {|dir|
-        files += Dir.new(dir).entries.delete_if {|f| 
-          f !~ /^#{package}/
-        } if File.exists? dir
-      }
-                        files.uniq!
       files = files.delete_if { |f|
         (f.include?('-') and yield( Version.new( f.split('-')[1] ) )) ? false : true
       }
                 end
+                p files
                 if files.size > 0
       files = files.sort
       files.reverse!
-      #puts <<-EOL
+                        #puts <<-EOL
       old_require "#{files[0]}/#{base}"
-      #EOL
+                        #EOL
                 else
-      #puts <<-EOL
+                        #puts <<-EOL
       old_require "#{file}"
-      #EOL
+                        #EOL
     end
   end

src/rexml/parsers/baseparser.rb

@@ -1 +1 @@
 require 'rexml/parseexception'
+require 'rexml/source'
 
 module REXML
@@ -274 +275 @@
                                                         last_tag = @tags.pop
                                                         md = @source.match( CLOSE_MATCH, true )
-                                                        raise REXML::ParseException.new( "Missing end tag for #{last_tag} "+
+                                                        raise REXML::ParseException.new( "Missing end tag for '#{last_tag}' "+
                                                                 "(got \"#{md[1]}\")", @source) unless last_tag == md[1]
                                                         return [ :end_element, last_tag ]
@@ -319 +320 @@
                                                 return [ :text, md[1] ]
                                         end
+        rescue REXML::ParseException
+          raise $!
                                 rescue Exception, NameError => error
-                                        raise REXML::ParseException.new( "Exception parsing", 
+                                        raise REXML::ParseException.new( "Exception parsing",
                                                 @source, self, error )
                                 end

src/rexml/parsers/lightparser.rb

@@ -10 +10 @@
                         end
 
+      def rewind
+        @stream.rewind
+        @parser.stream = @stream
+      end
+
                         def parse
-                                @parser.stream = @stream
                                 root = context = []
                                 while true