Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx-code-0:[10321] sandbox/rick/newsource
|
From: <bi...@us...> - 2014-07-22 16:41:47
|
Revision: 10321
http://sourceforge.net/p/oorexx/code-0/10321
Author: bigrixx
Date: 2014-07-22 16:41:31 +0000 (Tue, 22 Jul 2014)
Log Message:
-----------
good place for a checkin
Modified Paths:
--------------
sandbox/rick/newsource/CMakeLists.txt
sandbox/rick/newsource/interpreter/api/CallContextStubs.cpp
sandbox/rick/newsource/interpreter/api/ContextApi.hpp
sandbox/rick/newsource/interpreter/api/InterpreterAPI.cpp
sandbox/rick/newsource/interpreter/api/MethodContextStubs.cpp
sandbox/rick/newsource/interpreter/api/ThreadContextStubs.cpp
sandbox/rick/newsource/interpreter/behaviour/MethodDictionary.cpp
sandbox/rick/newsource/interpreter/behaviour/PrimitiveClasses.xml
sandbox/rick/newsource/interpreter/behaviour/VirtualFunctionTable.cpp
sandbox/rick/newsource/interpreter/classes/ArrayClass.cpp
sandbox/rick/newsource/interpreter/classes/BufferClass.cpp
sandbox/rick/newsource/interpreter/classes/ClassClass.cpp
sandbox/rick/newsource/interpreter/classes/IntegerClass.cpp
sandbox/rick/newsource/interpreter/classes/IntegerClass.hpp
sandbox/rick/newsource/interpreter/classes/ListClass.hpp
sandbox/rick/newsource/interpreter/classes/MessageClass.cpp
sandbox/rick/newsource/interpreter/classes/MessageClass.hpp
sandbox/rick/newsource/interpreter/classes/MethodClass.cpp
sandbox/rick/newsource/interpreter/classes/MethodClass.hpp
sandbox/rick/newsource/interpreter/classes/NumberStringClass.cpp
sandbox/rick/newsource/interpreter/classes/NumberStringClass.hpp
sandbox/rick/newsource/interpreter/classes/NumberStringMath.cpp
sandbox/rick/newsource/interpreter/classes/NumberStringMath2.cpp
sandbox/rick/newsource/interpreter/classes/ObjectClass.cpp
sandbox/rick/newsource/interpreter/classes/ObjectClass.hpp
sandbox/rick/newsource/interpreter/classes/PackageClass.cpp
sandbox/rick/newsource/interpreter/classes/RoutineClass.cpp
sandbox/rick/newsource/interpreter/classes/RoutineClass.hpp
sandbox/rick/newsource/interpreter/classes/StemClass.cpp
sandbox/rick/newsource/interpreter/classes/StemClass.hpp
sandbox/rick/newsource/interpreter/classes/StringClass.cpp
sandbox/rick/newsource/interpreter/classes/StringClass.hpp
sandbox/rick/newsource/interpreter/classes/support/CompoundTableElement.cpp
sandbox/rick/newsource/interpreter/classes/support/CompoundVariableTable.hpp
sandbox/rick/newsource/interpreter/classes/support/CompoundVariableTail.cpp
sandbox/rick/newsource/interpreter/classes/support/CompoundVariableTail.hpp
sandbox/rick/newsource/interpreter/classes/support/HashCollection.cpp
sandbox/rick/newsource/interpreter/classes/support/HashCollection.hpp
sandbox/rick/newsource/interpreter/classes/support/HashContents.hpp
sandbox/rick/newsource/interpreter/concurrency/ActivationApiContexts.hpp
sandbox/rick/newsource/interpreter/concurrency/ActivationFrame.cpp
sandbox/rick/newsource/interpreter/concurrency/ActivationFrame.hpp
sandbox/rick/newsource/interpreter/concurrency/ActivityDispatcher.cpp
sandbox/rick/newsource/interpreter/concurrency/ActivityDispatcher.hpp
sandbox/rick/newsource/interpreter/concurrency/ActivityManager.cpp
sandbox/rick/newsource/interpreter/concurrency/ActivityManager.hpp
sandbox/rick/newsource/interpreter/concurrency/CallbackDispatcher.cpp
sandbox/rick/newsource/interpreter/concurrency/CallbackDispatcher.hpp
sandbox/rick/newsource/interpreter/concurrency/CommandHandler.cpp
sandbox/rick/newsource/interpreter/concurrency/CommandHandler.hpp
sandbox/rick/newsource/interpreter/concurrency/ExitHandler.cpp
sandbox/rick/newsource/interpreter/concurrency/ExitHandler.hpp
sandbox/rick/newsource/interpreter/concurrency/MessageDispatcher.cpp
sandbox/rick/newsource/interpreter/concurrency/RexxStartDispatcher.cpp
sandbox/rick/newsource/interpreter/concurrency/TranslateDispatcher.cpp
sandbox/rick/newsource/interpreter/concurrency/TrappingDispatcher.cpp
sandbox/rick/newsource/interpreter/concurrency/TrappingDispatcher.hpp
sandbox/rick/newsource/interpreter/execution/BaseCode.cpp
sandbox/rick/newsource/interpreter/execution/BaseCode.hpp
sandbox/rick/newsource/interpreter/execution/CPPCode.cpp
sandbox/rick/newsource/interpreter/execution/CPPCode.hpp
sandbox/rick/newsource/interpreter/execution/RexxActivation.cpp
sandbox/rick/newsource/interpreter/execution/RexxActivation.hpp
sandbox/rick/newsource/interpreter/execution/RexxCode.cpp
sandbox/rick/newsource/interpreter/execution/RexxCode.hpp
sandbox/rick/newsource/interpreter/execution/RexxLocalVariables.cpp
sandbox/rick/newsource/interpreter/execution/RexxLocalVariables.hpp
sandbox/rick/newsource/interpreter/execution/RexxVariable.cpp
sandbox/rick/newsource/interpreter/execution/RexxVariable.hpp
sandbox/rick/newsource/interpreter/execution/SecurityManager.cpp
sandbox/rick/newsource/interpreter/execution/SecurityManager.hpp
sandbox/rick/newsource/interpreter/expression/BuiltinFunctions.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionBaseVariable.hpp
sandbox/rick/newsource/interpreter/expression/ExpressionCompoundVariable.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionCompoundVariable.hpp
sandbox/rick/newsource/interpreter/expression/ExpressionFunction.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionLogical.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionStack.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionStack.hpp
sandbox/rick/newsource/interpreter/expression/ExpressionStem.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionStem.hpp
sandbox/rick/newsource/interpreter/expression/ExpressionVariable.cpp
sandbox/rick/newsource/interpreter/expression/ExpressionVariable.hpp
sandbox/rick/newsource/interpreter/expression/IndirectVariableReference.cpp
sandbox/rick/newsource/interpreter/expression/IndirectVariableReference.hpp
sandbox/rick/newsource/interpreter/instructions/CallInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/DropInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/ForwardInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/GuardInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/MessageInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/ParseInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/QueueInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/SayInstruction.cpp
sandbox/rick/newsource/interpreter/instructions/SelectInstruction.cpp
sandbox/rick/newsource/interpreter/memory/ProtectedObject.hpp
sandbox/rick/newsource/interpreter/memory/RexxMemory.cpp
sandbox/rick/newsource/interpreter/memory/RexxMemory.hpp
sandbox/rick/newsource/interpreter/memory/Setup.cpp
sandbox/rick/newsource/interpreter/memory/UninitDispatcher.cpp
sandbox/rick/newsource/interpreter/memory/UninitDispatcher.hpp
sandbox/rick/newsource/interpreter/package/LibraryPackage.cpp
sandbox/rick/newsource/interpreter/package/LibraryPackage.hpp
sandbox/rick/newsource/interpreter/package/PackageManager.cpp
sandbox/rick/newsource/interpreter/package/PackageManager.hpp
sandbox/rick/newsource/interpreter/parser/DirectiveParser.cpp
sandbox/rick/newsource/interpreter/parser/LanguageParser.cpp
sandbox/rick/newsource/interpreter/parser/LanguageParser.hpp
sandbox/rick/newsource/interpreter/parser/SourceFile.cpp
sandbox/rick/newsource/interpreter/parser/SourceFile.hpp
sandbox/rick/newsource/interpreter/platform/unix/ExternalFunctions.cpp
sandbox/rick/newsource/interpreter/platform/unix/MiscSystem.cpp
sandbox/rick/newsource/interpreter/platform/unix/RexxMain.cpp
sandbox/rick/newsource/interpreter/platform/unix/SysActivity.cpp
sandbox/rick/newsource/interpreter/platform/unix/SysActivity.hpp
sandbox/rick/newsource/interpreter/platform/unix/SystemCommands.cpp
sandbox/rick/newsource/interpreter/platform/unix/SystemInterpreter.hpp
sandbox/rick/newsource/interpreter/platform/windows/ExternalFunctions.cpp
sandbox/rick/newsource/interpreter/platform/windows/MiscSystem.cpp
sandbox/rick/newsource/interpreter/platform/windows/SysActivity.cpp
sandbox/rick/newsource/interpreter/platform/windows/SysActivity.hpp
sandbox/rick/newsource/interpreter/platform/windows/SystemCommands.cpp
sandbox/rick/newsource/interpreter/platform/windows/SystemInterpreter.hpp
sandbox/rick/newsource/interpreter/runtime/Interpreter.cpp
sandbox/rick/newsource/interpreter/runtime/Interpreter.hpp
sandbox/rick/newsource/interpreter/runtime/InterpreterInstance.cpp
sandbox/rick/newsource/interpreter/runtime/InterpreterInstance.hpp
sandbox/rick/newsource/interpreter/runtime/RexxCore.h
sandbox/rick/newsource/interpreter/runtime/RexxMisc.cpp
Added Paths:
-----------
sandbox/rick/newsource/interpreter/concurrency/Activity.cpp
sandbox/rick/newsource/interpreter/concurrency/Activity.hpp
sandbox/rick/newsource/interpreter/execution/NativeActivaton.cpp
sandbox/rick/newsource/interpreter/execution/NativeActivaton.hpp
sandbox/rick/newsource/interpreter/execution/NativeCode.cpp
sandbox/rick/newsource/interpreter/execution/NativeCode.hpp
sandbox/rick/newsource/interpreter/execution/VariableDictionary.cpp
sandbox/rick/newsource/interpreter/execution/VariableDictionary.hpp
Removed Paths:
-------------
sandbox/rick/newsource/interpreter/classes/support/RexxCollection.cpp
sandbox/rick/newsource/interpreter/classes/support/RexxCollection.hpp
sandbox/rick/newsource/interpreter/concurrency/RexxActivity.cpp
sandbox/rick/newsource/interpreter/concurrency/RexxActivity.hpp
sandbox/rick/newsource/interpreter/execution/RexxNativeActivation.cpp
sandbox/rick/newsource/interpreter/execution/RexxNativeActivation.hpp
sandbox/rick/newsource/interpreter/execution/RexxNativeCode.cpp
sandbox/rick/newsource/interpreter/execution/RexxNativeCode.hpp
sandbox/rick/newsource/interpreter/execution/RexxVariableDictionary.cpp
sandbox/rick/newsource/interpreter/execution/RexxVariableDictionary.hpp
Modified: sandbox/rick/newsource/CMakeLists.txt
===================================================================
--- sandbox/rick/newsource/CMakeLists.txt 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/CMakeLists.txt 2014-07-22 16:41:31 UTC (rev 10321)
@@ -554,10 +554,10 @@
${build_execution_dir}/BaseCode.cpp
${build_execution_dir}/RexxCode.cpp
${build_execution_dir}/RexxLocalVariables.cpp
- ${build_execution_dir}/RexxNativeActivation.cpp
- ${build_execution_dir}/RexxNativeCode.cpp
+ ${build_execution_dir}/NativeActivation.cpp
+ ${build_execution_dir}/NativeCode.cpp
${build_execution_dir}/RexxVariable.cpp
- ${build_execution_dir}/RexxVariableDictionary.cpp
+ ${build_execution_dir}/VariableDictionary.cpp
${build_execution_dir}/SecurityManager.cpp)
set (behaviour_sources ${build_behaviour_dir}/PrimitiveBehaviours.cpp
${build_behaviour_dir}/RexxBehaviour.cpp
@@ -571,7 +571,7 @@
${build_concurrency_dir}/ExitHandler.cpp
${build_concurrency_dir}/CommandHandler.cpp
${build_concurrency_dir}/MessageDispatcher.cpp
- ${build_concurrency_dir}/RexxActivity.cpp
+ ${build_concurrency_dir}/Activity.cpp
${build_concurrency_dir}/RexxStartDispatcher.cpp
${build_concurrency_dir}/TranslateDispatcher.cpp)
set (expression_sources ${build_expression_dir}/BuiltinFunctions.cpp
Modified: sandbox/rick/newsource/interpreter/api/CallContextStubs.cpp
===================================================================
--- sandbox/rick/newsource/interpreter/api/CallContextStubs.cpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/api/CallContextStubs.cpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -44,7 +44,7 @@
#include "RexxCore.h"
#include "ContextApi.hpp"
-#include "RexxNativeActivation.hpp"
+#include "NativeActivation.hpp"
#include "SupplierClass.hpp"
#include "Interpreter.hpp"
#include "MethodClass.hpp"
@@ -60,7 +60,7 @@
{
return (RexxArrayObject)context.context->getArguments();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -73,7 +73,7 @@
{
return (RexxObjectPtr)context.context->getArgument(i);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -86,7 +86,7 @@
{
return (CSTRING)context.context->getMessageName()->getStringData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -99,7 +99,7 @@
{
return (RexxRoutineObject)context.context->getExecutable();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -112,7 +112,7 @@
{
context.context->setContextVariable((const char *)n, (RexxObject *)v);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -124,7 +124,7 @@
{
return (RexxObjectPtr)context.context->getContextVariable((const char *)n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -137,7 +137,7 @@
{
context.context->dropContextVariable((const char *)n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -149,7 +149,7 @@
{
return (RexxDirectoryObject)context.ret(context.context->getAllContextVariables());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -162,7 +162,7 @@
{
return (RexxStemObject)context.context->resolveStemVariable((RexxObject *)s);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
// this may throw an exception, so clear it out. The null return is the
// failure indication.
@@ -179,7 +179,7 @@
// raise an exception which will be reraised when the caller returns.
reportException(Error_Incorrect_call_external, context.context->getMessageName());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -191,7 +191,7 @@
{
context.context->setContextVariable((const char *)n, (RexxObject *)v);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -203,7 +203,7 @@
{
return (RexxObjectPtr)context.context->getContextVariable((const char *)n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -216,7 +216,7 @@
{
context.context->dropContextVariable((const char *)n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -228,7 +228,7 @@
{
return (RexxDirectoryObject)context.ret(context.context->getAllContextVariables());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -242,7 +242,7 @@
{
return (RexxObjectPtr)context.ret(context.context->getRexxContextObject());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -255,7 +255,7 @@
{
return context.context->digits();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -268,7 +268,7 @@
{
return context.context->fuzz();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -281,7 +281,7 @@
{
return context.context->form() ? true : false;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -294,7 +294,7 @@
{
return (RexxObjectPtr)context.ret(context.context->getRexxContextObject());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -310,7 +310,7 @@
RexxString *name = new_upper_string(n);
return (RexxClassObject)context.ret(context.context->findCallerClass(name));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -319,7 +319,7 @@
END_EXTERN_C()
-CallContextInterface RexxActivity::callContextFunctions =
+CallContextInterface Activity::callContextFunctions =
{
CALL_INTERFACE_VERSION,
GetCallArguments,
@@ -339,7 +339,7 @@
FindCallContextClass
};
-ExitContextInterface RexxActivity::exitContextFunctions =
+ExitContextInterface Activity::exitContextFunctions =
{
EXIT_INTERFACE_VERSION,
SetExitContextVariable,
Modified: sandbox/rick/newsource/interpreter/api/ContextApi.hpp
===================================================================
--- sandbox/rick/newsource/interpreter/api/ContextApi.hpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/api/ContextApi.hpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -46,9 +46,9 @@
#define ContextApi_Included
#include "RexxCore.h"
-#include "RexxNativeActivation.hpp"
+#include "NativeActivation.hpp"
#include "ActivationApiContexts.hpp"
-#include "RexxActivity.hpp"
+#include "Activity.hpp"
/**
* A stack-based API context object used for API stubs.
@@ -174,11 +174,11 @@
/**
* The activity used for the API callback.
*/
- RexxActivity *activity;
+ Activity *activity;
/**
* The top-level API context.
*/
- RexxNativeActivation *context;
+ NativeActivation *context;
/**
* Indicates whether we need to release the lock on return.
Modified: sandbox/rick/newsource/interpreter/api/InterpreterAPI.cpp
===================================================================
--- sandbox/rick/newsource/interpreter/api/InterpreterAPI.cpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/api/InterpreterAPI.cpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -45,14 +45,14 @@
#include "RexxMemory.hpp"
#include "StringClass.hpp"
#include "DirectoryClass.hpp"
-#include "RexxActivity.hpp"
+#include "Activity.hpp"
#include "ActivityManager.hpp"
#include "MethodClass.hpp"
#include "Interpreter.hpp"
#include "TranslateDispatcher.hpp"
#include "RexxStartDispatcher.hpp"
#include "InterpreterInstance.hpp"
-#include "RexxNativeActivation.hpp"
+#include "NativeActivation.hpp"
#include "RexxInternalApis.h"
#include "SystemInterpreter.hpp"
Modified: sandbox/rick/newsource/interpreter/api/MethodContextStubs.cpp
===================================================================
--- sandbox/rick/newsource/interpreter/api/MethodContextStubs.cpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/api/MethodContextStubs.cpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -43,7 +43,7 @@
/******************************************************************************/
#include "RexxCore.h"
#include "ContextApi.hpp"
-#include "RexxNativeActivation.hpp"
+#include "NativeActivation.hpp"
#include "ProtectedObject.hpp"
#include "MethodClass.hpp"
@@ -56,7 +56,7 @@
{
return (RexxArrayObject)context.context->getArguments();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -69,7 +69,7 @@
{
return (RexxObjectPtr)context.context->getArgument(i);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -82,7 +82,7 @@
{
return (RexxMethodObject)context.context->getExecutable();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -95,7 +95,7 @@
{
return (CSTRING)context.context->getMessageName()->getStringData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -108,7 +108,7 @@
{
return (RexxObjectPtr)context.context->getSelf();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -121,7 +121,7 @@
{
return context.context->cself();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -134,7 +134,7 @@
{
return (RexxClassObject)context.context->getSuper();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -147,7 +147,7 @@
{
return (RexxObjectPtr)context.context->getScope();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -160,7 +160,7 @@
{
context.context->setObjectVariable(n, (RexxObject *)v);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -172,7 +172,7 @@
{
return (RexxObjectPtr)context.context->getObjectVariable(n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -185,7 +185,7 @@
{
context.context->dropObjectVariable(n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -200,7 +200,7 @@
context.context->forwardMessage((RexxObject *)o, message, (RexxClass *)clazz, (ArrayClass *)a, result);
return context.ret((RexxObject *)result);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -213,7 +213,7 @@
{
context.context->guardOn();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -225,7 +225,7 @@
{
context.context->guardOff();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -239,7 +239,7 @@
RexxString *name = new_upper_string(n);
return (RexxClassObject)context.ret(context.context->findClass(name));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -248,7 +248,7 @@
END_EXTERN_C()
-MethodContextInterface RexxActivity::methodContextFunctions =
+MethodContextInterface Activity::methodContextFunctions =
{
METHOD_INTERFACE_VERSION,
GetMethodArguments,
Modified: sandbox/rick/newsource/interpreter/api/ThreadContextStubs.cpp
===================================================================
--- sandbox/rick/newsource/interpreter/api/ThreadContextStubs.cpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/api/ThreadContextStubs.cpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -44,7 +44,7 @@
#include "RexxCore.h"
#include "ContextApi.hpp"
-#include "RexxActivity.hpp"
+#include "Activity.hpp"
#include "StringClass.hpp"
#include "IntegerClass.hpp"
#include "BufferClass.hpp"
@@ -75,7 +75,7 @@
{
context.activity->detachThread();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -91,7 +91,7 @@
{
context.activity->halt(OREF_NULL);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -104,7 +104,7 @@
{
context.activity->setTrace(setting != 0);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -118,7 +118,7 @@
context.activity->getInstance()->addGlobalReference((RexxObject *)o);
return o;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -132,7 +132,7 @@
{
context.activity->getInstance()->removeGlobalReference((RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -145,7 +145,7 @@
{
context.context->removeLocalReference((RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -162,7 +162,7 @@
return context.ret(((RexxObject *)o)->sendMessage(message, (ArrayClass *)a));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -178,7 +178,7 @@
ProtectedObject p(message);
return context.ret(((RexxObject *)o)->sendMessage(message));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -194,7 +194,7 @@
ProtectedObject p(message);
return context.ret(((RexxObject *)o)->sendMessage(message, (RexxObject *)a1));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -209,7 +209,7 @@
ProtectedObject p(message);
return context.ret(((RexxObject *)o)->sendMessage(message, (RexxObject *)a1, (RexxObject *)a2));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -222,7 +222,7 @@
{
return (RexxDirectoryObject)context.activity->getLocal();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -235,7 +235,7 @@
{
return (RexxDirectoryObject)TheEnvironment;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
@@ -249,7 +249,7 @@
{
return ((RexxObject *)o)->isInstanceOf((RexxClass *)cl);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -272,7 +272,7 @@
}
return ((RexxObject *)o)->isInstanceOf(classObject);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -290,7 +290,7 @@
return ((RexxObject *)o)->hasMethod(name);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -309,7 +309,7 @@
// convert the name to a string instance, and check the environments.
return (RexxPackageObject)context.ret(context.activity->getInstance()->loadRequires(context.activity, name, resolvedName));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -325,7 +325,7 @@
ProtectedObject p(name);
return (RexxPackageObject)context.ret(context.activity->getInstance()->loadRequires(context.activity, name, d, l));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -343,7 +343,7 @@
// convert the name to a string instance, and check the environments.
return PackageManager::loadLibrary(name) != OREF_NULL;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -361,7 +361,7 @@
// convert the name to a string instance, and check the environments.
return PackageManager::registerPackage(name, e);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -379,7 +379,7 @@
return (RexxClassObject)context.ret(context.context->findClass(name));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -397,7 +397,7 @@
return (RexxClassObject)context.ret(((PackageClass *)m)->findClass(name));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -411,7 +411,7 @@
{
return (RexxDirectoryObject)context.ret(((PackageClass *)m)->getRoutines());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -425,7 +425,7 @@
{
return (RexxDirectoryObject)context.ret(((PackageClass *)m)->getPublicRoutines());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -438,7 +438,7 @@
{
return (RexxDirectoryObject)context.ret(((PackageClass *)m)->getClasses());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -451,7 +451,7 @@
{
return (RexxDirectoryObject)context.ret(((PackageClass *)m)->getPublicClasses());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -464,7 +464,7 @@
{
return (RexxDirectoryObject)context.ret(((PackageClass *)m)->getClasses());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -480,7 +480,7 @@
context.activity->run(dispatcher);
return (RexxObjectPtr)context.ret(dispatcher.result);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -496,7 +496,7 @@
context.activity->run(dispatcher);
return (RexxObjectPtr)context.ret(dispatcher.result);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -515,7 +515,7 @@
// convert the name to a string instance, and check the environments.
return (RexxMethodObject)context.ret(LanguageParser::createMethod(name, source));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -534,7 +534,7 @@
// convert the name to a string instance, and check the environments.
return (RexxRoutineObject)context.ret(LanguageParser::createRoutine(name, source));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -549,7 +549,7 @@
// convert the name to a string instance, and check the environments.
return (logical_t)((RexxObject *)o)->isInstanceOf(TheRoutineClass);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -564,7 +564,7 @@
// convert the name to a string instance, and check the environments.
return (logical_t)((RexxObject *)o)->isInstanceOf(TheMethodClass);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -579,7 +579,7 @@
// convert the name to a string instance, and check the environments.
return (RexxPackageObject)context.ret(((RoutineClass *)o)->getPackage());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return (RexxPackageObject)NULL;
@@ -594,7 +594,7 @@
// convert the name to a string instance, and check the environments.
return (RexxPackageObject)context.ret(((MethodClass *)o)->getPackage());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return (RexxPackageObject)NULL;
@@ -609,7 +609,7 @@
// ask the object to figure this out
return ((RexxObject *)o)->getCSelf();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -624,7 +624,7 @@
// ask the object to figure this out
return ((RexxObject *)o)->getCSelf((RexxObject *)s);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -638,7 +638,7 @@
{
return context.ret(Numerics::wholenumberToObject((wholenumber_t)n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -651,7 +651,7 @@
{
return context.ret(Numerics::uintptrToObject(n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -664,7 +664,7 @@
{
return context.ret(Numerics::intptrToObject(n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -678,7 +678,7 @@
{
return (RexxObjectPtr)context.ret(context.context->valueToObject(d));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
context.context->setConditionInfo(OREF_NULL);
}
@@ -693,7 +693,7 @@
{
return (RexxArrayObject)context.ret(context.context->valuesToObject(d, count));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
context.context->setConditionInfo(OREF_NULL);
}
@@ -708,7 +708,7 @@
{
return context.context->objectToValue((RexxObject *)o, d);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
// some conversion failures result in an exception...cancel that, and
// just return FALSE;
@@ -724,7 +724,7 @@
{
return context.ret(Numerics::stringsizeToObject((stringsize_t)n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -747,7 +747,7 @@
}
return false;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -761,7 +761,7 @@
{
return context.ret(Numerics::wholenumberToObject((wholenumber_t)n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -775,7 +775,7 @@
{
return context.ret(Numerics::stringsizeToObject((uint32_t)n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -796,7 +796,7 @@
}
return false;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -819,7 +819,7 @@
}
return false;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -840,7 +840,7 @@
}
return false;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -854,7 +854,7 @@
{
return context.ret(Numerics::int64ToObject(n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -867,7 +867,7 @@
{
return context.ret(Numerics::uint64ToObject(n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -881,7 +881,7 @@
// this uses the entire value range
return Numerics::objectToInt64((RexxObject *)o, *n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -895,7 +895,7 @@
// this uses the entire value range
return Numerics::objectToUnsignedInt64((RexxObject *)o, *n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -909,7 +909,7 @@
// this uses the entire value range
return Numerics::objectToUintptr((RexxObject *)o, *n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -923,7 +923,7 @@
// this uses the entire value range
return Numerics::objectToIntptr((RexxObject *)o, *n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -937,7 +937,7 @@
// this uses the entire value range
return ((RexxObject *)o)->logicalValue(*n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -950,7 +950,7 @@
{
return (RexxObjectPtr)booleanObject(n != 0);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -963,7 +963,7 @@
{
return context.ret(new_numberstringFromDouble(n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -976,7 +976,7 @@
{
return context.ret(new_numberstringFromDouble(n, precision));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -989,7 +989,7 @@
{
return ((RexxObject *)o)->doubleValue(*n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1002,7 +1002,7 @@
{
return (RexxStringObject)context.ret(REQUEST_STRING((RexxObject *)o));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1017,7 +1017,7 @@
context.ret(temp);
return (CSTRING)temp->getStringData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1031,7 +1031,7 @@
RexxString *temp = (RexxString *)s;
return temp->copyData(o - 1, (char *)r, l);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1045,7 +1045,7 @@
RexxString *temp = (RexxString *)s;
return temp->getLength();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1059,7 +1059,7 @@
RexxString *temp = (RexxString *)s;
return (CSTRING)temp->getStringData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1072,7 +1072,7 @@
{
return (RexxStringObject)context.ret(new_string(s, (stringsize_t)l));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1085,7 +1085,7 @@
{
return (RexxStringObject)context.ret(new_string((const char *)s));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1099,7 +1099,7 @@
RexxString *temp = (RexxString *)s;
return (RexxStringObject)context.ret(temp->upper());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1113,7 +1113,7 @@
RexxString *temp = (RexxString *)s;
return (RexxStringObject)context.ret(temp->lower());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1126,7 +1126,7 @@
{
return isString((RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1139,7 +1139,7 @@
{
return (RexxBufferStringObject)context.ret(raw_string((stringsize_t)l));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1153,7 +1153,7 @@
RexxString *temp = (RexxString *)s;
return temp->getLength();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1167,7 +1167,7 @@
RexxString *temp = (RexxString *)s;
return (POINTER)temp->getWritableData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1182,7 +1182,7 @@
temp->finish(l);
return s;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1197,7 +1197,7 @@
ProtectedObject p(index);
((DirectoryClass *)t)->put((RexxObject *)o, index);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1211,7 +1211,7 @@
ProtectedObject p(index);
return context.ret(((DirectoryClass *)t)->at(index));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return OREF_NULL;
@@ -1226,7 +1226,7 @@
ProtectedObject p(index);
return context.ret(((DirectoryClass *)t)->remove(index));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return OREF_NULL;
@@ -1239,7 +1239,7 @@
{
return (RexxDirectoryObject)context.ret(new_directory());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return OREF_NULL;
@@ -1252,7 +1252,7 @@
{
return isOfClass(Directory, (RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1269,7 +1269,7 @@
}
return (RexxObjectPtr)context.ret(((ArrayClass *)a)->safeGet(i));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return OREF_NULL;
@@ -1287,7 +1287,7 @@
}
((ArrayClass *)a)->put((RexxObject *)o, i);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1300,7 +1300,7 @@
{
return ((ArrayClass *)a)->append((RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
return 0;
}
@@ -1316,7 +1316,7 @@
ProtectedObject p(str);
return ((ArrayClass *)a)->append(str);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
return 0;
}
@@ -1330,7 +1330,7 @@
{
return ((ArrayClass *)a)->size();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1344,7 +1344,7 @@
{
return ((ArrayClass *)a)->items();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1357,7 +1357,7 @@
{
return ((ArrayClass *)a)->getDimension();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1370,7 +1370,7 @@
{
return (RexxArrayObject)context.ret(new_array(s));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1383,7 +1383,7 @@
{
return (RexxArrayObject)context.ret(new_array((RexxObject *)o));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1396,7 +1396,7 @@
{
return (RexxArrayObject)context.ret(new_array((RexxObject *)o1, (RexxObject *)o2));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1409,7 +1409,7 @@
{
return (RexxArrayObject)context.ret(new_array((RexxObject *)o1, (RexxObject *)o2, (RexxObject *)o3));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1422,7 +1422,7 @@
{
return (RexxArrayObject)context.ret(new_array((RexxObject *)o1, (RexxObject *)o2, (RexxObject *)o3, (RexxObject *)o4));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1436,7 +1436,7 @@
{
return isArray((RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1449,7 +1449,7 @@
{
return (POINTER)((BufferClass *)b)->getData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1462,7 +1462,7 @@
{
return ((BufferClass *)b)->getDataLength();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1475,7 +1475,7 @@
{
return (RexxBufferObject)context.ret((RexxObject *)new_buffer(l));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1488,7 +1488,7 @@
{
return isOfClass(Buffer, (RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1501,7 +1501,7 @@
{
return (POINTER)((PointerClass *)o)->pointer();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1514,7 +1514,7 @@
{
return (RexxPointerObject)context.ret(new_pointer(p));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1527,7 +1527,7 @@
{
return isOfClass(Pointer, (RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1540,7 +1540,7 @@
{
return context.ret(((SupplierClass *)o)->value());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1553,7 +1553,7 @@
{
return context.ret(((SupplierClass *)o)->index());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1566,7 +1566,7 @@
{
return ((SupplierClass *)o)->isAvailable();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1579,7 +1579,7 @@
{
((SupplierClass *)o)->next();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1591,7 +1591,7 @@
{
return (RexxSupplierObject)context.ret(new_supplier((ArrayClass *)values, (ArrayClass *)names));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1614,7 +1614,7 @@
}
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1627,7 +1627,7 @@
{
((StemClass *)s)->setElement(n, (RexxObject *)v);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1639,7 +1639,7 @@
{
return context.ret(((StemClass *)s)->getElement(n));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1652,7 +1652,7 @@
{
((StemClass *)s)->dropElement(n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1664,7 +1664,7 @@
{
((StemClass *)s)->setElement((size_t )i, (RexxObject *)v);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1676,7 +1676,7 @@
{
return context.ret(((StemClass *)s)->getElement((size_t)i));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1689,7 +1689,7 @@
{
((StemClass *)s)->dropElement((size_t)i);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1701,7 +1701,7 @@
{
return (RexxDirectoryObject)context.ret(((StemClass *)s)->toDirectory());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1714,7 +1714,7 @@
{
return context.ret(((StemClass *)s)->getStemValue());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1727,7 +1727,7 @@
{
return isOfClass(Stem, (RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1740,7 +1740,7 @@
{
reportException((wholenumber_t)n);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1752,7 +1752,7 @@
{
reportException((wholenumber_t)n, (RexxObject *)o1);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1764,7 +1764,7 @@
{
reportException((wholenumber_t)n, (RexxObject *)o1, (RexxObject *)o2);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1776,7 +1776,7 @@
{
reportException((wholenumber_t)n, (ArrayClass *)a);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1791,7 +1791,7 @@
context.context->enableConditionTrap();
context.activity->raiseCondition(name, OREF_NULL, (RexxString *)desc, (RexxObject *)add, (RexxObject *)result);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1803,7 +1803,7 @@
{
return context.context->getConditionInfo() != OREF_NULL;
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1816,7 +1816,7 @@
{
return context.activity->displayCondition(context.context->getConditionInfo());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return Error_Interpretation/1000; // this is a default one if something goes wrong
@@ -1829,7 +1829,7 @@
{
return (RexxDirectoryObject)context.ret(context.context->getConditionInfo());
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return OREF_NULL;
@@ -1843,7 +1843,7 @@
{
Interpreter::decodeConditionData((DirectoryClass *)d, cd);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1855,7 +1855,7 @@
{
context.context->setConditionInfo(OREF_NULL);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
}
@@ -1867,7 +1867,7 @@
{
return (POINTER)((MutableBuffer *)b)->getData();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULL;
@@ -1880,7 +1880,7 @@
{
return ((MutableBuffer *)b)->getLength();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1893,7 +1893,7 @@
{
return ((MutableBuffer *)b)->setDataLength(length);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1906,7 +1906,7 @@
{
return ((MutableBuffer *)b)->getCapacity();
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1919,7 +1919,7 @@
{
return (POINTER)((MutableBuffer *)b)->setCapacity(length);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return 0;
@@ -1932,7 +1932,7 @@
{
return (RexxMutableBufferObject)context.ret((RexxObject *)new MutableBuffer(l, l));
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return NULLOBJECT;
@@ -1945,7 +1945,7 @@
{
return isOfClass(MutableBuffer, (RexxObject *)o);
}
- catch (RexxNativeActivation *)
+ catch (NativeActivation *)
{
}
return false;
@@ -1953,7 +1953,7 @@
END_EXTERN_C()
-RexxThreadInterface RexxActivity::threadContextFunctions =
+RexxThreadInterface Activity::threadContextFunctions =
{
THREAD_INTERFACE_VERSION,
DetachThread,
Modified: sandbox/rick/newsource/interpreter/behaviour/MethodDictionary.cpp
===================================================================
--- sandbox/rick/newsource/interpreter/behaviour/MethodDictionary.cpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/behaviour/MethodDictionary.cpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -302,7 +302,7 @@
// use an iterator to traverse the table
HashContents::TableIterator iterator = contents->iterator();
- while (iterator.isAvailable())
+ for (; iterator.isAvailable(); iterator.nextEntry())
{
MethodClass *method = (MethodClass *)iterator.value();
// we might have .nil in here as well as method objects.
@@ -315,8 +315,6 @@
// in the table with the returned version.
iterator.replace(method->newScope(scope));
}
- // step to the next item.
- iterator.next();
}
}
Modified: sandbox/rick/newsource/interpreter/behaviour/PrimitiveClasses.xml
===================================================================
--- sandbox/rick/newsource/interpreter/behaviour/PrimitiveClasses.xml 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/behaviour/PrimitiveClasses.xml 2014-07-22 16:41:31 UTC (rev 10321)
@@ -107,9 +107,9 @@
<Class id="RexxSource" class="RexxSource" include="SourceFile.hpp"/>
<Class id="LibraryPackage" class="LibraryPackage" include="LibraryPackage.hpp"/>
<Class id="RexxCode" class="RexxCode" include="RexxCode.hpp"/>
-<Class id="NativeMethod" class="RexxNativeMethod" include="RexxNativeCode.hpp"/>
-<Class id="NativeRoutine" class="RexxNativeRoutine" include="RexxNativeCode.hpp"/>
-<Class id="RegisteredRoutine" class="RegisteredRoutine" include="RexxNativeCode.hpp"/>
+<Class id="NativeMethod" class="NativeMethod" include="NativeCode.hpp"/>
+<Class id="NativeRoutine" class="NativeRoutine" include="NativeCode.hpp"/>
+<Class id="RegisteredRoutine" class="RegisteredRoutine" include="NativeCode.hpp"/>
<Class id="CPPCode" class="CPPCode" include="CPPCode.hpp"/>
<Class id="AttributeGetterCode" class="AttributeGetterCode" include="CPPCode.hpp"/>
<Class id="AttributeSetterCode" class="AttributeSetterCode" include="CPPCode.hpp"/>
@@ -204,9 +204,9 @@
<Class id="InternalStack" class="InternalStack" include="InternalStack.hpp"/>
<Class id="LiveStack" class="LiveStack" include="MemoryStack.hpp"/>
<Class id="PushThroughStack" class="PushThroughStack" include="MemoryStack.hpp"/>
-<Class id="Activity" class="RexxActivity" include="RexxActivity.hpp"/>
+<Class id="Activity" class="Activity" include="Activity.hpp"/>
<Class id="Activation" class="RexxActivation" include="RexxActivation.hpp"/>
-<Class id="NativeActivation" class="RexxNativeActivation" include="RexxNativeActivation.hpp"/>
+<Class id="NativeActivation" class="NativeActivation" include="NativeActivation.hpp"/>
<Class id="ActivationFrameBuffer" class="RexxActivationFrameBuffer" include="RexxActivationStack.hpp"/>
<Class id="Envelope" class="Envelope" include="Envelope.hpp"/>
<Class id="LanguageParser" class="LanguageParser" include="LanguageParser.hpp"/>
Modified: sandbox/rick/newsource/interpreter/behaviour/VirtualFunctionTable.cpp
===================================================================
--- sandbox/rick/newsource/interpreter/behaviour/VirtualFunctionTable.cpp 2014-07-21 19:54:39 UTC (rev 10320)
+++ sandbox/rick/newsource/interpreter/behaviour/VirtualFunctionTable.cpp 2014-07-22 16:41:31 UTC (rev 10321)
@@ -52,7 +52,7 @@
#include "RexxCore.h"
-
+
#include "ObjectClass.hpp"
#include "ClassClass.hpp"
#include "ArrayClass.hpp"
@@ -86,12 +86,12 @@
#include "SourceFile.hpp"
#include "LibraryPackage.hpp"
#include "RexxCode.hpp"
-#include "RexxNativeCode.hpp"
+#include "NativeCode.hpp"
#include "CPPCode.hpp"
#include "SmartBuffer.hpp"
#include "HashContents.hpp"
#include "RexxVariable.hpp"
-#include "RexxVariableDictionary.hpp"
+#include "VariableDictionary.hpp"
#include "ExpressionVariable.hpp"
#include "ExpressionCompoundVariable.hpp"
#include "ExpressionStem.hpp"
@@ -146,9 +146,9 @@
#include "RexxMemory.hpp"
#include "InternalStack.hpp"
#include "MemoryStack.hpp"
-#include "RexxActivity.hpp"
+#include "Activity.hpp"
#include "RexxActivation.hpp"
-#include "RexxNativeActivation.hpp"
+#include "NativeActivation.hpp"
#include "RexxActivationStack.hpp"
#include "Envelope.hpp"
#include "LanguageParser.hpp"
@@ -187,502 +187,502 @@
void *objectLoc = objectBuffer;
// instantiate an instance of each class into the buffer and
// grab the resulting virtual function table
-
+
objectPtr = new (objectLoc) RexxObject(RESTOREIMAGE);
virtualFunctionTable[T_Object] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_ObjectClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_Class] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_ClassClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) ArrayClass(RESTOREIMAGE);
virtualFunctionTable[T_Array] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_ArrayClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) DirectoryClass(RESTOREIMAGE);
virtualFunctionTable[T_Directory] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_DirectoryClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxInteger(RESTOREIMAGE);
virtualFunctionTable[T_Integer] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxIntegerClass(RESTOREIMAGE);
virtualFunctionTable[T_IntegerClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) ListClass(RESTOREIMAGE);
virtualFunctionTable[T_List] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_ListClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxMessage(RESTOREIMAGE);
virtualFunctionTable[T_Message] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_MessageClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) MethodClass(RESTOREIMAGE);
virtualFunctionTable[T_Method] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_MethodClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxNumberString(RESTOREIMAGE);
virtualFunctionTable[T_NumberString] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_NumberStringClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) QueueClass(RESTOREIMAGE);
virtualFunctionTable[T_Queue] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_QueueClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxStem(RESTOREIMAGE);
virtualFunctionTable[T_Stem] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_StemClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxString(RESTOREIMAGE);
virtualFunctionTable[T_String] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_StringClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxSupplier(RESTOREIMAGE);
virtualFunctionTable[T_Supplier] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_SupplierClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) TableClass(RESTOREIMAGE);
virtualFunctionTable[T_Table] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_TableClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) StringTable(RESTOREIMAGE);
virtualFunctionTable[T_StringTable] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_StringTableClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RelationClass(RESTOREIMAGE);
virtualFunctionTable[T_Relation] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxClass(RESTOREIMAGE);
virtualFunctionTable[T_RelationClass] = getVftPointer(objectLoc);
-
+
objectPtr = new (objectLoc) RexxMutableBuffer(RESTOREIMAGE);
virtualFunctionTable[T_MutableBuffer] = getVftPointer(objectLoc);
-
+
...
[truncated message content] |