Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx: [1164] sandbox/mark/os2-types/kernel
|
From: <mie...@us...> - 2007-10-31 04:36:55
|
Revision: 1164
http://oorexx.svn.sourceforge.net/oorexx/?rev=1164&view=rev
Author: miesfeld
Date: 2007-10-30 21:36:56 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
More INT removal
Modified Paths:
--------------
sandbox/mark/os2-types/kernel/instructions/ParseTarget.hpp
sandbox/mark/os2-types/kernel/instructions/ParseTrigger.cpp
sandbox/mark/os2-types/kernel/instructions/ParseTrigger.hpp
sandbox/mark/os2-types/kernel/instructions/QueueInstruction.cpp
sandbox/mark/os2-types/kernel/instructions/TraceInstruction.cpp
sandbox/mark/os2-types/kernel/parser/InstructionParser.cpp
sandbox/mark/os2-types/kernel/parser/SourceFile.cpp
sandbox/mark/os2-types/kernel/parser/SourceFile.hpp
sandbox/mark/os2-types/kernel/platform/unix/APIDefinitions.h
sandbox/mark/os2-types/kernel/platform/unix/ErrorMessages.cpp
sandbox/mark/os2-types/kernel/platform/unix/ExternalFunctions.cpp
sandbox/mark/os2-types/kernel/platform/unix/FileSystem.cpp
sandbox/mark/os2-types/kernel/platform/unix/RexxQueues.cpp
sandbox/mark/os2-types/kernel/platform/unix/SystemCommands.cpp
sandbox/mark/os2-types/kernel/platform/windows/RexxMain.cpp
Modified: sandbox/mark/os2-types/kernel/instructions/ParseTarget.hpp
===================================================================
--- sandbox/mark/os2-types/kernel/instructions/ParseTarget.hpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/instructions/ParseTarget.hpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -80,6 +80,6 @@
size_t pattern_start; /* start of matched pattern */
size_t subcurrent; /* current location for word parse */
size_t next_argument; /* next PARSE ARG argument */
- INT translate; /* string translation flag */
+ int translate; /* string translation flag */
};
#endif
Modified: sandbox/mark/os2-types/kernel/instructions/ParseTrigger.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/instructions/ParseTrigger.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/instructions/ParseTrigger.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -51,7 +51,7 @@
#include "ExpressionBaseVariable.hpp"
RexxTrigger::RexxTrigger(
- INT type, /* type of trigger */
+ int type, /* type of trigger */
RexxObject *_value, /* value to evaluatate */
LONG _variableCount, /* count of variables */
RexxQueue *_variables) /* array of trigger variables */
@@ -207,8 +207,8 @@
/* Function: Normal garbage collection live marking */
/******************************************************************************/
{
- INT i; /* loop counter */
- INT count; /* argument count */
+ size_t i; /* loop counter */
+ size_t count; /* argument count */
setUpMemoryMark
for (i = 0, count = this->variableCount; i < count; i++)
@@ -222,8 +222,8 @@
/* Function: Generalized object marking */
/******************************************************************************/
{
- INT i; /* loop counter */
- INT count; /* argument count */
+ size_t i; /* loop counter */
+ size_t count; /* argument count */
setUpMemoryMarkGeneral
for (i = 0, count = this->variableCount; i < count; i++)
@@ -237,8 +237,8 @@
/* Function: Flatten an object */
/******************************************************************************/
{
- INT i; /* loop counter */
- INT count; /* argument count */
+ size_t i; /* loop counter */
+ size_t count; /* argument count */
setUpFlatten(RexxTrigger) /* set up for the flatten */
Modified: sandbox/mark/os2-types/kernel/instructions/ParseTrigger.hpp
===================================================================
--- sandbox/mark/os2-types/kernel/instructions/ParseTrigger.hpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/instructions/ParseTrigger.hpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -57,7 +57,7 @@
public:
void *operator new(size_t, LONG);
inline void *operator new(size_t size, void *ptr) {return ptr;};
- RexxTrigger(INT, RexxObject *, LONG, RexxQueue *);
+ RexxTrigger(int, RexxObject *, LONG, RexxQueue *);
inline RexxTrigger(RESTORETYPE restoreType) { ; };
long integerTrigger(RexxObject *);
RexxString *stringTrigger(RexxObject *);
@@ -66,7 +66,7 @@
void liveGeneral();
void flatten(RexxEnvelope *);
inline long getType() { return this->hashvalue; } ;
- inline void setType(INT v) { this->hashvalue = (long) v; } ;
+ inline void setType(int v) { this->hashvalue = (long) v; } ;
LONG variableCount; /* type of trigger */
RexxObject *value; /* value associated with trigger */
Modified: sandbox/mark/os2-types/kernel/instructions/QueueInstruction.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/instructions/QueueInstruction.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/instructions/QueueInstruction.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -54,7 +54,7 @@
RexxInstructionQueue::RexxInstructionQueue(
RexxObject *_expression, /* expresion to evaluate */
- INT type) /* top of queueing operation */
+ int type) /* top of queueing operation */
/******************************************************************************/
/* Function: Initialize a QUEUE instruction object */
/******************************************************************************/
Modified: sandbox/mark/os2-types/kernel/instructions/TraceInstruction.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/instructions/TraceInstruction.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/instructions/TraceInstruction.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -109,8 +109,8 @@
{
RexxObject *result; /* expression result */
RexxString *value; /* string version of expression */
- INT setting; /* new trace setting */
- INT debug; /* new debug setting */
+ int setting; /* new trace setting */
+ int debug; /* new debug setting */
context->traceInstruction(this); /* trace if necessary */
if (trace_setting == 0) /* interactive debug mode request? */
Modified: sandbox/mark/os2-types/kernel/parser/InstructionParser.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/parser/InstructionParser.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/parser/InstructionParser.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -218,7 +218,7 @@
LONG argCount; /* call arguments */
RexxToken *token; /* current working token */
RexxObject *name; /* call name */
- INT _keyword; /* call subkeyword */
+ int _keyword; /* call subkeyword */
RexxString *_condition; /* created USER condition */
size_t _flags; /* final CALL flags */
size_t builtin_index; /* builtin function call index */
@@ -968,7 +968,7 @@
RexxToken *token; /* current working token */
bool on_off = false; /* ON or OFF version */
RexxObject *_expression; /* WHEN expression */
- INT variable_count; /* count of variables */
+ int variable_count; /* count of variables */
_expression = OREF_NULL; /* default no expression */
variable_list = OREF_NULL; /* no variable either */
@@ -1031,7 +1031,7 @@
}
RexxInstruction *RexxSource::ifNew(
- INT type ) /* type of instruction (IF or WHEN) */
+ int type ) /* type of instruction (IF or WHEN) */
/****************************************************************************/
/* Function: Create a new INTERPRET instruction object */
/****************************************************************************/
@@ -1119,7 +1119,7 @@
}
RexxInstruction *RexxSource::leaveNew(
- INT type ) /* type of queueing operation */
+ int type ) /* type of queueing operation */
/****************************************************************************/
/* Function: Create a new LEAVE/ITERATE instruction translator object */
/****************************************************************************/
@@ -1374,7 +1374,7 @@
}
RexxInstruction *RexxSource::parseNew(
- INT argpull) /* type of parsing operation */
+ int argpull) /* type of parsing operation */
/****************************************************************************/
/* Function: Create a PARSE instruction object */
/****************************************************************************/
@@ -1657,7 +1657,7 @@
}
RexxInstruction *RexxSource::queueNew(
- INT type) /* type of queueing operation */
+ int type) /* type of queueing operation */
/****************************************************************************/
/* Function: Create a QUEUE instruction object */
/****************************************************************************/
Modified: sandbox/mark/os2-types/kernel/parser/SourceFile.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/parser/SourceFile.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/parser/SourceFile.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -2632,7 +2632,7 @@
/* for new added instructions */
/******************************************************************************/
{
- INT type; /* instruction type */
+ int type; /* instruction type */
RexxInstruction *second; /* additional created instructions */
for (;;) { /* loop through the control stack */
@@ -2685,8 +2685,8 @@
RexxInstruction *second; /* secondary clause for IF/WHEN */
RexxToken *token; /* current working token */
RexxCode *newCode; /* newly created method */
- INT type; /* instruction type information */
- INT controltype; /* type on the control stack */
+ int type; /* instruction type information */
+ int controltype; /* type on the control stack */
/* no instructions yet */
OrefSet(this, this->first, OREF_NULL);
@@ -2961,7 +2961,7 @@
RexxInstruction *_instruction; /* current working instruction */
RexxObject *term; /* term for a message send */
RexxObject *subexpression; /* subexpression of a clause */
- INT _keyword; /* resolved instruction keyword */
+ int _keyword; /* resolved instruction keyword */
_instruction = OREF_NULL; /* default to no instruction found */
_first = nextReal(); /* get the first token */
@@ -4171,7 +4171,7 @@
RexxToken *token; /* current working token */
RexxObject *term; /* working term */
RexxObject *start; /* starting term */
- INT classId; /* token class */
+ int classId; /* token class */
size_t mark = markPosition(); // save the current position so we can reset cleanly
@@ -4209,7 +4209,7 @@
{
RexxToken *token; /* current working token */
RexxObject *term = OREF_NULL; /* working term */
- INT classId; /* token class */
+ int classId; /* token class */
token = nextToken(); /* get the next token */
/* this the expression end? */
@@ -4709,7 +4709,7 @@
RexxObject *RexxSource::sourceNewObject(
size_t size, /* Object size */
RexxBehaviour *_behaviour, /* Object's behaviour */
- INT type ) /* Type of instruction */
+ int type ) /* Type of instruction */
/******************************************************************************/
/* Function: Create a "raw" translator instruction object */
/******************************************************************************/
@@ -4820,13 +4820,13 @@
}
size_t RexxSource::processVariableList(
- INT type ) /* type of instruction */
+ int type ) /* type of instruction */
/****************************************************************************/
/* Function: Process a variable list for PROCEDURE, DROP, and USE */
/****************************************************************************/
{
RexxToken *token; /* current working token */
- INT list_count; /* count of variables in list */
+ int list_count; /* count of variables in list */
RexxObject *retriever; /* variable retriever object */
list_count = 0; /* no variables yet */
@@ -4901,7 +4901,7 @@
RexxObject *RexxSource::parseConditional(
PINT condition_type, /* type of condition */
- INT error_message ) /* extra "stuff" error message */
+ int error_message ) /* extra "stuff" error message */
/******************************************************************************/
/* Function: Allow for WHILE or UNTIL keywords following some other looping */
/* construct. This returns SUBKEY_WHILE or SUBKEY_UNTIL to flag */
@@ -4909,7 +4909,7 @@
/******************************************************************************/
{
RexxToken *token; /* current working token */
- INT _keyword; /* keyword of parsed conditional */
+ int _keyword; /* keyword of parsed conditional */
RexxObject *_condition; /* parsed out condition */
_condition = OREF_NULL; /* default to no condition */
Modified: sandbox/mark/os2-types/kernel/parser/SourceFile.hpp
===================================================================
--- sandbox/mark/os2-types/kernel/parser/SourceFile.hpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/parser/SourceFile.hpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -122,7 +122,7 @@
BOOL nextSpecial(UINT, PLOCATIONINFO);
UINT locateToken(RexxToken *);
void globalSetup();
- RexxString *packLiteral(INT, INT, INT);
+ RexxString *packLiteral(int, int, int);
RexxMethod *method();
RexxMethod *interpretMethod(RexxDirectory *);
RexxMethod *interpret(RexxString *, RexxDirectory *, size_t);
@@ -194,13 +194,13 @@
void blockError(RexxInstruction *);
RexxSource *classNewBuffered(RexxString *, RexxBuffer *);
RexxSource *classNewFile(RexxString *);
- RexxObject *sourceNewObject(size_t, RexxBehaviour *, INT);
+ RexxObject *sourceNewObject(size_t, RexxBehaviour *, int);
void parseTraceSetting(RexxString *, PINT, PINT);
- size_t processVariableList(INT);
- RexxObject *parseConditional(PINT, INT);
+ size_t processVariableList(int);
+ RexxObject *parseConditional(int *, int);
RexxObject *parseLogical(RexxToken *first, int terminators);
- BOOL terminator(INT, RexxToken *);
+ BOOL terminator(int, RexxToken *);
BOOL traceable(void);
inline void install(RexxActivation *activation) { if (this->flags&_install) this->processInstall(activation); };
@@ -251,11 +251,11 @@
RexxInstruction *forwardNew();
void RexxInstructionForwardCreate(RexxInstructionForward *);
RexxInstruction *guardNew();
- RexxInstruction *ifNew(INT);
+ RexxInstruction *ifNew(int);
RexxInstruction *instructionNew(int);
RexxInstruction *interpretNew();
RexxInstruction *labelNew();
- RexxInstruction *leaveNew(INT);
+ RexxInstruction *leaveNew(int);
RexxInstruction *messageNew(RexxExpressionMessage *);
RexxInstruction *messageAssignmentNew(RexxExpressionMessage *, RexxObject *);
RexxInstruction *messageAssignmentOpNew(RexxExpressionMessage *, RexxToken *, RexxObject *);
@@ -263,9 +263,9 @@
RexxInstruction *numericNew();
RexxInstruction *optionsNew();
RexxInstruction *otherwiseNew(RexxToken *);
- RexxInstruction *parseNew(INT);
+ RexxInstruction *parseNew(int);
RexxInstruction *procedureNew();
- RexxInstruction *queueNew(INT);
+ RexxInstruction *queueNew(int);
RexxInstruction *raiseNew();
RexxInstruction *replyNew();
RexxInstruction *returnNew();
Modified: sandbox/mark/os2-types/kernel/platform/unix/APIDefinitions.h
===================================================================
--- sandbox/mark/os2-types/kernel/platform/unix/APIDefinitions.h 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/unix/APIDefinitions.h 2007-10-31 04:36:56 UTC (rev 1164)
@@ -95,8 +95,8 @@
/* Semaphore control structure. Used for the rexxutil semaphores */
typedef struct _SEMCONT {
char name[MAXNAME]; /* semaphore name */
- INT usecount; /* semaphore usecount */
- INT type; /* semaphore type: 0=Event */
+ int usecount; /* semaphore usecount */
+ int type; /* semaphore type: 0=Event */
/* 1=Mutex */
BOOL waitandreset; /* eventsem second new arg */
} SEMCONT;
Modified: sandbox/mark/os2-types/kernel/platform/unix/ErrorMessages.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/platform/unix/ErrorMessages.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/unix/ErrorMessages.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -89,7 +89,7 @@
#endif
RexxString * SysMessageText( /* simplified whole code */
- INT code ) /* message code to extract */
+ int code ) /* message code to extract */
/****************************************************************************/
/* Function: Return a message from the message catalog, including header. */
/****************************************************************************/
@@ -159,7 +159,7 @@
RexxString * SysMessageHeader(
- INT code ) /* message code to extract */
+ int code ) /* message code to extract */
/****************************************************************************/
/* Function: Return a message header derived from the in-store error table */
/****************************************************************************/
Modified: sandbox/mark/os2-types/kernel/platform/unix/ExternalFunctions.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/platform/unix/ExternalFunctions.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/unix/ExternalFunctions.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -126,7 +126,7 @@
ULONG size; /* size of the saved memory */
} ENVENTRY;
-INT putflag = 0; /* static or dynamic env memory */
+int putflag = 0; /* static or dynamic env memory */
REXXOBJECT BuildEnvlist(void);
RexxMethod *SysRestoreProgramBuffer(PRXSTRING, RexxString *);
Modified: sandbox/mark/os2-types/kernel/platform/unix/FileSystem.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/platform/unix/FileSystem.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/unix/FileSystem.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -496,7 +496,7 @@
/*******************************************************************/
{
FILE *handle; /* open file access handle */
- INT buffersize; /* size of read buffer */
+ size_t buffersize; /* size of read buffer */
RexxBuffer * buffer; /* buffer object to read file into */
RexxActivity*activity; /* the current activity */
Modified: sandbox/mark/os2-types/kernel/platform/unix/RexxQueues.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/platform/unix/RexxQueues.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/unix/RexxQueues.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -141,7 +141,7 @@
/*****************************************************************************/
long rexx_add_queue(
REXXOBJECT queue_line, /* line to add */
- INT order ) /* queuing order */
+ int order ) /* queuing order */
{
RXSTRING rx_string; /* rxstring to return */
APIRET rc; /* queue return code */
Modified: sandbox/mark/os2-types/kernel/platform/unix/SystemCommands.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/platform/unix/SystemCommands.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/unix/SystemCommands.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -97,7 +97,7 @@
#define UNSET_FLAG 3
#define MAX_VALUE 1280
-extern INT putflag;
+extern int putflag;
extern char **environ;
@@ -188,7 +188,7 @@
RexxString * command, /* command to issue */
RexxString ** error_failure ) /* error or failure flags */
{
- INT rc = 0; /* Return code from call */
+ int rc = 0; /* Return code from call */
const char *current_address; /* Subcom handler that gets cmd */
RXSTRING rxstrcmd; /* Command to be executed */
unsigned short flags = 0; /* Subcom error flags */
@@ -318,7 +318,7 @@
ULONG size, allocsize; /* size of the string */
char **Environment; /* environment pointer */
char *np;
- INT i,j,k,l,iLength, copyval;
+ size_t i,j,k,l,iLength, copyval;
char namebufcurr[1281]; /* buf for extracted name */
char cmd_name[1281]; /* name of the envvariable setting */
char *array, *runarray, *runptr, *endptr, *maxptr;
Modified: sandbox/mark/os2-types/kernel/platform/windows/RexxMain.cpp
===================================================================
--- sandbox/mark/os2-types/kernel/platform/windows/RexxMain.cpp 2007-10-31 04:16:57 UTC (rev 1163)
+++ sandbox/mark/os2-types/kernel/platform/windows/RexxMain.cpp 2007-10-31 04:36:56 UTC (rev 1164)
@@ -83,7 +83,7 @@
#include <io.h>
#ifdef TIMESLICE /* System Yielding function prototype*/
-INT REXXENTRY RexxSetYield(PID procid, TID threadid);
+int REXXENTRY RexxSetYield(PID procid, TID threadid);
#ifdef HIGHTID
extern ActivityTable * ProcessLocalActs; /* needed for halt and trace */
#endif
@@ -955,7 +955,7 @@
/* a system yield via activity_relinquish. */
/* */
/******************************************************************************/
-INT REXXENTRY RexxSetYield(PID procid, TID threadid)
+int REXXENTRY RexxSetYield(PID procid, TID threadid)
{
// threadid=1L; // until we can figure out tid
if (RexxQuery()) { /* Are we up? */
@@ -985,7 +985,7 @@
APIRET REXXENTRY RexxSetHalt(PID procid, TID threadid)
{
APIRET res = RXARI_NOT_FOUND;
- INT i;
+ int i;
if (RexxQuery()) { /* Are we up? */
if (!threadid)
@@ -1036,7 +1036,7 @@
APIRET InternSetResetTrace(PID procid, TID threadid, BOOL flag)
{
APIRET res = RXARI_NOT_FOUND;
- INT i;
+ int i;
if (RexxQuery()) { /* Are we up? */
if (!threadid)
@@ -1559,15 +1559,15 @@
char vbuf4[] = "\nare made available under the terms of the Common Public License v1.0";
char vbuf5[] = "\nwhich accompanies this distribution.";
char vbuf6[] = "\nhttp://www.oorexx.org/license.html";
- INT s0 = strlen(vbuf0);
- INT s1 = strlen(vbuf1);
- INT s2 = strlen(vbuf2);
- INT s3 = strlen(vbuf3);
- INT s4 = strlen(vbuf4);
- INT s5 = strlen(vbuf5);
- INT s6 = strlen(vbuf6);
- INT sd = strlen(__DATE__);
- INT sv = strlen(ver);
+ int s0 = strlen(vbuf0);
+ int s1 = strlen(vbuf1);
+ int s2 = strlen(vbuf2);
+ int s3 = strlen(vbuf3);
+ int s4 = strlen(vbuf4);
+ int s5 = strlen(vbuf5);
+ int s6 = strlen(vbuf6);
+ int sd = strlen(__DATE__);
+ int sv = strlen(ver);
char *ptr = (char *)GlobalAlloc(GMEM_FIXED, sv+s0+s1+s2+s3+s4+s5+s6+sd+1);
if (ptr)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|