Merge branch 'textContent'

Conflicts:

	dom/FoX_dom.f90
	dom/m_dom_attribute.m4
	dom/m_dom_dom.f90
	dom/m_dom_node.m4
	dom/m_dom_text.m4

dom/m_dom_attribute.m4

@@ -37,8 +37,6 @@ TOHW_m_dom_get(Node, ownerElement, np%elExtras%ownerElement, (ATTRIBUTE_NODE))
     type(Node), pointer :: arg
     character(len=getTextContent_len(arg, associated(arg))) :: c 
 
-    integer :: i, n
-
     if (.not.associated(arg)) then
       TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)
     endif
@@ -58,28 +56,7 @@ TOHW_m_dom_get(Node, ownerElement, np%elExtras%ownerElement, (ATTRIBUTE_NODE))
     type(Node), pointer :: np
     integer :: i
 
-    if (.not.associated(arg)) then
-      TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)
-    endif
-
-    if (getNodeType(arg)/=ATTRIBUTE_NODE) then
-      TOHW_m_dom_throw_error(FoX_INVALID_NODE)
-    elseif (arg%readonly) then
-      TOHW_m_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR)
-    elseif (.not.checkChars(value, getXmlVersionEnum(getOwnerDocument(arg)))) then
-      TOHW_m_dom_throw_error(FoX_INVALID_CHARACTER)
-    endif
-
-    do i = 1, getLength(getChildNodes(arg))
-      call destroyNode(arg%childNodes%nodes(i)%this)
-    enddo
-    deallocate(arg%childNodes%nodes)
-    allocate(arg%childNodes%nodes(0))
-    arg%childNodes%length = 0
-    arg%firstChild => null()
-    arg%lastChild => null()
-    np => createTextNode(getOwnerDocument(arg), value)
-    np => appendChild(arg, np)
+    call setTextContent(arg, value)
 
   end subroutine setValue
 

dom/m_dom_common.m4

