Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx: [1913] sandbox/rick/constant/kernel/runtime
|
From: <bi...@us...> - 2007-12-30 13:04:08
|
Revision: 1913
http://oorexx.svn.sourceforge.net/oorexx/?rev=1913&view=rev
Author: bigrixx
Date: 2007-12-30 05:04:12 -0800 (Sun, 30 Dec 2007)
Log Message:
-----------
Clean compile on Linux
Modified Paths:
--------------
sandbox/rick/constant/kernel/runtime/RexxActivation.cpp
sandbox/rick/constant/kernel/runtime/RexxActivity.cpp
sandbox/rick/constant/kernel/runtime/RexxNativeActivation.cpp
Modified: sandbox/rick/constant/kernel/runtime/RexxActivation.cpp
===================================================================
--- sandbox/rick/constant/kernel/runtime/RexxActivation.cpp 2007-12-30 12:40:22 UTC (rev 1912)
+++ sandbox/rick/constant/kernel/runtime/RexxActivation.cpp 2007-12-30 13:04:12 UTC (rev 1913)
@@ -1079,14 +1079,14 @@
_argcount = this->argcount;
}
if (continuing) { /* just processing the message? */
- ProtectedObject result;
+ ProtectedObject r;
if (superClass == OREF_NULL) /* no override? */
/* issue the message and return */
- target->messageSend(message, _argcount, _arguments, result);
+ target->messageSend(message, _argcount, _arguments, r);
else
/* issue the message with override */
- target->messageSend(message, _argcount, _arguments, superClass, result);
- return (RexxObject *)result;
+ target->messageSend(message, _argcount, _arguments, superClass, r);
+ return (RexxObject *)r;
}
else { /* got to shut down and issue */
this->settings.flags |= forwarded; /* we are now a phantom activation */
@@ -2212,7 +2212,7 @@
RexxObject * RexxActivation::internalCallTrap(
RexxInstruction * target, /* target of the call */
RexxDirectory * conditionObj, /* processed condition object */
- ProtectedObject &result)
+ ProtectedObject &resultObj)
/******************************************************************************/
/* Function: Call an internal condition trap */
/******************************************************************************/
@@ -2232,7 +2232,7 @@
this->activity->push(newActivation); /* push on the activity stack */
/* run the internal routine on the */
/* new activation */
- return newActivation->run(OREF_NULL, OREF_NULL, NULL, 0, target, result);
+ return newActivation->run(OREF_NULL, OREF_NULL, NULL, 0, target, resultObj);
}
Modified: sandbox/rick/constant/kernel/runtime/RexxActivity.cpp
===================================================================
--- sandbox/rick/constant/kernel/runtime/RexxActivity.cpp 2007-12-30 12:40:22 UTC (rev 1912)
+++ sandbox/rick/constant/kernel/runtime/RexxActivity.cpp 2007-12-30 13:04:12 UTC (rev 1913)
@@ -2786,7 +2786,6 @@
/******************************************************************************/
{
RexxActivity *activity; /* target activity */
- RexxObject *result; /* returned result object */
RexxArray *argument_array; /* array of arguments */
RexxList *argument_list; /* temp list of arguments */
char returnType; /* type of return value */
@@ -2821,23 +2820,22 @@
argument_array = argument_list->makeArray();
ProtectedObject p1(argument_array);
va_end(arguments); /* end of argument processing */
- ProtectedObject result;
+ ProtectedObject r;
if (start_class == OREF_NULL) /* no start scope given? */
/* issue a straight message send */
- receiver->messageSend(new_string(msgname)->upper(), argument_array->size(), argument_array->data(), result);
+ receiver->messageSend(new_string(msgname)->upper(), argument_array->size(), argument_array->data(), r);
else
/* go issue the message with override*/
- receiver->messageSend(new_string(msgname)->upper(), argument_array->size(), argument_array->data(), start_class, result);
- if (result != OREF_NULL) { /* if we got a result, protect it. */
+ receiver->messageSend(new_string(msgname)->upper(), argument_array->size(), argument_array->data(), start_class, r);
+ if (r != OREF_NULL) { /* if we got a result, convert it. */
/* convert the return result */
- process_message_result((RexxObject *)result, result_pointer, returnType);
+ process_message_result((RexxObject *)r, result_pointer, returnType);
}
}
catch (ActivityException)
{
/* do error cleanup */
rc = activity->error(startDepth);
- result = OREF_NULL; /* no result in this case */
}
memoryObject.runUninits(); /* be sure to finish UNINIT methods */
Modified: sandbox/rick/constant/kernel/runtime/RexxNativeActivation.cpp
===================================================================
--- sandbox/rick/constant/kernel/runtime/RexxNativeActivation.cpp 2007-12-30 12:40:22 UTC (rev 1912)
+++ sandbox/rick/constant/kernel/runtime/RexxNativeActivation.cpp 2007-12-30 13:04:12 UTC (rev 1913)
@@ -703,9 +703,9 @@
/* Function: Redispatch an activation on a different activity */
/******************************************************************************/
{
- ProtectedObject result;
- this->run(receiver, msgname, argcount, arglist, result); /* just do a method run */
- return (RexxObject *)result;
+ ProtectedObject r;
+ this->run(receiver, msgname, argcount, arglist, r); /* just do a method run */
+ return (RexxObject *)r;
}
void RexxNativeActivation::traceBack(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|