mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
70bbad3cfd
rb_exec_recursive() in eval.c. * eval.c (rb_exec_recursive): new function. * array.c (rb_ary_join): use rb_exec_recursive(). * array.c (rb_ary_inspect, rb_ary_hash): ditto. * file.c (rb_file_join): ditto. * hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto. * io.c (rb_io_puts): ditto. * object.c (rb_obj_inspect): ditto * struct.c (rb_struct_inspect): ditto. * lib/set.rb (SortedSet::setup): a hack to shut up warning. [ruby-talk:132866] * lib/time.rb (Time::strptime): add new function. inspired by [ruby-talk:132815]. * lib/parsedate.rb (ParseDate::strptime): ditto. * regparse.c: move st_*_strend() functions from st.c. fixed some potential memory leaks. * exception error messages updated. [ruby-core:04497] * ext/socket/socket.c (Init_socket): add bunch of Socket constants. Patch from Sam Roberts <sroberts@uniserve.com>. [ruby-core:04409] * array.c (rb_ary_s_create): no need for negative argc check. [ruby-core:04463] * array.c (rb_ary_unshift_m): ditto. * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass of StandardError class, not Exception class. [ruby-core:04429] * parse.y (fcall_gen): lvar(arg) will be evaluated as lvar.call(arg) when lvar is a defined local variable. [new] * object.c (rb_class_initialize): call inherited method before calling initializing block. * eval.c (rb_thread_start_1): initialize newly pushed frame. * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE. fixed: [ruby-core:04444] * eval.c (is_defined): NODE_IASGN is an assignment. * ext/readline/readline.c (Readline.readline): use rl_outstream and rl_instream. [ruby-dev:25699] * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check [ruby-dev:25675] * misc/ruby-mode.el: [ruby-core:04415] * lib/rdoc/generators/html_generator.rb: [ruby-core:04412] * lib/rdoc/generators/ri_generator.rb: ditto. * struct.c (make_struct): fixed: [ruby-core:04402] * ext/curses/curses.c (window_color_set): [ruby-core:04393] * ext/socket/socket.c (Init_socket): SO_REUSEPORT added. [ruby-talk:130092] * object.c: [ruby-doc:818] * parse.y (open_args): fix too verbose warnings for the space before argument parentheses. [ruby-dev:25492] * parse.y (parser_yylex): ditto. * parse.y (parser_yylex): the first expression in the parentheses should not be a command. [ruby-dev:25492] * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330] * object.c (Init_Object): remove Object#type. [ruby-core:04335] * st.c (st_foreach): report success/failure by return value. [ruby-Bugs-1396] * parse.y: forgot to initialize parser struct. [ruby-dev:25492] * parse.y (parser_yylex): no tLABEL on EXPR_BEG. [ruby-talk:127711] * document updates - [ruby-core:04296], [ruby-core:04301], [ruby-core:04302], [ruby-core:04307] * dir.c (rb_push_glob): should work for NUL delimited patterns. * dir.c (rb_glob2): should aware of offset in the pattern. * string.c (rb_str_new4): should propagate taintedness. * env.h: rename member names in struct FRAME; last_func -> callee, orig_func -> this_func, last_class -> this_class. * struct.c (rb_struct_set): use original method name, not callee name, to retrieve member slot. [ruby-core:04268] * time.c (time_strftime): protect from format modification from GC finalizers. * object.c (Init_Object): remove rb_obj_id_obsolete() * eval.c (rb_mod_define_method): incomplete subclass check. [ruby-dev:25464] * gc.c (rb_data_object_alloc): klass may be NULL. [ruby-list:40498] * bignum.c (rb_big_rand): should return positive random number. [ruby-dev:25401] * bignum.c (rb_big_rand): do not use rb_big_modulo to generate random bignums. [ruby-dev:25396] * variable.c (rb_autoload): [ruby-dev:25373] * eval.c (svalue_to_avalue): [ruby-dev:25366] * string.c (rb_str_justify): [ruby-dev:25367] * io.c (rb_f_select): [ruby-dev:25312] * ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072] * struct.c (make_struct): [ruby-dev:25249] * dir.c (dir_open_dir): new function. [ruby-dev:25242] * io.c (rb_f_open): add type check for return value from to_open. * lib/pstore.rb (PStore#transaction): Use the empty content when a file is not found. [ruby-dev:24561] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
179 lines
5.7 KiB
Ruby
179 lines
5.7 KiB
Ruby
require "rexml/element"
|
|
require "rexml/xmldecl"
|
|
require "rexml/source"
|
|
require "rexml/comment"
|
|
require "rexml/doctype"
|
|
require "rexml/instruction"
|
|
require "rexml/rexml"
|
|
require "rexml/parseexception"
|
|
require "rexml/output"
|
|
require "rexml/parsers/baseparser"
|
|
require "rexml/parsers/streamparser"
|
|
require "rexml/parsers/treeparser"
|
|
|
|
module REXML
|
|
# Represents a full XML document, including PIs, a doctype, etc. A
|
|
# Document has a single child that can be accessed by root().
|
|
# Note that if you want to have an XML declaration written for a document
|
|
# you create, you must add one; REXML documents do not write a default
|
|
# declaration for you. See |DECLARATION| and |write|.
|
|
class Document < Element
|
|
# A convenient default XML declaration. If you want an XML declaration,
|
|
# the easiest way to add one is mydoc << Document::DECLARATION
|
|
# +DEPRECATED+
|
|
# Use: mydoc << XMLDecl.default
|
|
DECLARATION = XMLDecl.default
|
|
|
|
# Constructor
|
|
# @param source if supplied, must be a Document, String, or IO.
|
|
# Documents have their context and Element attributes cloned.
|
|
# Strings are expected to be valid XML documents. IOs are expected
|
|
# to be sources of valid XML documents.
|
|
# @param context if supplied, contains the context of the document;
|
|
# this should be a Hash.
|
|
# NOTE that I'm not sure what the context is for; I cloned it out of
|
|
# the Electric XML API (in which it also seems to do nothing), and it
|
|
# is now legacy. It may do something, someday... it may disappear.
|
|
def initialize( source = nil, context = {} )
|
|
super()
|
|
@context = context
|
|
return if source.nil?
|
|
if source.kind_of? Document
|
|
@context = source.context
|
|
super source
|
|
else
|
|
build( source )
|
|
end
|
|
end
|
|
|
|
def node_type
|
|
:document
|
|
end
|
|
|
|
# Should be obvious
|
|
def clone
|
|
Document.new self
|
|
end
|
|
|
|
# According to the XML spec, a root node has no expanded name
|
|
def expanded_name
|
|
''
|
|
#d = doc_type
|
|
#d ? d.name : "UNDEFINED"
|
|
end
|
|
|
|
alias :name :expanded_name
|
|
|
|
# We override this, because XMLDecls and DocTypes must go at the start
|
|
# of the document
|
|
def add( child )
|
|
if child.kind_of? XMLDecl
|
|
@children.unshift child
|
|
elsif child.kind_of? DocType
|
|
if @children[0].kind_of? XMLDecl
|
|
@children[1,0] = child
|
|
else
|
|
@children.unshift child
|
|
end
|
|
child.parent = self
|
|
else
|
|
rv = super
|
|
raise "attempted adding second root element to document" if @elements.size > 1
|
|
rv
|
|
end
|
|
end
|
|
alias :<< :add
|
|
|
|
def add_element(arg=nil, arg2=nil)
|
|
rv = super
|
|
raise "attempted adding second root element to document" if @elements.size > 1
|
|
rv
|
|
end
|
|
|
|
# @return the root Element of the document, or nil if this document
|
|
# has no children.
|
|
def root
|
|
@children.find { |item| item.kind_of? Element }
|
|
end
|
|
|
|
# @return the DocType child of the document, if one exists,
|
|
# and nil otherwise.
|
|
def doctype
|
|
@children.find { |item| item.kind_of? DocType }
|
|
end
|
|
|
|
# @return the XMLDecl of this document; if no XMLDecl has been
|
|
# set, the default declaration is returned.
|
|
def xml_decl
|
|
rv = @children[0]
|
|
return rv if rv.kind_of? XMLDecl
|
|
rv = @children.unshift(XMLDecl.default)[0]
|
|
end
|
|
|
|
# @return the XMLDecl version of this document as a String.
|
|
# If no XMLDecl has been set, returns the default version.
|
|
def version
|
|
xml_decl().version
|
|
end
|
|
|
|
# @return the XMLDecl encoding of this document as a String.
|
|
# If no XMLDecl has been set, returns the default encoding.
|
|
def encoding
|
|
xml_decl().encoding
|
|
end
|
|
|
|
# @return the XMLDecl standalone value of this document as a String.
|
|
# If no XMLDecl has been set, returns the default setting.
|
|
def stand_alone?
|
|
xml_decl().stand_alone?
|
|
end
|
|
|
|
# Write the XML tree out, optionally with indent. This writes out the
|
|
# entire XML document, including XML declarations, doctype declarations,
|
|
# and processing instructions (if any are given).
|
|
# A controversial point is whether Document should always write the XML
|
|
# declaration (<?xml version='1.0'?>) whether or not one is given by the
|
|
# user (or source document). REXML does not write one if one was not
|
|
# specified, because it adds unneccessary bandwidth to applications such
|
|
# as XML-RPC.
|
|
#
|
|
#
|
|
# output::
|
|
# output an object which supports '<< string'; this is where the
|
|
# document will be written.
|
|
# indent::
|
|
# An integer. If -1, no indenting will be used; otherwise, the
|
|
# indentation will be this number of spaces, and children will be
|
|
# indented an additional amount. Defaults to -1
|
|
# transitive::
|
|
# If transitive is true and indent is >= 0, then the output will be
|
|
# pretty-printed in such a way that the added whitespace does not affect
|
|
# the absolute *value* of the document -- that is, it leaves the value
|
|
# and number of Text nodes in the document unchanged.
|
|
# ie_hack::
|
|
# Internet Explorer is the worst piece of crap to have ever been
|
|
# written, with the possible exception of Windows itself. Since IE is
|
|
# unable to parse proper XML, we have to provide a hack to generate XML
|
|
# that IE's limited abilities can handle. This hack inserts a space
|
|
# before the /> on empty tags. Defaults to false
|
|
def write( output=$stdout, indent_level=-1, transitive=false, ie_hack=false )
|
|
output = Output.new( output, xml_decl.encoding ) if xml_decl.encoding != "UTF-8" && !output.kind_of?(Output)
|
|
@children.each { |node|
|
|
indent( output, indent_level ) if node.node_type == :element
|
|
if node.write( output, indent_level, transitive, ie_hack )
|
|
output << "\n" unless indent_level<0 or node == @children[-1]
|
|
end
|
|
}
|
|
end
|
|
|
|
|
|
def Document::parse_stream( source, listener )
|
|
Parsers::StreamParser.new( source, listener ).parse
|
|
end
|
|
|
|
private
|
|
def build( source )
|
|
Parsers::TreeParser.new( source, self ).parse
|
|
end
|
|
end
|
|
end
|