@@ -17,9 +17,9 @@ TOHW_m_dom_contents(`
   TOHW_subroutine(setData, (arg, data))
     type(Node), pointer :: arg
     character(len=*) :: data
-
-    integer :: n
 
+    integer :: n
+
     if (.not.associated(arg)) then
       TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)
     endif

dom/m_dom_dom.f90

@@ -1057,8 +1057,6 @@ subroutine setNodeValue(arg, nodeValue, ex)
     type(Node), pointer :: arg
     character(len=*) :: nodeValue
 
-    type(Node), pointer :: np
-
     if (.not.associated(arg)) then
       if (getFoX_checks().or.FoX_NODE_IS_NULL<200) then
   call throw_exception(FoX_NODE_IS_NULL, "setNodeValue", ex)
@@ -1090,7 +1088,6 @@ subroutine setNodeValue(arg, nodeValue, ex)
       call setValue(arg, nodeValue)
     case (CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE, TEXT_NODE)
       call setData(arg, nodeValue)
-
     end select
 
   end subroutine setNodeValue
@@ -9611,8 +9608,6 @@ function getValue_DOM(arg, ex)result(c)
     type(Node), pointer :: arg
     character(len=getTextContent_len(arg, associated(arg))) :: c 
 
-    integer :: i, n
-
     if (.not.associated(arg)) then
       if (getFoX_checks().or.FoX_NODE_IS_NULL<200) then
   call throw_exception(FoX_NODE_IS_NULL, "getValue_DOM", ex)
@@ -9649,60 +9644,7 @@ subroutine setValue(arg, value, ex)
     type(Node), pointer :: np
     integer :: i
 
-    if (.not.associated(arg)) then
-      if (getFoX_checks().or.FoX_NODE_IS_NULL<200) then
-  call throw_exception(FoX_NODE_IS_NULL, "setValue", ex)
-  if (present(ex)) then
-    if (inException(ex)) then
-       return
-    endif
-  endif
-endif
-
-    endif
-
-    if (getNodeType(arg)/=ATTRIBUTE_NODE) then
-      if (getFoX_checks().or.FoX_INVALID_NODE<200) then
-  call throw_exception(FoX_INVALID_NODE, "setValue", ex)
-  if (present(ex)) then
-    if (inException(ex)) then
-       return
-    endif
-  endif
-endif
-
-    elseif (arg%readonly) then
-      if (getFoX_checks().or.NO_MODIFICATION_ALLOWED_ERR<200) then
-  call throw_exception(NO_MODIFICATION_ALLOWED_ERR, "setValue", ex)
-  if (present(ex)) then
-    if (inException(ex)) then
-       return
-    endif
-  endif
-endif
-
-    elseif (.not.checkChars(value, getXmlVersionEnum(getOwnerDocument(arg)))) then
-      if (getFoX_checks().or.FoX_INVALID_CHARACTER<200) then
-  call throw_exception(FoX_INVALID_CHARACTER, "setValue", ex)
-  if (present(ex)) then
-    if (inException(ex)) then
-       return
-    endif
-  endif
-endif
-
-    endif
-
-    do i = 1, getLength(getChildNodes(arg))
-      call destroyNode(arg%childNodes%nodes(i)%this)
-    enddo
-    deallocate(arg%childNodes%nodes)
-    allocate(arg%childNodes%nodes(0))
-    arg%childNodes%length = 0
-    arg%firstChild => null()
-    arg%lastChild => null()
-    np => createTextNode(getOwnerDocument(arg), value)
-    np => appendChild(arg, np)
+    call setTextContent(arg, value)
 
   end subroutine setValue
 
@@ -10541,7 +10483,6 @@ subroutine setIsElementContentWhitespace(np, isElementContentWhitespace, ex)
     endif
 
     call updateTextContentLength(np, n)
-
   end subroutine setIsElementContentWhitespace
 
 ! function getWholeText
@@ -10609,9 +10550,9 @@ subroutine setData(arg, data, ex)
     type(DOMException), intent(out), optional :: ex
     type(Node), pointer :: arg
     character(len=*) :: data
-
-    integer :: n
 
+    integer :: n
+
     if (.not.associated(arg)) then
       if (getFoX_checks().or.FoX_NODE_IS_NULL<200) then
   call throw_exception(FoX_NODE_IS_NULL, "setData", ex)

dom/m_dom_node.m4

@@ -83,8 +83,6 @@ TOHW_m_dom_get(DOMString, nodeName, np%nodeName)
     type(Node), pointer :: arg
     character(len=*) :: nodeValue
 
-    type(Node), pointer :: np
-
     if (.not.associated(arg)) then
       TOHW_m_dom_throw_error(FoX_NODE_IS_NULL)
     endif
@@ -100,7 +98,6 @@ TOHW_m_dom_get(DOMString, nodeName, np%nodeName)
       call setValue(arg, nodeValue)
     case (CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE, TEXT_NODE)
       call setData(arg, nodeValue)
-
     end select
 
   end subroutine setNodeValue

dom/m_dom_text.m4

@@ -61,7 +61,6 @@ TOHW_m_dom_get(logical, isElementContentWhitespace, np%ignorableWhitespace, (TEX
     endif
 
     call updateTextContentLength(np, n)
-
   end subroutine setIsElementContentWhitespace
 
 ! function getWholeText

dom/m_dom_utils.f90

@@ -233,7 +233,6 @@ subroutine iter_dmp_xml(xf, arg, ex)
     doneAttributes = .false.
     this => treeroot
     do
-
       if (.not.doneChildren.and..not.(getNodeType(this)==ELEMENT_NODE.and.doneAttributes)) then
     select case(getNodeType(this))
     case (ELEMENT_NODE)
@@ -353,7 +352,7 @@ subroutine iter_dmp_xml(xf, arg, ex)
       if (.not.doneChildren) then
         if (getNodeType(this)==ELEMENT_NODE.and..not.doneAttributes) then
           if (getLength(getAttributes(this))>0) then
-                      this => item(getAttributes(this), 0)
+            this => item(getAttributes(this), 0)
           else
             doneAttributes = .true.
           endif