commit eca82810f0fb81f3e9936d2018347e1e19de513a
author Daniel Veillard <veillard@src.gnome.org> Wed Apr 24 11:42:02 2002 +0000
committer Daniel Veillard <veillard@src.gnome.org> Wed Apr 24 11:42:02 2002 +0000
tree fe1dece611370c141729eeae43b86228cf6186f9
parent 13e04c6c12007d30ae7e007e931e55e717a5a73f

another XPath conformance patch from Richard Jinks Daniel

* test/XPath/expr/floats test/XPath/expr/functions
  result/XPath/expr/floats result/XPath/expr/functions
  xpath.c: another XPath conformance patch from Richard Jinks
Daniel

xpath.c

diff --git a/xpath.c b/xpath.c
index dc303fc..b56c462 100644
--- a/xpath.c
+++ b/xpath.c
@@ -4732,7 +4732,13 @@
 xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt) {
     CAST_TO_NUMBER;
     CHECK_TYPE(XPATH_NUMBER);
-    if (ctxt->value->floatval == 0) {
+    if (xmlXPathIsNaN(ctxt->value->floatval))
+        ctxt->value->floatval=xmlXPathNAN;
+    else if (xmlXPathIsInf(ctxt->value->floatval) == 1)
+        ctxt->value->floatval=xmlXPathNINF;
+    else if (xmlXPathIsInf(ctxt->value->floatval) == -1)
+        ctxt->value->floatval=xmlXPathPINF;
+    else if (ctxt->value->floatval == 0) {
         if (xmlXPathGetSign(ctxt->value->floatval) == 0)
 	    ctxt->value->floatval = xmlXPathNZERO;
 	else
@@ -4835,7 +4841,9 @@
 
     CAST_TO_NUMBER;
     CHECK_TYPE(XPATH_NUMBER);
-    if (val == 0 && xmlXPathGetSign(val) != 0) {
+    if (xmlXPathIsNaN(val) || xmlXPathIsNaN(ctxt->value->floatval))
+	ctxt->value->floatval = xmlXPathNAN;
+    else if (val == 0 && xmlXPathGetSign(val) != 0) {
 	if (ctxt->value->floatval == 0)
 	    ctxt->value->floatval = xmlXPathNAN;
 	else if (ctxt->value->floatval > 0)
@@ -7045,7 +7053,7 @@
     unsigned long tmp = 0;
     double temp;
 #endif
-    
+    if (cur == NULL) return(0);
     while (IS_BLANK(*cur)) cur++;
     if ((*cur != '.') && ((*cur < '0') || (*cur > '9')) && (*cur != '-')) {
         return(xmlXPathNAN);