[Oorexx-svn] SF.net SVN: oorexx:[3477] main/trunk/interpreter/execution

[<bi...@us...>]

Revision: 3477
          http://oorexx.svn.sourceforge.net/oorexx/?rev=3477&view=rev
Author:   bigrixx
Date:     2008-10-07 21:06:51 +0000 (Tue, 07 Oct 2008)

Log Message:
-----------
[ 2152197 ] RexxvariablePool Returns RXSHV_NOAVL

Modified Paths:
--------------
    main/trunk/interpreter/execution/RexxNativeActivation.cpp
    main/trunk/interpreter/execution/RexxNativeActivation.hpp

Modified: main/trunk/interpreter/execution/RexxNativeActivation.cpp
===================================================================
--- main/trunk/interpreter/execution/RexxNativeActivation.cpp	2008-10-07 21:05:14 UTC (rev 3476)
+++ main/trunk/interpreter/execution/RexxNativeActivation.cpp	2008-10-07 21:06:51 UTC (rev 3477)
@@ -1301,6 +1301,7 @@
     trapErrors = true;                       // we trap error conditions now
     try
     {
+        enableVariablepool();                // enable the variable pool interface here
         activity->releaseAccess();           /* force this to "safe" mode         */
                                              /* process the method call           */
         (*methp)((RexxCallContext *)&context, arguments);
@@ -1321,6 +1322,7 @@
     }
 
     trapErrors = false;        // no more error trapping
+    disableVariablepool();                // disable the variable pool from here
     // belt and braces...this restores the activity level to whatever
     // level we had when we made the callout.
     this->activity->restoreActivationLevel(activityLevel);
@@ -2518,6 +2520,7 @@
 /* Function:  Retriev a list of all variables in the current context.         */
 /******************************************************************************/
 {
+    this->resetNext();               // all next operations must be reset
     return activation->getAllLocalVariables();
 }
 

Modified: main/trunk/interpreter/execution/RexxNativeActivation.hpp
===================================================================
--- main/trunk/interpreter/execution/RexxNativeActivation.hpp	2008-10-07 21:05:14 UTC (rev 3476)
+++ main/trunk/interpreter/execution/RexxNativeActivation.hpp	2008-10-07 21:06:51 UTC (rev 3477)
@@ -114,7 +114,7 @@
   inline void   termination() { this->guardOff();}
 
   void   accessCallerContext();
-  inline char        getVpavailable()   {return this->vpavailable;}
+  inline bool        getVpavailable()   {return this->vpavailable;}
   inline RexxString *getMessageName()   {return this->msgname;}
   inline size_t      nextVariable()     {return this->nextvariable;}
   inline RexxStem   *nextStem()         {return this->nextstem;}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.