Merge pull request #2 from paulogeyer/master

using String instead of ASCIIString

Author: lindahua

src/document.jl

@@ -76,30 +76,30 @@ function set_root(xdoc::XMLDocument, xroot::XMLElement)
 	ccall(xmlDocSetRootElement, Xptr, (Xptr, Xptr), xdoc.ptr, xroot.node.ptr)
 end
 
-function create_root(xdoc::XMLDocument, name::ASCIIString)
+function create_root(xdoc::XMLDocument, name::String)
 	xroot = new_element(name)
 	set_root(xdoc, xroot)
 	return xroot
 end
 
 #### parse and free
 
-function parse_file(filename::ASCIIString)
+function parse_file(filename::String)
 	p = ccall(xmlParseFile, Xptr, (Ptr{Cchar},), filename)
 	p != nullptr || throw(XMLParseError("Failure in parsing an XML file."))
 	XMLDocument(p)
 end
 
-function parse_string(s::ASCIIString)
-	p = ccall(xmlParseMemory, Xptr, (Ptr{Cchar}, Cint), s, length(s) + 1)
+function parse_string(s::String)
+	p = ccall(xmlParseMemory, Xptr, (Ptr{Cchar}, Cint), s, sizeof(s) + 1)
 	p != nullptr || throw(XMLParseError("Failure in parsing an XML string."))
 	XMLDocument(p)
 end
 
 
 #### output
 
-function save_file(xdoc::XMLDocument, filename::ASCIIString; encoding::ASCIIString="utf-8")
+function save_file(xdoc::XMLDocument, filename::String; encoding::String="utf-8")
 	ret = ccall(xmlSaveFormatFileEnc, Cint, (Ptr{Cchar}, Xptr, Ptr{Cchar}, Cint), 
 		filename, xdoc.ptr, encoding, 1)
 	if ret < 0
