lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-30 22:43:14 +03:00
Code Activity

another patch from Richard Jinks for substring conformance update of the

Browse Source 
* xpath.c: another patch from Richard Jinks for substring conformance
* test/XPath/expr/floats test/XPath/expr/strings
  result/XPath/expr/floats result/XPath/expr/strings: update of the
  test suite to check those.
Daniel
This commit is contained in:
Daniel Veillard
2002-04-10 16:14:34 +00:00
parent 01917aa1cb
commit 0eafdef988
6 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Apr 10 18:12:52 CEST 2002 Daniel Veillard <daniel@veillard.com>
* xpath.c: another patch from Richard Jinks for substring conformance
* test/XPath/expr/floats test/XPath/expr/strings
result/XPath/expr/floats result/XPath/expr/strings: update of the
test suite to check those.
Wed Apr 10 13:29:49 CEST 2002 Daniel Veillard <daniel@veillard.com>
* xpath.c: patch from Richard Jinks for .x float parsing.

8
result/XPath/expr/floats
View File

@ -15,6 +15,14 @@ Object is a number : 1.23
Expression: 0.123
Object is a number : 0.123
========================
Expression: 4.
Object is a number : 4
========================
Expression: .4
Object is a number : 0.4
========================
Expression: 1.23e3
Object is a number : 1230

16
result/XPath/expr/strings
View File

@ -75,6 +75,22 @@ Object is a string : 234
Expression: substring("12345",0,3)
Object is a string : 12
========================
Expression: substring("12345", 0 div 0, 3)
Object is a string :
========================
Expression: substring("12345", 1, 0 div 0)
Object is a string :
========================
Expression: substring("12345", -42, 1 div 0)
Object is a string : 12345
========================
Expression: substring("12345", -1 div 0, 1 div 0)
Object is a string :
========================
Expression: string-length("")
Object is a number : 0

2
test/XPath/expr/floats
View File

@ -2,6 +2,8 @@
123
1.23
0.123
4.
.4
1.23e3
1.23e-3
1 div 0

4
test/XPath/expr/strings
View File

@ -17,5 +17,9 @@ substring("12345",2,3)
substring("12345",2)
substring("12345",1.5,2.6)
substring("12345",0,3)
substring("12345", 0 div 0, 3)
substring("12345", 1, 0 div 0)
substring("12345", -42, 1 div 0)
substring("12345", -1 div 0, 1 div 0)
string-length("")
string-length("titi")

54
xpath.c
View File

@ -6152,34 +6152,44 @@ xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs) {
if (nargs != 3)
le = m;
/*
* To meet our requirements, initial index calculations
* must be done before we convert to integer format
*
* First we normalize indices
/* Need to check for the special cases where either
* the index is NaN, the length is NaN, or both
* arguments are infinity (relying on Inf + -Inf = NaN)
*/
in -= 1.0;
le += in;
if (in < 0.0)
in = 0.0;
if (le > (double)m)
le = (double)m;
if (!xmlXPathIsNaN(in + le)) {
/*
* To meet our requirements, initial index calculations
* must be done before we convert to integer format
*
* First we normalize indices
*/
in -= 1.0;
le += in;
if (in < 0.0)
in = 0.0;
if (le > (double)m)
le = (double)m;
/*
* Now we go to integer form, rounding up
*/
i = (int) in;
if (((double)i) != in) i++;
/*
* Now we go to integer form, rounding up
*/
i = (int) in;
if (((double)i) != in) i++;
l = (int) le;
if (((double)l) != le) l++;
l = (int) le;
if (((double)l) != le) l++;
if (l > m) l=m;
if (l > m) l=m;
/* number of chars to copy */
l -= i;
/* number of chars to copy */
l -= i;
ret = xmlUTF8Strsub(str->stringval, i, l);
}
else {
ret = NULL;
}
ret = xmlUTF8Strsub(str->stringval, i, l);
if (ret == NULL)
valuePush(ctxt, xmlXPathNewCString(""));
else {