Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx: [1115] sandbox/rick/warnings2/kernel
|
From: <bi...@us...> - 2007-10-28 11:43:52
|
Revision: 1115
http://oorexx.svn.sourceforge.net/oorexx/?rev=1115&view=rev
Author: bigrixx
Date: 2007-10-28 04:43:54 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
More warning removal
Modified Paths:
--------------
sandbox/rick/warnings2/kernel/classes/ClassClass.cpp
sandbox/rick/warnings2/kernel/classes/ClassClass.hpp
sandbox/rick/warnings2/kernel/runtime/RexxNativeMethod.cpp
sandbox/rick/warnings2/kernel/runtime/RexxSOMProxy.cpp
sandbox/rick/warnings2/kernel/runtime/RexxVariableDictionary.cpp
sandbox/rick/warnings2/kernel/runtime/Setup.cpp
sandbox/rick/warnings2/kernel/runtime/Utilities.cpp
Modified: sandbox/rick/warnings2/kernel/classes/ClassClass.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/ClassClass.cpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/classes/ClassClass.cpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -404,7 +404,7 @@
* creation, so we delay setting this attribute until the
* class is fully constructed.
*/
-void RexxClass::subClassable(PCHAR class_id, bool restricted)
+void RexxClass::subClassable(const char *class_id, bool restricted)
{
/* get a copy of the class instance */
/* behaviour mdict before the merge */
Modified: sandbox/rick/warnings2/kernel/classes/ClassClass.hpp
===================================================================
--- sandbox/rick/warnings2/kernel/classes/ClassClass.hpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/classes/ClassClass.hpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -86,7 +86,7 @@
RexxTable *getInstanceBehaviourDictionary();
RexxTable *getBehaviourDictionary();
RexxString *defaultName();
- void subClassable(PCHAR, bool);
+ void subClassable(const char *, bool);
RexxObject *defineMethod(RexxString *, RexxMethod *);
RexxObject *defineMethods(RexxTable *);
RexxObject *deleteMethod(RexxString *);
Modified: sandbox/rick/warnings2/kernel/runtime/RexxNativeMethod.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/runtime/RexxNativeMethod.cpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/runtime/RexxNativeMethod.cpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -52,20 +52,20 @@
extern "C" internalMethodEntry internalMethodTable[];
RexxNativeCode::RexxNativeCode(
- RexxString *procedure, /* procedure to load */
- RexxString *library, /* library to load from */
- PFN entry, /* Entry point address for method */
- LONG index ) /* internal method index */
+ RexxString *_procedure, /* procedure to load */
+ RexxString *_library, /* library to load from */
+ PFN _entry, /* Entry point address for method */
+ LONG _index ) /* internal method index */
/****************************************************************************/
/* Function: Initialize a REXX native code object */
/****************************************************************************/
{
- this->entry = entry; /* no resolved entry point yet */
- this->index = index; /* save the index */
+ this->entry = _entry; /* no resolved entry point yet */
+ this->index = _index; /* save the index */
/* save the library name */
- OrefSet(this, this->library, library);
+ OrefSet(this, this->library, _library);
/* save the procedure name */
- OrefSet(this, this->procedure, procedure);
+ OrefSet(this, this->procedure, _procedure);
}
void RexxNativeCode::reinit( /* reinitialize the nmethod entry */
@@ -203,8 +203,8 @@
}
RexxNativeCode *RexxNativeCodeClass::newClass(
- RexxString *procedure, /* procedure to load */
- RexxString *library ) /* library to load from */
+ RexxString *_procedure, /* procedure to load */
+ RexxString *_library ) /* library to load from */
/****************************************************************************/
/* Function: Create a new native method */
/****************************************************************************/
@@ -213,23 +213,23 @@
RexxDirectory *libinfo; /* Library info table for library */
PFN entry; /* routine entry point address */
- libinfo = this->load(library); /* Load the library. */
+ libinfo = this->load(_library); /* Load the library. */
if (libinfo != OREF_NULL) { /* library loaded ok? */
/* See if we already know about this */
/* method. */
- newMethod = (RexxNativeCode *)libinfo->entry(procedure);
+ newMethod = (RexxNativeCode *)libinfo->entry(_procedure);
if (newMethod == OREF_NULL) { /* not there yet? */
/* resolve the function address */
- entry = (PFN)SysLoadProcedure((RexxInteger *)libinfo->at(OREF_NULLSTRING), procedure);
+ entry = (PFN)SysLoadProcedure((RexxInteger *)libinfo->at(OREF_NULLSTRING), _procedure);
/* unknown, create a new one. */
/* Get new object */
- newMethod = new RexxNativeCode (procedure, library, entry, 0);
+ newMethod = new RexxNativeCode (_procedure, _library, entry, 0);
/* add this to the libraries table */
- libinfo->setEntry(procedure, (RexxObject *)newMethod);
+ libinfo->setEntry(_procedure, (RexxObject *)newMethod);
}
}
else {
- newMethod = new RexxNativeCode (procedure, library, NULL, 0);
+ newMethod = new RexxNativeCode (_procedure, _library, NULL, 0);
}
return (RexxNativeCode *)newMethod; /* return the new method */
}
Modified: sandbox/rick/warnings2/kernel/runtime/RexxSOMProxy.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/runtime/RexxSOMProxy.cpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/runtime/RexxSOMProxy.cpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -478,9 +478,9 @@
/* Returned: self */
/******************************************************************************/
{
- long longValue;
- longValue = this->longValue(NO_LONG);
- return new_integer(longValue);
+ long longVal;
+ longVal = this->longValue(NO_LONG);
+ return new_integer(longVal);
}
RexxObject *RexxSOMProxy::initProxy(RexxInteger *somobj)
@@ -956,21 +956,21 @@
/* Function: Create a new integer object */
/******************************************************************************/
{
- RexxSOMProxy *newObject; /* newly create object */
+ RexxSOMProxy *newObj; /* newly create object */
/* get a new object */
- newObject = new RexxSOMProxy;
+ newObj = new RexxSOMProxy;
/* add in the integer behaviour, and */
/* make sure old2new knows about it */
- BehaviourSet(newObject, this->instanceBehaviour);
+ BehaviourSet(newObj, this->instanceBehaviour);
/* set the default hash value */
/* does object have an UNINT method */
if (this->uninitDefined()) {
/* Make sure everyone is notified. */
- newObject->hasUninit();
+ newObj->hasUninit();
}
- return newObject; /* return the new object. */
+ return newObj; /* return the new object. */
}
Modified: sandbox/rick/warnings2/kernel/runtime/RexxVariableDictionary.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/runtime/RexxVariableDictionary.cpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/runtime/RexxVariableDictionary.cpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -59,21 +59,21 @@
/* Function: Copy a variable dictionary */
/******************************************************************************/
{
- RexxVariableDictionary *copy; /* copied object */
+ RexxVariableDictionary *copyObj; /* copied object */
/* create a new object */
- copy = new_variableDictionary(contents->mainSlotsSize());
- ClearObject(copy); /* clear this out */
+ copyObj = new_variableDictionary(contents->mainSlotsSize());
+ ClearObject(copyObj); /* clear this out */
/* copy the behaviour pointer */
- OrefSet(copy, copy->behaviour, this->behaviour);
- save(copy); /* protect from garbage collect */
+ OrefSet(copyObj, copyObj->behaviour, this->behaviour);
+ save(copyObj); /* protect from garbage collect */
/* copy the hash table */
- OrefSet(copy, copy->contents, (RexxHashTable *)this->contents->copy());
+ OrefSet(copyObj, copyObj->contents, (RexxHashTable *)this->contents->copy());
/* make sure we copy the scope too */
- OrefSet(copy, copy->scope, this->scope);
- copy->copyValues(); /* copy all of the variables */
- discard(hold(copy)); /* unlock the copy */
- return (RexxObject *)copy; /* return the new vdict */
+ OrefSet(copyObj, copyObj->scope, this->scope);
+ copyObj->copyValues(); /* copy all of the variables */
+ discard(hold(copyObj)); /* unlock the copy */
+ return (RexxObject *)copyObj; /* return the new vdict */
}
void RexxVariableDictionary::copyValues()
@@ -83,15 +83,15 @@
{
size_t i; /* loop counter */
RexxObject *value; /* hash table value */
- RexxObject *copy; /* copied value */
+ RexxObject *copyObj; /* copied value */
/* loop through the hash table */
for (i = this->contents->first();
i < this->contents->totalSlotsSize();
i = this->contents->next(i)) {
- value = this->contents->value(i); /* get the next value */
- copy = value->copy(); /* copy the value */
- this->contents->replace(copy, i); /* replace with the copied value */
+ value = this->contents->value(i); /* get the next value */
+ copyObj = value->copy(); /* copy the value */
+ this->contents->replace(copyObj, i); /* replace with the copied value */
}
}
@@ -111,7 +111,7 @@
RexxCompoundElement *RexxVariableDictionary::getCompoundVariable(
- RexxString *stem, /* name of stem for compound */
+ RexxString *stemName, /* name of stem for compound */
RexxObject **tail, /* tail of the compound element */
LONG tailCount) /* number of tail pieces */
/******************************************************************************/
@@ -123,14 +123,14 @@
/* new tail for compound */
RexxCompoundTail resolved_tail(this, tail, tailCount);
- stem_table = getStem(stem); /* get the stem entry from this dictionary */
+ stem_table = getStem(stemName); /* get the stem entry from this dictionary */
/* get the compound variable */
return stem_table->getCompoundVariable(&resolved_tail);
}
RexxObject *RexxVariableDictionary::getCompoundVariableValue(
- RexxString *stem, /* name of stem for compound */
+ RexxString *stemName, /* name of stem for compound */
RexxObject **tail, /* tail of the compound element */
LONG tailCount) /* number of tail pieces */
/******************************************************************************/
@@ -142,7 +142,7 @@
/* new tail for compound */
RexxCompoundTail resolved_tail(this, tail, tailCount);
- stem_table = getStem(stem); /* get the stem entry from this dictionary */
+ stem_table = getStem(stemName); /* get the stem entry from this dictionary */
/* get the value from the stem...we pass OREF_NULL */
/* for the dictionary to bypass NOVALUE handling */
return stem_table->evaluateCompoundVariableValue(OREF_NULL, &resolved_tail);
@@ -150,14 +150,14 @@
RexxObject *RexxVariableDictionary::realStemValue(
- RexxString *stem) /* name of stem for compound */
+ RexxString *stemName) /* name of stem for compound */
/******************************************************************************/
/* Function: Retrieve the "real" value of a stem variable. OREF_NULL is */
/* returned if the stem does not exist. */
/******************************************************************************/
{
/* look up the name */
- return this->getStem(stem); /* find and return the stem directly */
+ return this->getStem(stemName); /* find and return the stem directly */
}
@@ -195,7 +195,7 @@
RexxVariable *RexxVariableDictionary::createStemVariable(
- RexxString *stem) /* name of target stem */
+ RexxString *stemName) /* name of target stem */
/******************************************************************************/
/* Function: Lookup and retrieve a STEM variable item (not the stem table) */
/* level) */
@@ -205,13 +205,13 @@
RexxVariable *variable; /* resolved variable item */
RexxHashTable *new_hash; /* reallocated hash table */
- variable = new_variable(stem); /* make a new variable entry */
- stemtable = new RexxStem (stem); /* create a stem object as value */
+ variable = new_variable(stemName); /* make a new variable entry */
+ stemtable = new RexxStem (stemName); /* create a stem object as value */
/* the stem object is the value of */
/* stem variable */
variable->set((RexxObject *)stemtable);
/* try to place in existing hashtab */
- new_hash = this->contents->stringAdd((RexxObject *)variable, stem);
+ new_hash = this->contents->stringAdd((RexxObject *)variable, stemName);
if (new_hash != OREF_NULL) /* have a reallocation occur? */
/* hook on the new hash table */
OrefSet(this, this->contents, new_hash);
@@ -357,12 +357,12 @@
}
-void RexxVariableDictionary::setNextDictionary(RexxVariableDictionary *next)
+void RexxVariableDictionary::setNextDictionary(RexxVariableDictionary *_next)
/******************************************************************************/
/* Function: Chain up a dictionary associated with an object */
/******************************************************************************/
{
- OrefSet(this, this->next, next);
+ OrefSet(this, this->next, _next);
}
void RexxVariableDictionary::live()
@@ -415,7 +415,7 @@
/* Function: Create a new translator object */
/******************************************************************************/
{
- RexxVariableDictionary *newObject; /* newly created object */
+ RexxVariableDictionary *newObj; /* newly created object */
size_t hashTabSize; /* size of hash table to allocate */
hashTabSize = looksize * 2; /* create entries for twice size */
@@ -428,12 +428,12 @@
/* some special optimization of the */
/* look ups */
/* get a new object and hash */
- newObject = (RexxVariableDictionary *)new_hashCollection(hashTabSize, sizeof(RexxVariableDictionary));
+ newObj = (RexxVariableDictionary *)new_hashCollection(hashTabSize, sizeof(RexxVariableDictionary));
/* Give new object its behaviour */
- BehaviourSet(newObject, TheVariableDictionaryBehaviour);
+ BehaviourSet(newObj, TheVariableDictionaryBehaviour);
/* set the virtual function table */
- setVirtualFunctions(newObject, T_vdict);
- return newObject; /* return the new vdict */
+ setVirtualFunctions(newObj, T_vdict);
+ return newObj; /* return the new vdict */
}
@@ -443,7 +443,7 @@
/* Function: Create a new translator object */
/******************************************************************************/
{
- RexxVariableDictionary *newObject; /* newly created object */
+ RexxVariableDictionary *newObj; /* newly created object */
size_t hashTabSize; /* size of hash table to allocate */
/* create entries for twice size */
@@ -457,11 +457,11 @@
/* some special optimization of the */
/* look ups */
/* get a new object and hash */
- newObject = (RexxVariableDictionary *)new_hashCollection(hashTabSize, sizeof(RexxVariableDictionary));
- newObject->scope = scope; /* fill in the scope */
+ newObj = (RexxVariableDictionary *)new_hashCollection(hashTabSize, sizeof(RexxVariableDictionary));
+ newObj->scope = scope; /* fill in the scope */
/* Give new object its behaviour */
- BehaviourSet(newObject, TheVariableDictionaryBehaviour);
+ BehaviourSet(newObj, TheVariableDictionaryBehaviour);
/* set the virtual function table */
- setVirtualFunctions(newObject, T_vdict);
- return newObject; /* return the new vdict */
+ setVirtualFunctions(newObj, T_vdict);
+ return newObj; /* return the new vdict */
}
Modified: sandbox/rick/warnings2/kernel/runtime/Setup.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/runtime/Setup.cpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/runtime/Setup.cpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -546,13 +546,13 @@
NULL /* final terminating method */
};
-LONG resolveExportedMethod(
+size_t resolveExportedMethod(
PCPPM targetMethod ) /* method needed to resolve */
/******************************************************************************/
/* Function: Resolve a method address to numeric index */
/******************************************************************************/
{
- LONG i; /* loop counter */
+ size_t i; /* loop counter */
if (targetMethod == NULL) /* unresolved method address? */
/* this is a bad error */
@@ -633,11 +633,9 @@
memoryObject.enableOrefChecks(); /* enable setCheckOrefs... */
}
-LONG resolveExportedMethod(PCPPM);
-
RexxMethod * createKernelMethod(
PCPPM entryPoint, /* method entry point */
- LONG arguments) /* count of arguments */
+ size_t arguments) /* count of arguments */
/******************************************************************************/
/* Function: Create a primitive, C++ method object */
/******************************************************************************/
@@ -648,7 +646,7 @@
RexxMethod * createProtectedKernelMethod(
PCPPM entryPoint, /* method entry point */
- LONG arguments) /* count of arguments */
+ size_t arguments) /* count of arguments */
/******************************************************************************/
/* Function: Create a primitive, C++ method object */
/******************************************************************************/
@@ -662,7 +660,7 @@
RexxMethod * createPrivateKernelMethod(
PCPPM entryPoint, /* method entry point */
- LONG arguments) /* count of arguments */
+ size_t arguments) /* count of arguments */
/******************************************************************************/
/* Function: Create a primitive, C++ method object */
/******************************************************************************/
@@ -679,7 +677,7 @@
char * name, /* ASCII-Z name for the method */
RexxBehaviour * behaviour, /* behaviour to use */
PCPPM entryPoint, /* method's entry point */
- LONG arguments ) /* count of arguments */
+ size_t arguments ) /* count of arguments */
/******************************************************************************/
/* Function: Add a C++ method to an object's behaviour */
/******************************************************************************/
@@ -1623,8 +1621,10 @@
}
/* create a method object out of this*/
meth = TheMethodClass->newFile(programName);
+
+ RexxObject *args = kernel_methods; // temporary to avoid type-punning warnings
/* now call BaseClasses to finish the image*/
- ((RexxObject *)CurrentActivity)->shriekRun(meth, OREF_NULL, OREF_NULL, (RexxObject **)&kernel_methods, 1);
+ ((RexxObject *)CurrentActivity)->shriekRun(meth, OREF_NULL, OREF_NULL, (RexxObject **)&args, 1);
discard(kernel_methods); /* release the directory lock */
/* define and suppress methods in the nil object */
Modified: sandbox/rick/warnings2/kernel/runtime/Utilities.cpp
===================================================================
--- sandbox/rick/warnings2/kernel/runtime/Utilities.cpp 2007-10-28 01:14:24 UTC (rev 1114)
+++ sandbox/rick/warnings2/kernel/runtime/Utilities.cpp 2007-10-28 11:43:54 UTC (rev 1115)
@@ -105,7 +105,7 @@
primary = (new_string(errorcode->getStringData(), count)->longValue(9)) * 1000;
/* did major code compute to long */
/* and within range */
- if (primary == NO_LONG || primary < 1 || primary >= 100000) {
+ if (primary == (int)NO_LONG || primary < 1 || primary >= 100000) {
/* Nope raise an error. */
report_exception(Error_Expression_result_raise);
}
@@ -114,7 +114,7 @@
/* Yes, compute its decimal value. */
secondary = new_string(decimalPoint + 1, errorcode->getLength() - count -1)->longValue(9);
/* is the subcode invalid or too big?*/
- if (secondary == NO_LONG || secondary < 0 || secondary >= 1000) {
+ if (secondary == (int)NO_LONG || secondary < 0 || secondary >= 1000) {
/* Yes, raise an error. */
report_exception(Error_Expression_result_raise);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|