@@ -108,7 +108,7 @@ function save_file(xdoc::XMLDocument, filename::ASCIIString; encoding::ASCIIStri
 	return int(ret)  # number of bytes written
 end
 
-function Base.string(xdoc::XMLDocument; encoding::ASCIIString="utf-8")	
+function Base.string(xdoc::XMLDocument; encoding::String="utf-8")	
 	buf_out = Array(Xstr, 1)
 	len_out = Array(Cint, 1)
 	ccall(xmlDocDumpFormatMemoryEnc, Void, (Xptr, Ptr{Xstr}, Ptr{Cint}, Ptr{Cchar}, Cint), 

src/errors.jl

@@ -2,7 +2,7 @@
 abstract XMLError 
 
 immutable XMLParseError <: XMLError
-	msg::ASCIIString
+	msg::String
 end
 
 immutable XMLNoRootError <: XMLError
@@ -12,11 +12,11 @@ immutable XMLAttributeNotFound <: XMLError
 end
 
 immutable XMLWriteError <: XMLError
-	msg::ASCIIString
+	msg::String
 end
 
 immutable XMLTreeError <: XMLError
-	msg::ASCIIString
+	msg::String
 end
 
 const dom_exception_causes = [
@@ -35,7 +35,7 @@ const dom_exception_causes = [
 
 immutable DOMException <: XMLError
 	code::Int
-	cause::ASCIIString
+	cause::String
 
 	DOMException(code::Int) = new(code, dom_exception_causes[code])
 end

src/nodes.jl

@@ -86,7 +86,7 @@ name(a::XMLAttr) = bytestring(a._struct.name)
 
 function value(a::XMLAttr)
 	pct = ccall(xmlNodeGetContent, Xstr, (Xptr,), a._struct.children)
-	(pct != nullptr ? _xcopystr(pct) : "")::ASCIIString
+	(pct != nullptr ? _xcopystr(pct) : "")::String
 end
 
 # iterations
@@ -160,7 +160,7 @@ child_nodes(nd::XMLNode) = XMLNodeIter(nd._struct.children)
 
 function content(nd::XMLNode)
 	pct = ccall(xmlNodeGetContent, Xstr, (Xptr,), nd.ptr)
-	(pct != nullptr ? _xcopystr(pct) : "")::ASCIIString
+	(pct != nullptr ? _xcopystr(pct) : "")::String
 end
 
 # dumping
@@ -211,7 +211,7 @@ Base.show(io::IO, x::XMLElement) = Base.show(x.node)
 
 # attribute access
 
-function attribute(x::XMLElement, name::ASCIIString; required::Bool=false)
+function attribute(x::XMLElement, name::String; required::Bool=false)
 	pv = ccall(xmlGetProp, Xstr, (Xptr, Xstr), x.node.ptr, name)
 	if pv != nullptr
 		return _xcopystr(pv)
@@ -224,7 +224,7 @@ function attribute(x::XMLElement, name::ASCIIString; required::Bool=false)
 	end
 end
 
-function has_attribute(x::XMLElement, name::ASCIIString)
+function has_attribute(x::XMLElement, name::String)
 	p = ccall(xmlHasProp, Xptr, (Xptr, Xstr), x.node.ptr, name)
 	return p != nullptr
 end
@@ -235,7 +235,7 @@ attributes(x::XMLElement) = XMLAttrIter(x.node._struct.attrs)
 function attributes_dict(x::XMLElement)
 	# make an dictionary based on attributes
 
-	dct = (ASCIIString=>ASCIIString)[]
+	dct = (String=>String)[]
 	if has_attributes(x)
 		for a in attributes(x)
 			dct[name(a)] = value(a)
@@ -259,7 +259,7 @@ child_elements(x::XMLElement) = XMLElementIter(x.node.ptr)
 
 # elements by tag name
 
-function find_element(x::XMLElement, n::ASCIIString)
+function find_element(x::XMLElement, n::String)
 	for c in child_elements(x)
 		if name(c) == n
 			return c
@@ -268,7 +268,7 @@ function find_element(x::XMLElement, n::ASCIIString)
 	return nothing
 end
 
-function get_elements_by_tagname(x::XMLElement, n::ASCIIString)
+function get_elements_by_tagname(x::XMLElement, n::String)
 	lst = Array(XMLElement, 0)
 	for c in child_elements(x)
 		if name(c) == n
@@ -285,7 +285,7 @@ end
 #
 #######################################
 
-function new_element(name::ASCIIString)
+function new_element(name::String)
 	p = ccall(xmlNewNode, Xptr, (Xptr, Xstr), nullptr, name)
 	XMLElement(p)
 end
@@ -297,25 +297,25 @@ end
 
 add_child(xparent::XMLElement, xchild::XMLElement) = add_child(xparent, xchild.node)
 
-function new_child(xparent::XMLElement, name::ASCIIString)
+function new_child(xparent::XMLElement, name::String)
 	xc = new_element(name)
 	add_child(xparent, xc)
 	return xc
 end
 
-function new_textnode(txt::ASCIIString)
+function new_textnode(txt::String)
 	p = ccall(xmlNewText, Xptr, (Xstr,), txt)
 	XMLNode(p)
 end
 
-add_text(x::XMLElement, txt::ASCIIString) = add_child(x, new_textnode(txt))
+add_text(x::XMLElement, txt::String) = add_child(x, new_textnode(txt))
 
-function set_attribute(x::XMLElement, name::ASCIIString, val::ASCIIString)
+function set_attribute(x::XMLElement, name::String, val::String)
 	a = ccall(xmlSetProp, Xptr, (Xptr, Xstr, Xstr), x.node.ptr, name, val)
 	return XMLAttr(a)
 end
 
-set_attribute(x::XMLElement, name::ASCIIString, val) = set_attribute(x, name, string(val))
+set_attribute(x::XMLElement, name::String, val) = set_attribute(x, name, string(val))
 
 function set_attributes{P<:NTuple{2}}(x::XMLElement, attrs::AbstractArray{P})
 	for (nam, val) in attrs