[Oorexx-svn] SF.net SVN: oorexx:[3574] main/trunk

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

Revision: 3574
          http://oorexx.svn.sourceforge.net/oorexx/?rev=3574&view=rev
Author:   bigrixx
Date:     2008-10-18 23:57:44 +0000 (Sat, 18 Oct 2008)

Log Message:
-----------
Cleanup some types in the exit definitions

Modified Paths:
--------------
    main/trunk/api/oorexxapi.h
    main/trunk/api/rexx.h
    main/trunk/interpreter/concurrency/RexxActivity.cpp

Modified: main/trunk/api/oorexxapi.h
===================================================================
--- main/trunk/api/oorexxapi.h	2008-10-18 22:16:29 UTC (rev 3573)
+++ main/trunk/api/oorexxapi.h	2008-10-18 23:57:44 UTC (rev 3574)
@@ -243,7 +243,6 @@
 
 #ifdef __cplusplus
 
-class _RexxObjectPtr {};
 class _RexxStringObject : public _RexxObjectPtr {};
 class _RexxBufferStringObject : public _RexxStringObject {};
 class _RexxArrayObject : public _RexxObjectPtr {};
@@ -257,7 +256,6 @@
 class _RexxSupplierObject : public _RexxObjectPtr {};
 class _RexxStemObject : public _RexxObjectPtr {};
 
-typedef _RexxObjectPtr *RexxObjectPtr;
 typedef _RexxStringObject *RexxStringObject;
 typedef _RexxBufferStringObject *RexxBufferStringObject;
 typedef _RexxArrayObject *RexxArrayObject;
@@ -273,7 +271,6 @@
 
 #else
 
-struct _RexxObjectPtr;
 struct _RexxStringObject;
 struct _RexxArrayObject;
 struct _RexxBufferObject;
@@ -286,7 +283,6 @@
 struct _RexxSupplierObject;
 struct _RexxStemObject;
 
-typedef struct _RexxObjectPtr *RexxObjectPtr;
 typedef struct _RexxStringObject *RexxStringObject;
 typedef struct _RexxBufferStringObject *RexxBufferStringObject;
 typedef struct _RexxArrayObject *RexxArrayObject;

Modified: main/trunk/api/rexx.h
===================================================================
--- main/trunk/api/rexx.h	2008-10-18 22:16:29 UTC (rev 3573)
+++ main/trunk/api/rexx.h	2008-10-18 23:57:44 UTC (rev 3574)
@@ -77,10 +77,16 @@
 /******************************************************************************/
 typedef const char *CSTRING;          /* pointer to zero-terminated string */
 typedef void *POINTER;
-typedef void *REXXOBJECT;             /* reference to a REXX object        */
-typedef REXXOBJECT STRING;            /* REXX string object                */
-typedef REXXOBJECT REXXSTRING;        /* REXX string object                */
 
+#ifdef __cplusplus
+
+class _RexxObjectPtr {};
+typedef _RexxObjectPtr *RexxObjectPtr;
+#else
+struct _RexxObjectPtr;
+typedef struct _RexxObjectPtr *RexxObjectPtr;
+#endif
+
 /******************************************************************************/
 /* Constant values (for general use)                                          */
 /******************************************************************************/
@@ -398,8 +404,8 @@
    RXOFNC_FLAGS      rxfnc_flags ;     /* function flags             */
    CONSTRXSTRING     rxfnc_name;       // the called function name
    size_t            rxfnc_argc;       /* Number of args in list.    */
-   REXXOBJECT       *rxfnc_argv;       /* Pointer to argument list.  */
-   REXXOBJECT        rxfnc_retc;       /* Return value.              */
+   RexxObjectPtr    *rxfnc_argv;       /* Pointer to argument list.  */
+   RexxObjectPtr     rxfnc_retc;       /* Return value.              */
 }  RXOFNCCAL_PARM;
 
 
@@ -416,8 +422,8 @@
    RXEXF_FLAGS       rxfnc_flags ;     /* function flags             */
    CONSTRXSTRING     rxfnc_name;       // the called function name
    size_t            rxfnc_argc;       /* Number of args in list.    */
-   REXXOBJECT       *rxfnc_argv;       /* Pointer to argument list.  */
-   REXXOBJECT        rxfnc_retc;       /* Return value.              */
+   RexxObjectPtr    *rxfnc_argv;       /* Pointer to argument list.  */
+   RexxObjectPtr     rxfnc_retc;       /* Return value.              */
 }  RXEXFCAL_PARM;
 
 /***    Subfunction RXCMDHST -- Process Host Commands     */
@@ -526,14 +532,14 @@
 
 typedef  struct _RXVARNOVALUE_PARM {   /* var */
    CONSTRXSTRING     variable_name;    // the request variable name
-   REXXOBJECT        value;            // returned variable value
+   RexxObjectPtr     value;            // returned variable value
 }  RXVARNOVALUE_PARM;
 
 
 typedef  struct _RXVALCALL_PARM {      /* val */
    CONSTRXSTRING     selector;         // the environment selector name
    CONSTRXSTRING     variable_name;    // the request variable name
-   REXXOBJECT        value;            // returned variable value
+   RexxObjectPtr     value;            // returned variable value
 }  RXVALCALL_PARM;
 
 /* This typedef simplifies coding of an Exit handler.                */

Modified: main/trunk/interpreter/concurrency/RexxActivity.cpp
===================================================================
--- main/trunk/interpreter/concurrency/RexxActivity.cpp	2008-10-18 22:16:29 UTC (rev 3573)
+++ main/trunk/interpreter/concurrency/RexxActivity.cpp	2008-10-18 23:57:44 UTC (rev 3574)
@@ -2255,7 +2255,7 @@
         /* get number of args                */
         exit_parm.rxfnc_argc = argcount;
         // the argument pointers get passed as is
-        exit_parm.rxfnc_argv = (REXXOBJECT *)arguments;
+        exit_parm.rxfnc_argv = (RexxObjectPtr *)arguments;
         // no result value
         exit_parm.rxfnc_retc = NULLOBJECT;
         /* call the handler                  */
@@ -2316,7 +2316,7 @@
         /* get number of args                */
         exit_parm.rxfnc_argc = argcount;
         // the argument pointers get passed as is
-        exit_parm.rxfnc_argv = (REXXOBJECT *)arguments;
+        exit_parm.rxfnc_argv = (RexxObjectPtr *)arguments;
         // no result value
         exit_parm.rxfnc_retc = NULLOBJECT;
         /* call the handler                  */
@@ -2678,7 +2678,7 @@
         variableName->toRxstring(exit_parm.variable_name);
         // the value is returned as an object, and the old value is
         // also passed that way
-        exit_parm.value = (REXXOBJECT)newValue;
+        exit_parm.value = (RexxObjectPtr)newValue;
                                            /* call the handler                  */
         if (!callExit(activation, "RXVAL", RXVAL, RXVALCALL, (void *)&exit_parm))
         {


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