From: <bi...@us...> - 2011-03-06 02:08:02
|
Revision: 6825 http://oorexx.svn.sourceforge.net/oorexx/?rev=6825&view=rev Author: bigrixx Date: 2011-03-06 02:07:55 +0000 (Sun, 06 Mar 2011) Log Message: ----------- [ oorexx-Feature Requests-3196233 ] Add new .trace monitor object to ooRexx Modified Paths: -------------- main/trunk/interpreter/RexxClasses/CoreClasses.orx main/trunk/interpreter/concurrency/RexxActivity.cpp main/trunk/interpreter/runtime/GlobalNames.h main/trunk/interpreter/runtime/RexxConstants.hpp Modified: main/trunk/interpreter/RexxClasses/CoreClasses.orx =================================================================== --- main/trunk/interpreter/RexxClasses/CoreClasses.orx 2011-03-05 21:18:06 UTC (rev 6824) +++ main/trunk/interpreter/RexxClasses/CoreClasses.orx 2011-03-06 02:07:55 UTC (rev 6825) @@ -563,12 +563,16 @@ .local~setentry('STDIN', input) .local~setentry('INPUT',.monitor~new(.stdin)) .input~objectname = "The INPUT monitor" + .local~setentry('DEBUGINPUT', .monitor~new(.input)) + .debuginput~objectname = "The DEBUG INPUT monitor" .local~setentry('STDOUT', output) .local~setentry('OUTPUT',.monitor~new(.stdout)) .output~objectname = "The OUTPUT monitor" .local~setentry('STDERR', error) .local~setentry('ERROR', .monitor~new(.stderr)) .error~objectname = "The ERROR monitor" + .local~setentry('TRACEOUTPUT',.monitor~new(.error)) + .output~objectname = "The TRACE OUTPUT monitor" .local~setentry('STDQUE',.RexxQueue~new('SESSION')) Modified: main/trunk/interpreter/concurrency/RexxActivity.cpp =================================================================== --- main/trunk/interpreter/concurrency/RexxActivity.cpp 2011-03-05 21:18:06 UTC (rev 6824) +++ main/trunk/interpreter/concurrency/RexxActivity.cpp 2011-03-06 02:07:55 UTC (rev 6825) @@ -2790,7 +2790,7 @@ if (this->callTraceExit(activation, line)) { /* get the default output stream */ - RexxObject *stream = getLocalEnvironment(OREF_ERRORNAME); + RexxObject *stream = getLocalEnvironment(OREF_TRACEOUTPUT); /* have .local set up yet? */ if (stream != OREF_NULL && stream != TheNilObject) { @@ -2840,7 +2840,7 @@ if (this->callDebugInputExit(activation, value)) { /* get the input stream */ - RexxObject *stream = getLocalEnvironment(OREF_INPUT); + RexxObject *stream = getLocalEnvironment(OREF_DEBUGINPUT); if (stream != OREF_NULL) /* have a stream? */ { /* read from it */ Modified: main/trunk/interpreter/runtime/GlobalNames.h =================================================================== --- main/trunk/interpreter/runtime/GlobalNames.h 2011-03-05 21:18:06 UTC (rev 6824) +++ main/trunk/interpreter/runtime/GlobalNames.h 2011-03-06 02:07:55 UTC (rev 6825) @@ -71,6 +71,7 @@ GLOBAL_NAME(ASSIGNMENT_CONCATENATE, CHAR_ASSIGNMENT_CONCATENATE) GLOBAL_NAME(CONDITION, CHAR_CONDITION) GLOBAL_NAME(CSELF, CHAR_CSELF) + GLOBAL_NAME(DEBUGINPUT, CHAR_DEBUGINPUT) GLOBAL_NAME(DEFAULTNAME, CHAR_DEFAULTNAME) GLOBAL_NAME(DELAY, CHAR_DELAY) GLOBAL_NAME(DESCRIPTION, CHAR_DESCRIPTION) @@ -197,6 +198,7 @@ GLOBAL_NAME(SYNTAX, CHAR_SYNTAX) GLOBAL_NAME(TOKENIZE_ONLY, CHAR_TOKENIZE_ONLY) GLOBAL_NAME(TRACEBACK, CHAR_TRACEBACK) + GLOBAL_NAME(TRACEOUTPUT, CHAR_TRACEOUTPUT) GLOBAL_NAME(STACKFRAMES, CHAR_STACKFRAMES) GLOBAL_NAME(UNINIT, CHAR_UNINIT) GLOBAL_NAME(UNKNOWN, CHAR_UNKNOWN) Modified: main/trunk/interpreter/runtime/RexxConstants.hpp =================================================================== --- main/trunk/interpreter/runtime/RexxConstants.hpp 2011-03-05 21:18:06 UTC (rev 6824) +++ main/trunk/interpreter/runtime/RexxConstants.hpp 2011-03-06 02:07:55 UTC (rev 6825) @@ -108,6 +108,7 @@ CHARCONSTANT(CONTINUE, "CONTINUE"); CHARCONSTANT(COPY, "COPY"); CHARCONSTANT(CSELF, "CSELF"); +CHARCONSTANT(DEBUGINPUT, "DEBUGINPUT"); CHARCONSTANT(DECODEBASE64, "DECODEBASE64"); CHARCONSTANT(DEFAULTNAME, "DEFAULTNAME"); CHARCONSTANT(DEFINE, "DEFINE"); @@ -343,6 +344,7 @@ CHARCONSTANT(TODIRECTORY, "TODIRECTORY"); CHARCONSTANT(TOSTRING, "TOSTRING"); CHARCONSTANT(TRACEBACK, "TRACEBACK"); +CHARCONSTANT(TRACEOUTPUT, "TRACEOUTPUT"); CHARCONSTANT(TRANSLATE, "TRANSLATE"); CHARCONSTANT(TRUE, "TRUE"); CHARCONSTANT(UNGUARDED, "UNGUARDED"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |