mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
f114b85d89
* Fixes ticket:68.
***** Note that this is an API change!!! *****
NOTE that this involves an API change! Entity declarations in the doctype now
generate events that carry two, not one, arguments.
* Implements ticket:15, using gwrite's suggestion. This allows Element to be
subclassed.
* Fixed namespaces handling in XPath and element.
***** Note that this is an API change!!! *****
Element.namespaces() now returns a hash of namespace mappings which are
relevant for that node.
* Fixes a bug in multiple decodings
* The changeset 1230:1231 was bad. The default behavior is *not* to use the
native REXML encodings by default, but rather to use ICONV by default. I'll
have to think of a better way of managing translations, but the REXML codecs
are (a) less reliable than ICONV, but more importantly (b) slower. The real
solution is to use ICONV by default, but allow users to specify that they
want to use the pure Ruby codecs.
* Fixes ticket:61 (xpath_parser)
* Fixes ticket:63 (UTF-16; UNILE decoding was bad)
* Improves parsing error messages a little
* Adds the ability to override the encoding detection in Source construction
* Fixes an edge case in Functions::string, where document nodes weren't
correctly converted
* Fixes Functions::string() for Element and Document nodes
* Fixes some problems in entity handling
* Addresses ticket:66
* Fixes ticket:71
* Addresses ticket:78
NOTE: that this also fixes what is technically another bug in REXML. REXML's
XPath parser used to allow exponential notation in numbers. The XPath spec
is specific about what a number is, and scientific notation is not included.
Therefore, this has been fixed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
95 lines
3.3 KiB
Ruby
95 lines
3.3 KiB
Ruby
require 'rexml/validation/validationexception'
|
|
|
|
module REXML
|
|
module Parsers
|
|
class TreeParser
|
|
def initialize( source, build_context = Document.new )
|
|
@build_context = build_context
|
|
@parser = Parsers::BaseParser.new( source )
|
|
end
|
|
|
|
def add_listener( listener )
|
|
@parser.add_listener( listener )
|
|
end
|
|
|
|
def parse
|
|
tag_stack = []
|
|
in_doctype = false
|
|
entities = nil
|
|
begin
|
|
while true
|
|
event = @parser.pull
|
|
#STDERR.puts "TREEPARSER GOT #{event.inspect}"
|
|
case event[0]
|
|
when :end_document
|
|
unless tag_stack.empty?
|
|
#raise ParseException.new("No close tag for #{tag_stack.inspect}")
|
|
raise ParseException.new("No close tag for #{@build_context.xpath}")
|
|
end
|
|
return
|
|
when :start_element
|
|
tag_stack.push(event[1])
|
|
# find the observers for namespaces
|
|
@build_context = @build_context.add_element( event[1], event[2] )
|
|
when :end_element
|
|
tag_stack.pop
|
|
@build_context = @build_context.parent
|
|
when :text
|
|
if not in_doctype
|
|
if @build_context[-1].instance_of? Text
|
|
@build_context[-1] << event[1]
|
|
else
|
|
@build_context.add(
|
|
Text.new(event[1], @build_context.whitespace, nil, true)
|
|
) unless (
|
|
@build_context.ignore_whitespace_nodes and
|
|
event[1].strip.size==0
|
|
)
|
|
end
|
|
end
|
|
when :comment
|
|
c = Comment.new( event[1] )
|
|
@build_context.add( c )
|
|
when :cdata
|
|
c = CData.new( event[1] )
|
|
@build_context.add( c )
|
|
when :processing_instruction
|
|
@build_context.add( Instruction.new( event[1], event[2] ) )
|
|
when :end_doctype
|
|
in_doctype = false
|
|
entities.each { |k,v| entities[k] = @build_context.entities[k].value }
|
|
@build_context = @build_context.parent
|
|
when :start_doctype
|
|
doctype = DocType.new( event[1..-1], @build_context )
|
|
@build_context = doctype
|
|
entities = {}
|
|
in_doctype = true
|
|
when :attlistdecl
|
|
n = AttlistDecl.new( event[1..-1] )
|
|
@build_context.add( n )
|
|
when :externalentity
|
|
n = ExternalEntity.new( event[1] )
|
|
@build_context.add( n )
|
|
when :elementdecl
|
|
n = ElementDecl.new( event[1] )
|
|
@build_context.add(n)
|
|
when :entitydecl
|
|
entities[ event[1] ] = event[2] unless event[2] =~ /PUBLIC|SYSTEM/
|
|
@build_context.add(Entity.new(event))
|
|
when :notationdecl
|
|
n = NotationDecl.new( *event[1..-1] )
|
|
@build_context.add( n )
|
|
when :xmldecl
|
|
x = XMLDecl.new( event[1], event[2], event[3] )
|
|
@build_context.add( x )
|
|
end
|
|
end
|
|
rescue REXML::Validation::ValidationException
|
|
raise
|
|
rescue
|
|
raise ParseException.new( $!.message, @parser.source, @parser, $! )
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|