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

List:       kde-commits
Subject:    branches/work/kdom/xpath/functions
From:       Frans Englich <frans.englich () telia ! com>
Date:       2005-09-22 19:27:20
Message-ID: 1127417240.443812.11252.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 463036 by englich:

So... the previous commit broke 164 unit tests because I decided to spend time \
writing a test suite to then not use it.


 M  +8 -0      XPath10CoreFunctions.cpp  
 M  +6 -5      XPath20CoreFunctions.cpp  
 M  +0 -4      XPath20CoreFunctions.h  


--- branches/work/kdom/xpath/functions/XPath10CoreFunctions.cpp #463035:463036
@@ -111,6 +111,11 @@
 	addFunction("normalize-space", 0, 1, CommonSequenceTypes::ExactlyOneString);
 	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneString);
 
+	addFunction("compare", 2, 3, CommonSequenceTypes::ZeroOrOneInteger);
+	s->appendArgument("comparand1", CommonSequenceTypes::ZeroOrOneString);
+	s->appendArgument("comparand2", CommonSequenceTypes::ZeroOrOneString);
+	s->appendArgument("collation", CommonSequenceTypes::ExactlyOneString);
+
 	addFunction("contains", 2, 3, CommonSequenceTypes::ExactlyOneBoolean);
 	s->appendArgument("arg1", CommonSequenceTypes::ZeroOrOneString);
 	s->appendArgument("arg2", CommonSequenceTypes::ZeroOrOneString);
@@ -153,6 +158,9 @@
 	s->appendArgument("testLang", CommonSequenceTypes::ZeroOrOneString);
 	s->appendArgument("node", CommonSequenceTypes::ExactlyOneNode);
 
+	addFunction("node-name", 1, 1, CommonSequenceTypes::ZeroOrOneNode);
+	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneQName);
+
 	addFunction("translate", 3, 3, CommonSequenceTypes::ExactlyOneString);
 	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneString);
 	s->appendArgument("mapString", CommonSequenceTypes::ExactlyOneString);
--- branches/work/kdom/xpath/functions/XPath20CoreFunctions.cpp #463035:463036
@@ -151,6 +151,12 @@
 	addFunction("nilled", 1, 1, CommonSequenceTypes::ZeroOrOneBoolean);
 	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneNode);
 
+	addFunction("lower-case", 1, 1, CommonSequenceTypes::ExactlyOneString);
+	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneString);
+
+	addFunction("upper-case", 1, 1, CommonSequenceTypes::ExactlyOneString);
+	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneString);
+
 	addPropFunction("base-uri", 0, 1, CommonSequenceTypes::ZeroOrOneAnyURI,
 					Expression::UseContextItem);
 	s->appendArgument("arg", CommonSequenceTypes::ZeroOrOneNode);
@@ -162,11 +168,6 @@
 	s->appendArgument("comparand1", CommonSequenceTypes::ZeroOrOneString);
 	s->appendArgument("comparand2", CommonSequenceTypes::ZeroOrOneString);
 
-	addFunction("compare", 2, 3, CommonSequenceTypes::ZeroOrOneInteger);
-	s->appendArgument("comparand1", CommonSequenceTypes::ZeroOrOneString);
-	s->appendArgument("comparand2", CommonSequenceTypes::ZeroOrOneString);
-	s->appendArgument("collation", CommonSequenceTypes::ExactlyOneString);
-
 	addFunction("remove", 2, 2, CommonSequenceTypes::ZeroOrMoreItems);
 	s->appendArgument("target", CommonSequenceTypes::ZeroOrMoreItems);
 	s->appendArgument("position", CommonSequenceTypes::ExactlyOneInteger);
--- branches/work/kdom/xpath/functions/XPath20CoreFunctions.h #463035:463036
@@ -54,10 +54,6 @@
 		virtual Expression::Ptr retrieveExpression(const KDOM::DOMString &ln,
 												   const Expression::List &args,
 												   const FunctionSignature::Ptr &sign) const;
-
-	protected:
-		FunctionSignature::Hash m_signatures;
-
 	};
 };
 #endif


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