zorba-coders team mailing list archive

[Juan Zacarias <juan457@xxxxxxxxx>]

Juan Zacarias has proposed merging lp:~zorba-coders/zorba/bug1068240 into lp:zorba.

Commit message:
 Changed DynamicContext function addExternalFunctionParameter to const

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #855925 in Zorba: "C++ API, DynamicContext is passed as a const argument to the function's evaluate method"
  https://bugs.launchpad.net/zorba/+bug/855925
  Bug #1068240 in Zorba: "make addExternalFunctionParameter const"
  https://bugs.launchpad.net/zorba/+bug/1068240

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861

 Changed DynamicContext function addExternalFunctionParameter to const
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h	2012-10-08 12:09:36 +0000
+++ include/zorba/dynamic_context.h	2012-10-22 17:16:25 +0000
@@ -284,7 +284,7 @@
    *  false otherwise.
    */
   virtual bool
-  addExternalFunctionParameter ( const String& aName, ExternalFunctionParameter* aParam ) = 0;
+  addExternalFunctionParameter ( const String& aName, ExternalFunctionParameter* aParam ) const = 0;
 
   /** \brief Get the value of a pair that was registered using
    *         the addExternalFunctionParam method. This can

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2012-10-08 12:09:36 +0000
+++ src/api/dynamiccontextimpl.cpp	2012-10-22 17:16:25 +0000
@@ -715,7 +715,7 @@
 bool
 DynamicContextImpl::addExternalFunctionParameter (
     const String& aName,
-    ExternalFunctionParameter* aValue )
+    ExternalFunctionParameter* aValue ) const
 {
   ZORBA_DCTX_TRY
   {

=== modified file 'src/api/dynamiccontextimpl.h'
--- src/api/dynamiccontextimpl.h	2012-10-08 12:09:36 +0000
+++ src/api/dynamiccontextimpl.h	2012-10-22 17:16:25 +0000
@@ -151,7 +151,7 @@
   getExternalFunctionParam(const String& aName, void*&) const;
 
   virtual bool
-  addExternalFunctionParameter(const String& aName, ExternalFunctionParameter* aParam);
+  addExternalFunctionParameter(const String& aName, ExternalFunctionParameter* aParam) const;
 
   virtual ExternalFunctionParameter*
   getExternalFunctionParameter(const String& aName) const;

=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp	2012-09-19 21:16:15 +0000
+++ src/context/dynamic_context.cpp	2012-10-22 17:16:25 +0000
@@ -891,7 +891,7 @@
 ********************************************************************************/
 bool dynamic_context::addExternalFunctionParameter(
    const std::string& aName,
-   ExternalFunctionParameter* aValue)
+   ExternalFunctionParameter* aValue) const
 {
   if (!keymap)
   {

=== modified file 'src/context/dynamic_context.h'
--- src/context/dynamic_context.h	2012-10-19 20:42:38 +0000
+++ src/context/dynamic_context.h	2012-10-22 17:16:25 +0000
@@ -129,7 +129,7 @@
 
   std::vector<VarValue>        theVarValues;
 
-  ValueMap                   * keymap;
+  mutable ValueMap                   * keymap;
 
   IndexMap                   * theAvailableIndices;
 
@@ -241,7 +241,7 @@
 
   bool addExternalFunctionParameter(
      const std::string& aName,
-     ExternalFunctionParameter* aValue);
+     ExternalFunctionParameter* aValue) const;
 
   ExternalFunctionParameter* getExternalFunctionParameter(
       const std::string& aName) const;