core
/
oga
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed useless code from the XML parser.

This commit is contained in:
Yorick Peterse 2014-05-18 23:30:26 +02:00
parent 31ec76c90a
commit c891dd88cb
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/oga/xml/parser.y
View File

@ -26,7 +26,7 @@ rule
; ;
expressions expressions
: expressions expression { val.compact } : expressions expression { val[0] << val[1] }
| expression { val } | expression { val }
| /* none */ { [] } | /* none */ { [] }
; ;
@ -116,7 +116,7 @@ rule
: element_start expressions T_ELEM_END : element_start expressions T_ELEM_END
{ {
if val[0] if val[0]
on_element_children(val[0], val[1] ? val[1].flatten : []) on_element_children(val[0], val[1])
end end
after_element(val[0]) after_element(val[0])
@ -131,7 +131,7 @@ rule
; ;
attributes_ attributes_
: attributes_ attribute { val.flatten } : attributes_ attribute { val[0] << val[1] }
| attribute { val } | attribute { val }
; ;
@ -256,12 +256,6 @@ Unexpected #{name} with value #{value.inspect} on line #{@line}:
# @return [Oga::XML::Document] # @return [Oga::XML::Document]
# #
def on_document(children = []) def on_document(children = [])
if children.is_a?(Array)
children = children.flatten
else
children = [children]
end
document = Document.new document = Document.new
children.each do |child| children.each do |child|
@ -327,12 +321,11 @@ Unexpected #{name} with value #{value.inspect} on line #{@line}:
# @param [Array] children # @param [Array] children
# @return [Oga::XML::Element] # @return [Oga::XML::Element]
# #
def on_element(namespace, name, attributes = {}, children = []) def on_element(namespace, name, attributes = {})
element = Element.new( element = Element.new(
:namespace => namespace, :namespace => namespace,
:name => name, :name => name,
:attributes => attributes, :attributes => attributes
:children => children
) )
return element return element