[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdom/xpath
From:       Frans Englich <frans.englich () telia ! com>
Date:       2005-09-01 13:24:45
Message-ID: 1125581085.328182.11130.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 455820 by englich:

Adjustings; remove whitespace handling code since it's done by the WXS whitespace \
facets. No error handling yet.


 M  +1 -20     data/Base64Binary.cpp  
 M  +1 -0      tests/data/casting.xml  
 M  +24 -1     tests/data/expressions.xml  


--- branches/work/kdom/xpath/data/Base64Binary.cpp #455819:455820
@@ -84,28 +84,9 @@
 	unsigned int len = in.size(), tail = len;
 	const char* data = in.data();
 
-	// Deal with possible *nix "BEGIN" marker!!
-	while(count < len && (data[count] == '\n' || data[count] == '\r' ||
-		  data[count] == '\t' || data[count] == ' '))
-		count++;
-
-	if(strncasecmp(data+count, "begin", 5) == 0)
-	{
-		count += 5;
-		while(count < len && data[count] != '\n' && data[count] != '\r')
-			count++;
-
-		while(count < len && (data[count] == '\n' || data[count] == '\r'))
-			count ++;
-
-		data += count;
-		tail = (len -= count);
-	}
-
 	// Find the tail end of the actual encoded data even if
 	// there is/are trailing CR and/or LF.
-	while(data[tail-1] == '=' || data[tail-1] == '\n' ||
-		  data[tail-1] == '\r')
+	while(data[tail-1] == '=')
 	{
 		if(data[--tail] != '=')
 			len = tail;
--- branches/work/kdom/xpath/tests/data/casting.xml #455819:455820
@@ -212,6 +212,7 @@
 	<expression type="ebv">xs:string(xs:base64Binary(xs:hexBinary("ffff"))) eq \
"//8="</expression>  <expression \
type="ebv">xs:string(xs:base64Binary(xs:hexBinary("ffff34564321deac9876")))  eq \
"//80VkMh3qyYdg=="</expression> +		<expression \
type="ebv">xs:string(xs:base64Binary("F===")) eq "FA=="</expression>  <!-- TODO many \
tests missing -->  
 </collection>
--- branches/work/kdom/xpath/tests/data/expressions.xml #455819:455820
@@ -3,6 +3,29 @@
 
 	<collection>
 
+	<expression type="fail-statically">xs:base64Binary()</expression>
+	<expression type="fail-statically">xs:base64Binary("aaaa", "FF")</expression>
+	<expression type="ebv">xs:base64Binary(xs:hexBinary("03"))
+			eq xs:base64Binary(xs:hexBinary("03"))</expression>
+	<expression type="ebv">xs:base64Binary(xs:hexBinary("03"))
+			ne xs:base64Binary(xs:hexBinary("13"))</expression>
+	<expression type="ebv">count(xs:base64Binary(xs:base64Binary(xs:hexBinary("03")))) \
eq 1</expression> +	<expression \
type="ebv">xs:string(xs:base64Binary(xs:hexBinary("03"))) eq "Aw=="</expression> \
+	<expression type="ebv">xs:string(xs:base64Binary("0A044c7F")) eq \
"0A044c7F"</expression> +	<expression \
type="ebv">xs:string(xs:base64Binary(xs:hexBinary("0f3c"))) eq "Dzw="</expression> \
+	<expression type="ebv">xs:string(xs:base64Binary(xs:hexBinary("12"))) eq \
"Eg=="</expression> +	<expression \
type="ebv">xs:string(xs:base64Binary(xs:hexBinary("f0"))) eq "8A=="</expression> \
+	<expression type="ebv">xs:string(xs:base64Binary(xs:hexBinary("ffff"))) eq \
"//8="</expression> +	<expression \
type="ebv">xs:string(xs:base64Binary(xs:hexBinary("ffff34564321deac9876"))) +	        \
eq "//80VkMh3qyYdg=="</expression> +	<expression \
type="fail-statically">xs:string(xs:base64Binary("aaaa===="))</expression> \
+	<expression type="fail-statically">xs:string(xs:base64Binary("aaaabcd"))</expression>
 +	<expression type="fail-statically">xs:string(xs:base64Binary("aaaabcd|"))</expression>
 +	<expression type="fail-statically">xs:string(xs:base64Binary("F==="))</expression>
+	<expression type="ebv">xs:string(xs:base64Binary("0w==")) eq "0w=="</expression>
+	<expression type="ebv">xs:string(xs:base64Binary(xs:hexBinary("F43D1234ce8f")))
+			eq "9D0SNM6P"</expression>
+
 	<!-- Crashes; problem in their iterators.
 	<expression type="ebv">count(reverse((1, 2, 3))) eq 3</expression>
 	<expression type="ebv">exists(reverse((1, 2, 3)))</expression>
@@ -11,6 +34,7 @@
 	</collection>
 
 	<!-- Alphabetical order -->
+	<!--
 	<xi:include href="arithmetics-numbers.xml"/>
 	<xi:include href="castableas.xml"/>
 	<xi:include href="casting.xml"/>
@@ -37,7 +61,6 @@
 	<xi:include href="treatas.xml"/>
 	<xi:include href="typechecking.xml"/>
 
-	<!--
 	Contains tests related to parsing/tokenization. But because
 	of typeChecking/compression these also happens to be evaluated
 	and that's not feasable right now.


[prev in list] [next in list] [prev in thread] [next in thread]