From 9b743b4386ef9aa27f635bd01899ed54fe7a6dc7 Mon Sep 17 00:00:00 2001
From: jez_higgins <>
Date: Wed, 17 Aug 2005 10:19:19 +0000
Subject: [PATCH] *** empty log message ***

---
 XPath/XPath.hpp                |  2 +-
 test/XPath/arithmetic_test.cpp | 50 +++++++++++++++++-----------------
 test/XPath/execute_test.cpp    |  2 +-
 test/XPath/relational_test.cpp |  8 +++---
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/XPath/XPath.hpp b/XPath/XPath.hpp
index b83813e1..94471b16 100644
--- a/XPath/XPath.hpp
+++ b/XPath/XPath.hpp
@@ -16,7 +16,7 @@ DONE - xpath_ast.hpp
 DONE - xpath_ast_ids.hpp
 xpath_axis_enumerator.hpp
 DONE - xpath_compile_context.hpp
-xpath_execution_context.hpp
+DONE - xpath_execution_context.hpp
 xpath_expression.hpp
 xpath_function.hpp
 xpath_function_holder.hpp
diff --git a/test/XPath/arithmetic_test.cpp b/test/XPath/arithmetic_test.cpp
index 646368d3..840acfee 100644
--- a/test/XPath/arithmetic_test.cpp
+++ b/test/XPath/arithmetic_test.cpp
@@ -22,8 +22,8 @@ public:
 
   void test1()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(1);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(1);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> add(new PlusOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
     assertEquals(1, add.use_count());
@@ -37,8 +37,8 @@ public:
 
   void test2()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(1);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(1);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> minus(new MinusOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -47,8 +47,8 @@ public:
 
   void test3()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(3);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(3);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> mult(new MultiplyOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -57,7 +57,7 @@ public:
 
   void test4()
   {
-    XPathExpression<std::string>* mult = new MultiplyOperator<std::string, Arabica::default_string_adaptor<std::string> >(new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(4), new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2));
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* mult = new MultiplyOperator<std::string, Arabica::default_string_adaptor<std::string> >(new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(4), new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2));
 
     XPathExpressionPtr<std::string> minus(new MinusOperator<std::string, Arabica::default_string_adaptor<std::string> >(mult, new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2)));
 
@@ -67,8 +67,8 @@ public:
 
   void test5()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(12);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(12);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> div(new DivideOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -77,8 +77,8 @@ public:
 
   void test6()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(12);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(12);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> mod(new ModOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -87,8 +87,8 @@ public:
 
   void test7()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(11);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(11);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> div(new DivideOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -97,8 +97,8 @@ public:
 
   void test8()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(11);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(4);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(11);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(4);
 
     XPathExpressionPtr<std::string> mod(new ModOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -107,8 +107,8 @@ public:
 
   void test9()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(5);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(5);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> mod(new ModOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -117,8 +117,8 @@ public:
 
   void test10()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(5);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(5);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-2);
 
     XPathExpressionPtr<std::string> mod(new ModOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -127,8 +127,8 @@ public:
 
   void test11()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-5);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-5);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(2);
 
     XPathExpressionPtr<std::string> mod(new ModOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -137,8 +137,8 @@ public:
 
   void test12()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-5);
-    XPathExpression<std::string>* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-2);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-5);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-2);
 
     XPathExpressionPtr<std::string> mod(new ModOperator<std::string, Arabica::default_string_adaptor<std::string> >(p1, p2));
 
@@ -147,7 +147,7 @@ public:
 
   void test13()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(5);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(5);
     XPathExpressionPtr<std::string> p2(new UnaryNegative<std::string, Arabica::default_string_adaptor<std::string> >(p1));
 
     assertEquals(-5.0, p2->evaluateAsNumber(dummy_), 0.0);
@@ -155,7 +155,7 @@ public:
 
   void test14()
   {
-    XPathExpression<std::string>* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-5);
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new NumericValue<std::string, Arabica::default_string_adaptor<std::string> >(-5);
     XPathExpressionPtr<std::string> p2(new UnaryNegative<std::string, Arabica::default_string_adaptor<std::string> >(p1));
 
     assertEquals(5.0, p2->evaluateAsNumber(dummy_), 0.0);
diff --git a/test/XPath/execute_test.cpp b/test/XPath/execute_test.cpp
index 8433c8f4..6c0d838e 100644
--- a/test/XPath/execute_test.cpp
+++ b/test/XPath/execute_test.cpp
@@ -59,7 +59,7 @@ public:
       XPathFunction(0, 0, args) { }
 
   virtual XPathValue<std::string>* evaluate(const DOM::Node<std::string>& context, 
-                                            const ExecutionContext& executionContext) const
+                                            const ExecutionContext<std::string, Arabica::default_string_adaptor<std::string> >& executionContext) const
   {
     return new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("test-" + context.getLocalName());
   } // evaluate
diff --git a/test/XPath/relational_test.cpp b/test/XPath/relational_test.cpp
index 3d9ea2ac..7087fb01 100644
--- a/test/XPath/relational_test.cpp
+++ b/test/XPath/relational_test.cpp
@@ -47,8 +47,8 @@ public:
 
   void test4()
   {
-    XPathExpression<std::string>* p1 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("charlie");
-    XPathExpression<std::string>* p2 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("charlie");
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("charlie");
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("charlie");
 
     XPathExpressionPtr<std::string> equals1(new EqualsOperator(p1, p2));
 
@@ -57,8 +57,8 @@ public:
 
   void test5()
   {
-    XPathExpression<std::string>* p1 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("trousers");
-    XPathExpression<std::string>* p2 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("charlie");
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p1 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("trousers");
+    XPathExpression<std::string, Arabica::default_string_adaptor<std::string> >* p2 = new StringValue<std::string, Arabica::default_string_adaptor<std::string> >("charlie");
 
     XPathExpressionPtr<std::string> equals1(new EqualsOperator(p1, p2));