int a;
a.OnGetString(0,0,0);
a.OnFree();
- a.OnCopy(null);
- a.OnCompare(null);
+ a.OnCopy(0);
+ a.OnCompare(0);
a.OnSaveEdit(null,0);
- a.OnEdit(null,null,0,0,0,0,0);
- a.OnDisplay(null,0,0,0,0,null,null);
+ a.OnEdit(null,null,0,0,0,20,0);
a.OnGetDataFromString(null);
}
+#define uint _uint
+#include <stdarg.h>
+#include <stdio.h>
+#undef uint
+
default:
+FILE *eC_stdout(void);
+FILE *eC_stderr(void);
+
extern int __ecereVMethodID_class_OnGetString;
extern int __ecereVMethodID_class_OnGetDataFromString;
extern int __ecereVMethodID_class_OnCompare;
extern int __ecereVMethodID_class_OnCopy;
public:
-// TOFIX: Declaration ordering
+#if defined(ECERE_BOOTSTRAP) || defined(ECERE_STATIC)
+#define dllexport
+#endif
+
+// TOFIX: Declaration ordering (Required on gcc 3.4.5)
dllexport void eSystem_Delete(void * memory);
public class IOChannel
/*static */char * Enum_OnGetString(Class _class, int * data, char * tempString, void * fieldData, bool * needClass)
{
- EnumClassData enumeration = (EnumClassData)_class.data;
- NamedLink item;
- for(item = enumeration.values.first; item; item = item.next)
- if((int)item.data == *data)
- break;
+ NamedLink item = null;
+ Class b;
+ for(b = _class; !item && b && b.type == enumClass; b = b.base)
+ {
+ EnumClassData enumeration = (EnumClassData)b.data;
+ for(item = enumeration.values.first; item; item = item.next)
+ if((int)item.data == *data)
+ break;
+ }
if(item)
{
strcpy(tempString, item.name);
static bool Enum_OnGetDataFromString(Class _class, int * data, char * string)
{
- EnumClassData enumeration = (EnumClassData)_class.data;
- NamedLink item;
- for(item = enumeration.values.first; item; item = item.next)
+ NamedLink item = null;
+ Class b;
+ for(b = _class; !item && b && b.type == enumClass; b = b.base)
{
- if(item.name && !strcmpi(item.name, string))
- break;
+ EnumClassData enumeration = (EnumClassData)_class.data;
+ for(item = enumeration.values.first; item; item = item.next)
+ {
+ if(item.name && !strcmpi(item.name, string))
+ break;
+ }
}
if(item)
{
if(memberType.type == structClass || memberType.type == normalClass || memberType.type == noHeadClass)
{
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType,
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType,
(byte *)data1 + member.offset,
(byte *)data2 + member.offset);
if(memberResult)
DataValue value1, value2;
value1.i = *(int *)((byte *)data1 + member.offset);
value2.i = *(int *)((byte *)data2 + member.offset);
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType, &value1, &value2);
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType, &value1, &value2);
if(memberResult)
return memberResult;
}
for(member = _class.membersAndProperties.first; member; member = member.next)
{
int memberResult = 0;
+ if(member.id < 0) continue;
if(member.isProperty || member.type == normalMember)
{
Class memberType = member.dataTypeClass;
{
if(!strcmp(memberType.dataTypeString, "char *"))
{
- String a = ((String(*)())(void *)prop.Get)(data1);
- String b = ((String(*)())(void *)prop.Get)(data2);
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType, a, b);
+ String a = ((String(*)(void *))(void *)prop.Get)(data1);
+ String b = ((String(*)(void *))(void *)prop.Get)(data2);
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType, a, b);
}
}
else
DataValue value1, value2;
if(!strcmp(memberType.dataTypeString, "float"))
{
- value1.f = ((float(*)())(void *)prop.Get)(data1);
- value2.f = ((float(*)())(void *)prop.Get)(data2);
+ value1.f = ((float(*)(void *))(void *)prop.Get)(data1);
+ value2.f = ((float(*)(void *))(void *)prop.Get)(data2);
}
else
{
- value1.i = prop.Get(data1);
- value2.i = prop.Get(data2);
+ value1.i = ((int(*)(void*))(void *)prop.Get)(data1);
+ value2.i = ((int(*)(void*))(void *)prop.Get)(data2);
}
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType, &value1, &value2);
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType, &value1, &value2);
}
}
}
if(memberType.type == normalClass || memberType.type == noHeadClass)
{
// TESTING THIS!
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType,
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType,
*(void **)((byte *)data1 + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset)),
*(void **)((byte *)data2 + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset)));
}
else
{
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType,
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType,
(byte *)data1 + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset),
(byte *)data2 + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset));
}
value1.i = *(int *)((byte *)data1 + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset));
value2.i = *(int *)((byte *)data2 + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset));
}
- memberResult = memberType._vTbl[__ecereVMethodID_class_OnCompare](memberType, &value1, &value2);
+ memberResult = ((int (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnCompare])(memberType, &value1, &value2);
}
}
}
else if(_class.type == unitClass)
{
Class dataType = eSystem_FindClass(module, _class.dataTypeString);
- return dataType._vTbl[__ecereVMethodID_class_OnCompare](dataType, data1, data2);
+ return ((int (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCompare])(dataType, data1, data2);
}
else
{
int result = 0;
if(data1 && data2)
{
- if(*(void **)data1 > *(void **)data2)
- result = 1;
- else if(*(void **)data1 < *(void **)data2)
- result = -1;
+ if(_class.typeSize == 8)
+ {
+ if(*(uint64 *)data1 > *(uint64 *)data2)
+ result = 1;
+ else if(*(uint64 *)data1 < *(uint64 *)data2)
+ result = -1;
+ }
+ else
+ {
+ if(*(uint *)data1 > *(uint *)data2)
+ result = 1;
+ else if(*(uint *)data1 < *(uint *)data2)
+ result = -1;
+ }
}
else if(!data1 && data2)
return 1;
{
// WHY DOES _class.module NOT SEEM TO WORK?
Module module = _class.templateClass ? _class.templateClass.module : _class.module;
- if(_class.type == enumClass)
+ if(_class.type == normalClass && _class.base && !_class.base.base)
+ {
+ if(sizeof(uintsize) == 8)
+ return UInt64Hex_OnGetString(_class, (void *)&data, tempString, fieldData, needClass);
+ else
+ return UIntegerHex_OnGetString(_class, (void *)&data, tempString, fieldData, needClass);
+ }
+ else if(_class.type == enumClass)
{
return Enum_OnGetString(_class, data, tempString, fieldData, needClass);
}
else if(_class.type == unitClass)
{
- Class dataType = eSystem_FindClass(module, _class.dataTypeString);
- return (char *)dataType._vTbl[__ecereVMethodID_class_OnGetString](dataType, data, tempString, fieldData, needClass);
+ Class dataType;
+ Property prop;
+ for(prop = _class.conversions.first; prop; prop = prop.next)
+ {
+ bool refProp = false;
+ Class c;
+ if(!strcmp(prop.name, _class.base.fullName))
+ refProp = true;
+ else if( (c = eSystem_FindClass(_class.module, prop.name) ) )
+ {
+ Property p;
+ for(p = c.conversions.first; p; p = p.next)
+ {
+ if(!strcmp(p.name, _class.base.fullName) && !p.Set && !p.Get)
+ {
+ refProp = true;
+ break;
+ }
+ }
+ }
+ if(refProp)
+ {
+ if(prop.Set && prop.Get)
+ {
+ String dts = _class.base.dataTypeString;
+ if(!strcmp(dts, "double"))
+ {
+ double d = ((double(*)(double))(void *)prop.Set)(*(double *)data);
+ return ((char *(*)(void *, void *, char *, void *, bool *))(void *)class(double)._vTbl[__ecereVMethodID_class_OnGetString])(class(double), &d, tempString, fieldData, needClass);
+ }
+ else if(!strcmp(dts, "float"))
+ {
+ float d = ((float(*)(float))(void *)prop.Set)(*(float *)data);
+ return ((char *(*)(void *, void *, char *, void *, bool *))(void *)class(float)._vTbl[__ecereVMethodID_class_OnGetString])(class(float), &d, tempString, fieldData, needClass);
+ }
+ else if(!strcmp(dts, "int"))
+ {
+ int d = ((int(*)(int))(void *)prop.Set)(*(int *)data);
+ return ((char *(*)(void *, void *, char *, void *, bool *))(void *)class(int)._vTbl[__ecereVMethodID_class_OnGetString])(class(int), &d, tempString, fieldData, needClass);
+ }
+ else if(!strcmp(dts, "int64"))
+ {
+ int64 d = ((int64(*)(int64))(void *)prop.Set)(*(int64 *)data);
+ return ((char *(*)(void *, void *, char *, void *, bool *))(void *)class(int64)._vTbl[__ecereVMethodID_class_OnGetString])(class(int64), &d, tempString, fieldData, needClass);
+ }
+ }
+ else
+ break;
+ }
+ }
+ dataType = eSystem_FindClass(module, _class.dataTypeString);
+ return ((char *(*)(void *, void *, char *, void *, bool *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetString])(dataType, data, tempString, fieldData, needClass);
}
else
{
char memberString[1024];
Class memberType = member.dataTypeClass;
char * name = member.name;
+ if(member.id < 0) continue;
memberString[0] = 0;
DataValue value = { 0 };
if(!strcmp(prop.dataTypeString, "float"))
{
- value.f = ((float(*)())(void *)prop.Get)(data);
+ value.f = ((float(*)(void *))(void *)prop.Get)(data);
if(value.f)
{
bool needClass = true;
- char * result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, &value, memberString, null, &needClass);
+ char * result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, memberString, null, &needClass);
if(result && result != memberString)
strcpy(memberString, result);
// TESTING THIS HERE
strcat(memberString, "f");
}
}
+ else if(memberType.type == normalClass || memberType.type == noHeadClass)
+ {
+ value.p = ((void *(*)(void *))(void *)prop.Get)(data);
+ if(value.p || prop.IsSet)
+ {
+ bool needClass = true;
+ char * result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType,
+ (memberType.type == normalClass) ? value.p : &value, memberString, null, &needClass);
+ if(result && result != memberString)
+ strcpy(memberString, result);
+ }
+ }
else
{
- value.i = prop.Get(data);
+ value.i = ((int(*)(void *))(void *)prop.Get)(data);
if(value.i || prop.IsSet)
{
bool needClass = true;
- char * result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType,
- (memberType.type == normalClass) ? value.p : &value, memberString, null, &needClass);
+ char * result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, memberString, null, &needClass);
if(result && result != memberString)
strcpy(memberString, result);
}
char internalMemberString[1024];
byte * memberData = ((byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset));
int c;
- for(c = 0; c < memberType.structSize; c++)
+ uint typeSize = (memberType.type == normalClass) ? memberType.typeSize : memberType.structSize;
+ for(c = 0; c < typeSize; c++)
if(memberData[c])
break;
- if(c < memberType.structSize)
+ if(c < typeSize)
{
bool needClass = true;
char * result;
if(memberType.type == normalClass)
- result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, *(Instance *)memberData, internalMemberString, null, &needClass);
+ result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, *(Instance *)memberData, internalMemberString, null, &needClass);
else
- result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, memberData, internalMemberString, null, &needClass);
- if(needClass)
+ result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, memberData, internalMemberString, null, &needClass);
+ if(needClass && strcmp(memberType.dataTypeString, "char *"))
{
//strcpy(memberString, memberType.name);
strcat(memberString, "{ ");
{
bool needClass = true;
char internalMemberString[1024];
- char * result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, &value, internalMemberString, null, &needClass);
+ char * result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, internalMemberString, null, &needClass);
if(needClass && memberType.type != systemClass && memberType.type != enumClass && memberType.type != unitClass)
{
if(value.i)
{
bool needClass = true;
- char * result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, &value, memberString, null, &needClass);
+ char * result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, memberString, null, &needClass);
if(result && memberString != result)
strcpy(memberString, result);
}
else
{
bool needClass = true;
- char * result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, ((byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset)), memberString, null, &needClass);
+ char * result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, ((byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset)), memberString, null, &needClass);
if(result && memberString != result)
strcpy(memberString, result);
}
byte * memberData = ((byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset));
bool needClass = true;
char * result;
- result = (char *)memberType._vTbl[__ecereVMethodID_class_OnGetString](memberType, memberData, internalMemberString, null, &needClass);
+ result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, memberData, internalMemberString, null, &needClass);
if(needClass)
{
//strcpy(memberString, memberType.name);
result = Enum_OnGetDataFromString(_class, (int *)data, string);
else if(_class.type == unitClass)
{
- Class dataType = eSystem_FindClass(module, _class.dataTypeString);
- return dataType._vTbl[__ecereVMethodID_class_OnGetDataFromString](dataType, data, string);
+ Class dataType;
+ Property prop;
+ for(prop = _class.conversions.first; prop; prop = prop.next)
+ {
+ bool refProp = false;
+ Class c;
+ if(!strcmp(prop.name, _class.base.fullName))
+ refProp = true;
+ else if( (c = eSystem_FindClass(_class.module, prop.name) ) )
+ {
+ Property p;
+ for(p = c.conversions.first; p; p = p.next)
+ {
+ if(!strcmp(p.name, _class.base.fullName) && !p.Set && !p.Get)
+ {
+ refProp = true;
+ break;
+ }
+ }
+ }
+ if(refProp)
+ {
+ if(prop.Set && prop.Get)
+ {
+ String dts = _class.base.dataTypeString;
+ if(!strcmp(dts, "double"))
+ {
+ double d;
+ bool result = ((bool (*)(void *, void *, const char *))(void *)class(double)._vTbl[__ecereVMethodID_class_OnGetDataFromString])(class(double), &d, string);
+ *(double *)data =((double(*)(double))(void *)prop.Get)(d);
+ return result;
+ }
+ else if(!strcmp(dts, "float"))
+ {
+ float d;
+ bool result = ((bool (*)(void *, void *, const char *))(void *)class(float)._vTbl[__ecereVMethodID_class_OnGetDataFromString])(class(float), &d, string);
+ *(float *)data = ((float(*)(float))(void *)prop.Get)(d);
+ return result;
+ }
+ else if(!strcmp(dts, "int"))
+ {
+ int d;
+ bool result = ((bool (*)(void *, void *, const char *))(void *)class(int)._vTbl[__ecereVMethodID_class_OnGetDataFromString])(class(int), &d, string);
+ *(int *)data = ((int(*)(int))(void *)prop.Get)(d);
+ return result;
+ }
+ else if(!strcmp(dts, "int64"))
+ {
+ int64 d;
+ bool result = ((bool (*)(void *, void *, const char *))(void *)class(int64)._vTbl[__ecereVMethodID_class_OnGetDataFromString])(class(int64), &d, string);
+ *(int64 *)data = ((int64(*)(int64))(void *)prop.Get)(d);
+ return result;
+ }
+ }
+ else
+ break;
+ }
+ }
+ dataType = eSystem_FindClass(module, _class.dataTypeString);
+ return ((bool (*)(void *, void *, const char *))(void *)dataType._vTbl[__ecereVMethodID_class_OnGetDataFromString])(dataType, data, string);
}
else if(!string[0] && _class.type == normalClass)
{
{
if(thisMember)
{
- if(!memberType._vTbl[__ecereVMethodID_class_OnGetDataFromString](memberType,
+ if(!((bool (*)(void *, void *, const char *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetDataFromString])(memberType,
(byte *)data + (((thisMember._class.type == normalClass) ? thisMember._class.offset : 0) + memberOffset), memberString))
result = false;
}
if(!OnGetDataFromString(memberType, &value, memberString))
result = false;
}
- else if(!memberType._vTbl[__ecereVMethodID_class_OnGetDataFromString](memberType, &value, memberString))
+ else if(!((bool (*)(void *, void *, const char *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetDataFromString])(memberType, &value, memberString))
result = false;
if(thisMember && !thisMember.isProperty)
{
*(int *)((byte *)data + (((thisMember._class.type == normalClass) ? thisMember._class.offset : 0) + thisMember.offset)) = value.i;
}
else if(thisMember.isProperty && ((Property)thisMember).Set)
- ((Property)thisMember).Set(data, value.i);
+ {
+ if(memberType.type == noHeadClass || memberType.type == normalClass || memberType.type == structClass)
+ ((void (*)(void *, void *))(void *)((Property)thisMember).Set)(data, value.p);
+ else
+ ((void (*)(void *, int))(void *)((Property)thisMember).Set)(data, value.i);
+ }
}
}
else
{
Class dataType = eSystem_FindClass(_class.module, _class.dataTypeString);
if(dataType)
- dataType._vTbl[__ecereVMethodID_class_OnCopy](dataType, data, newData);
+ ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnCopy])(dataType, data, newData);
}
- else if(_class.type != structClass && _class.type != systemClass)
+ else if(_class.type != structClass && (_class.type != systemClass || _class.byValueSystemClass))
{
*data = newData;
}
if(memberType.type == structClass || memberType.type == normalClass || memberType.type == noHeadClass)
{
- memberType._vTbl[__ecereVMethodID_class_OnSerialize](memberType, (byte *)data + member.offset, channel);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnSerialize])(memberType, (byte *)data + member.offset, channel);
}
else
{
DataValue value;
value.i = *(int *)((byte *)data + member.offset);
- memberType._vTbl[__ecereVMethodID_class_OnSerialize](memberType, &value);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnSerialize])(memberType, &value, channel);
}
}
else
{
Class dataType = eSystem_FindClass(module, _class.dataTypeString);
if(dataType)
- dataType._vTbl[__ecereVMethodID_class_OnSerialize](dataType, data, channel);
+ ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnSerialize])(dataType, data, channel);
}
else if(_class.type == normalClass || _class.type == noHeadClass || _class.type == structClass)
{
while(lastClass != _class)
{
DataMember member;
- for(; _class && (!_class.base || _class.base.type != systemClass) && _class != lastClass; _class = _class.base);
- lastClass = _class;
+ Class c;
+ for(c = _class; c && (!c.base || c.base.type != systemClass) && c.base != lastClass; c = c.base);
+ lastClass = c;
- for(member = _class.membersAndProperties.first; member; member = member.next)
+ for(member = c.membersAndProperties.first; member; member = member.next)
{
+ if(member.id < 0) continue;
if(member.isProperty || member.type == normalMember)
{
Class memberType = member.dataTypeClass;
{
value.i = prop.Get(data);
}
- memberType._vTbl[__ecereVMethodID_class_OnSerialize](memberType, &value, channel);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnSerialize])(memberType, &value, channel);
}
}*/
}
{
if(!strcmp(memberType.name, "String") || memberType.type == normalClass || memberType.type == noHeadClass)
{
- memberType._vTbl[__ecereVMethodID_class_OnSerialize](memberType, data ? (*(void **)((byte *)data + member._class.offset + member.offset)) : null, channel);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnSerialize])(memberType, data ? (*(void **)((byte *)data + member._class.offset + member.offset)) : null, channel);
}
else
- memberType._vTbl[__ecereVMethodID_class_OnSerialize](memberType, data ? (((byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset))) : null, channel);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnSerialize])(memberType, data ? (((byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset))) : null, channel);
}
}
else
if(memberType.type == structClass || memberType.type == normalClass || memberType.type == noHeadClass)
{
- memberType._vTbl[__ecereVMethodID_class_OnUnserialize](memberType, (byte *)data + member.offset, channel);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnUnserialize])(memberType, (byte *)data + member.offset, channel);
}
else
{
DataValue value;
- memberType._vTbl[__ecereVMethodID_class_OnUnserialize](memberType, &value, channel); // channel was missing here?
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnUnserialize])(memberType, &value, channel);
*(int *)((byte *)data + member.offset) = value.i;
}
}
{
Class dataType = eSystem_FindClass(module, _class.dataTypeString);
if(dataType)
- dataType._vTbl[__ecereVMethodID_class_OnUnserialize](dataType, data, channel);
+ ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnUnserialize])(dataType, data, channel);
}
else if(_class.type == normalClass || _class.type == noHeadClass || _class.type == structClass)
{
while(lastClass != _class)
{
DataMember member;
- for(; _class && (!_class.base || _class.base.type != systemClass) && _class != lastClass; _class = _class.base);
- lastClass = _class;
+ Class c;
+ for(c = _class; c && (!c.base || c.base.type != systemClass) && c.base != lastClass; c = c.base);
+ lastClass = c;
- for(member = _class.membersAndProperties.first; member; member = member.next)
+ for(member = c.membersAndProperties.first; member; member = member.next)
{
+ if(member.id < 0) continue;
if(member.isProperty || member.type == normalMember)
{
Class memberType = member.dataTypeClass;
else
{
DataValue value;
- memberType._vTbl[__ecereVMethodID_class_OnUnserialize](memberType, &value, channel);
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnUnserialize])(memberType, &value, channel);
prop.Set(data, value.i);
}
}*/
}
else
- memberType._vTbl[__ecereVMethodID_class_OnUnserialize](memberType,
+ ((void (*)(void *, void *, void *))(void *)memberType._vTbl[__ecereVMethodID_class_OnUnserialize])(memberType,
(byte *)data + (((member._class.type == normalClass) ? member._class.offset : 0) + member.offset), channel);
}
else
return false;
}
+static char * Int16_OnGetString(Class _class, short * data, char * string, void * fieldData, bool * needClass)
+{
+ sprintf(string, "%d", (int)*data);
+ return string;
+}
+
+static bool Int16_OnGetDataFromString(Class _class, short * data, char * string)
+{
+ char * end;
+ short result = (short)strtol(string, &end, 0);
+
+ if(end > string)
+ {
+ *data = result;
+ return true;
+ }
+ return false;
+}
+
+static int Int16_OnCompare(Class _class, short * data1, short * data2)
+{
+ int result = 0;
+ if(!data1 && !data2) result = 0;
+ else if(data1 && !data2) result = 1;
+ else if(!data1 && data2) result = -1;
+ else if(*data1 > *data2) result = 1;
+ else if(*data1 < *data2) result = -1;
+ return result;
+}
+
static int UInteger_OnCompare(Class _class, unsigned int * data1, unsigned int * data2)
{
int result = 0;
return string;
}
+static int UInt16_OnCompare(Class _class, uint16 * data1, unsigned int * data2)
+{
+ int result = 0;
+ if(!data1 && !data2) result = 0;
+ else if(data1 && !data2) result = 1;
+ else if(!data1 && data2) result = -1;
+ else if(*data1 > *data2) result = 1;
+ else if(*data1 < *data2) result = -1;
+ return result;
+}
+
+static char * UInt16_OnGetString(Class _class, uint16 * data, char * string, void * fieldData, bool * needClass)
+{
+ sprintf(string, "%u", (uint)*data);
+ return string;
+}
+
+
+static char * UIntegerHex_OnGetString(Class _class, unsigned int * data, char * string, void * fieldData, bool * needClass)
+{
+ sprintf(string, "%x", *data);
+ return string;
+}
+
static bool UInteger_OnGetDataFromString(Class _class, unsigned int * data, char * string)
{
char * end;
- uint result = strtoul(string, &end, 0);
+ uint result = (uint)strtoul(string, &end, 0);
+ if(end > string)
+ {
+ *data = result;
+ return true;
+ }
+ return false;
+}
+
+static bool UInt16_OnGetDataFromString(Class _class, uint16 * data, char * string)
+{
+ char * end;
+ uint16 result = (uint16)strtoul(string, &end, 0);
if(end > string)
{
*data = result;
return false;
}
+static int Int64_OnCompare(Class _class, int64 * data1, int64 * data2)
+{
+ int result = 0;
+ if(!data1 && !data2) result = 0;
+ else if(data1 && !data2) result = 1;
+ else if(!data1 && data2) result = -1;
+ else if(*data1 > *data2) result = 1;
+ else if(*data1 < *data2) result = -1;
+ return result;
+}
+
+static int UInt64_OnCompare(Class _class, uint64 * data1, uint64 * data2)
+{
+ int result = 0;
+ if(!data1 && !data2) result = 0;
+ else if(data1 && !data2) result = 1;
+ else if(!data1 && data2) result = -1;
+ else if(*data1 > *data2) result = 1;
+ else if(*data1 < *data2) result = -1;
+ return result;
+}
+
+static int IntPtr64_OnCompare(Class _class, int64 data1, int64 data2)
+{
+ int result = 0;
+ if(data1 > data2) result = 1;
+ else if(data1 < data2) result = -1;
+ return result;
+}
+
+static int IntPtr32_OnCompare(Class _class, int data1, int data2)
+{
+ int result = 0;
+ if(data1 > data2) result = 1;
+ else if(data1 < data2) result = -1;
+ return result;
+}
+
+static int UIntPtr64_OnCompare(Class _class, uint64 data1, uint64 data2)
+{
+ int result = 0;
+ if(data1 > data2) result = 1;
+ else if(data1 < data2) result = -1;
+ return result;
+}
+
+static int UIntPtr32_OnCompare(Class _class, uint32 data1, uint32 data2)
+{
+ int result = 0;
+ if(data1 > data2) result = 1;
+ else if(data1 < data2) result = -1;
+ return result;
+}
+
static char * Int64_OnGetString(Class _class, int64 * data, char * string, void * fieldData, bool * needClass)
{
sprintf(string, FORMAT64D, *data);
return string;
}
+static char * UInt64Hex_OnGetString(Class _class, uint64 * data, char * string, void * fieldData, bool * needClass)
+{
+ sprintf(string, FORMAT64HEX, *data);
+ return string;
+}
+
+static char * UIntPtr64_OnGetString(Class _class, uint64 data, char * string, void * fieldData, bool * needClass)
+{
+ return UInt64Hex_OnGetString(_class, &data, string, fieldData, needClass);
+}
+
+static char * UIntPtr32_OnGetString(Class _class, uint data, char * string, void * fieldData, bool * needClass)
+{
+ return UIntegerHex_OnGetString(_class, &data, string, fieldData, needClass);
+}
+
+static char * IntPtr64_OnGetString(Class _class, uint64 data, char * string, void * fieldData, bool * needClass)
+{
+ return Int64_OnGetString(_class, &data, string, fieldData, needClass);
+}
+
+static char * IntPtr32_OnGetString(Class _class, uint data, char * string, void * fieldData, bool * needClass)
+{
+ return Integer_OnGetString(_class, &data, string, fieldData, needClass);
+}
+
+static bool Int64_OnGetDataFromString(Class _class, uint64 * data, char * string)
+{
+ char * end;
+ uint64 result = _strtoi64(string, &end, 0);
+ if(end > string)
+ {
+ *data = result;
+ return true;
+ }
+ return false;
+}
+
+static bool UInt64_OnGetDataFromString(Class _class, uint64 * data, char * string)
+{
+ char * end;
+ uint64 result = _strtoui64(string, &end, 0);
+ if(end > string)
+ {
+ *data = result;
+ return true;
+ }
+ return false;
+}
+
/*static */void Byte_OnSerialize(Class _class, byte * data, IOChannel channel)
{
channel.WriteData(data, 1);
*data = 0;
}
-
/*static */void Int_OnSerialize(Class _class, int * data, IOChannel channel)
{
byte bytes[4];
channel.WriteData(bytes, 4);
}
+/*static */void IntPtr32_OnSerialize(Class _class, int data, IOChannel channel)
+{
+ byte bytes[4];
+ PUTXDWORD(bytes, data);
+ channel.WriteData(bytes, 4);
+}
+
/*static */void Int_OnUnserialize(Class _class, int * data, IOChannel channel)
{
byte bytes[4];
*data = 0;
}
+/*static */void Enum_OnSerialize(Class _class, int * data, IOChannel channel)
+{
+ Class dataType = strcmp(_class.dataTypeString, "int") ? eSystem_FindClass(_class.module, _class.dataTypeString) : null;
+ if(dataType)
+ ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnSerialize])(dataType, data, channel);
+ else
+ Int_OnSerialize(_class, data, channel);
+}
+
+/*static */void Enum_OnUnserialize(Class _class, int * data, IOChannel channel)
+{
+ Class dataType = strcmp(_class.dataTypeString, "int") ? eSystem_FindClass(_class.module, _class.dataTypeString) : null;
+ if(dataType)
+ ((void (*)(void *, void *, void *))(void *)dataType._vTbl[__ecereVMethodID_class_OnUnserialize])(dataType, data, channel);
+ else
+ Int_OnUnserialize(_class, data, channel);
+}
+
/*static */void Int64_OnSerialize(Class _class, int64 * data, IOChannel channel)
{
byte bytes[8];
channel.WriteData(bytes, 8);
}
+static void IntPtr64_OnSerialize(Class _class, int64 data, IOChannel channel)
+{
+ byte bytes[8];
+ PUTXQWORD(bytes, data);
+ channel.WriteData(bytes, 8);
+}
+
/*static */void Int64_OnUnserialize(Class _class, int64 * data, IOChannel channel)
{
byte bytes[8];
delete integerClass.dataTypeString;
integerClass.dataTypeString = CopyString("int64");
eClass_AddMethod(integerClass, "OnGetString", null, Int64_OnGetString, publicAccess);
-
- /*
- eClass_AddMethod(integerClass, "OnCompare", null, Integer64_OnCompare, publicAccess);
- eClass_AddMethod(integerClass, "OnGetString", null, Integer64_OnGetString, publicAccess);
- eClass_AddMethod(integerClass, "OnGetDataFromString", null, Integer64_OnGetDataFromString, publicAccess);
- */
+ eClass_AddMethod(integerClass, "OnCompare", null, Int64_OnCompare, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, Int64_OnGetDataFromString, publicAccess);
eClass_AddMethod(integerClass, "OnSerialize", null, Int64_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
eClass_AddMethod(integerClass, "OnSerialize", null, Word_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Word_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UInt16_OnCompare, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, UInt16_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInt16_OnGetDataFromString, publicAccess);
integerClass = eSystem_RegisterClass(normalClass, "short", null, 0, 0, null, null, module, baseSystemAccess, publicAccess);
integerClass.type = systemClass;
eClass_AddMethod(integerClass, "OnSerialize", null, Word_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Word_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, Int16_OnCompare, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, Int16_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, Int16_OnGetDataFromString, publicAccess);
/*
integerClass = eSystem_RegisterClass(normalClass, "uint32", null, 0, 0, null, null, module, baseSystemAccess);
integerClass.structSize = 0;
integerClass.typeSize = sizeof(uint64);
eClass_AddMethod(integerClass, "OnGetString", null, UInt64_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInt64_OnGetDataFromString, publicAccess);
eClass_AddMethod(integerClass, "OnSerialize", null, Int64_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UInt64_OnCompare, publicAccess);
integerClass = eSystem_RegisterClass(normalClass, "byte", null, 0, 0, null, null, module, baseSystemAccess, publicAccess);
integerClass.type = systemClass;
eClass_AddMethod(integerClass, "OnGetDataFromString", null, Byte_OnGetDataFromString, publicAccess);
eClass_AddMethod(integerClass, "OnSerialize", null, Byte_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Byte_OnUnserialize, publicAccess);
+
+ integerClass = eSystem_RegisterClass(normalClass, "intsize", null, 0, 0, null, null, module, baseSystemAccess, publicAccess);
+ integerClass.type = systemClass;
+ delete integerClass.dataTypeString;
+ integerClass.dataTypeString = CopyString("ssize_t");
+ integerClass.structSize = 0;
+ integerClass.typeSize = sizeof(intsize);
+ if(sizeof(intsize) == 8)
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, Int64_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, Int64_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, Int64_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, Int64_OnCompare, publicAccess);
+ }
+ else
+ {
+ eClass_AddMethod(integerClass, "OnCompare", null, Integer_OnCompare, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, Integer_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, Integer_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, Int_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int_OnUnserialize, publicAccess);
+ }
+
+ integerClass = eSystem_RegisterClass(normalClass, "uintsize", null, 0, 0, null, null, module, baseSystemAccess, publicAccess);
+ integerClass.type = systemClass;
+ delete integerClass.dataTypeString;
+ integerClass.dataTypeString = CopyString("size_t");
+ integerClass.structSize = 0;
+ integerClass.typeSize = sizeof(uintsize);
+ if(sizeof(uintsize) == 8)
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, UInt64Hex_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInt64_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, Int64_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UInt64_OnCompare, publicAccess);
+ }
+ else
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, UIntegerHex_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInteger_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, Int_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UInteger_OnCompare, publicAccess);
+ }
+
+ integerClass = eSystem_RegisterClass(normalClass, "uintptr", null, 0, 0, null, null, module, baseSystemAccess, publicAccess);
+ integerClass.type = systemClass;
+ delete integerClass.dataTypeString;
+ integerClass.dataTypeString = CopyString("uintptr_t");
+ integerClass.structSize = 0;
+ integerClass.typeSize = sizeof(uintptr);
+ integerClass.byValueSystemClass = true;
+ if(sizeof(uintptr) == 8)
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, UIntPtr64_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInt64_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, IntPtr64_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UIntPtr64_OnCompare, publicAccess);
+ }
+ else
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, UIntPtr32_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInteger_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, IntPtr32_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UIntPtr32_OnCompare, publicAccess);
+ }
+
+ integerClass = eSystem_RegisterClass(normalClass, "intptr", null, 0, 0, null, null, module, baseSystemAccess, publicAccess);
+ integerClass.type = systemClass;
+ delete integerClass.dataTypeString;
+ integerClass.dataTypeString = CopyString("intptr_t");
+ integerClass.structSize = 0;
+ integerClass.typeSize = sizeof(intptr);
+ integerClass.byValueSystemClass = true;
+ if(sizeof(intptr) == 8)
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, IntPtr64_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, Int64_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, IntPtr64_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, IntPtr64_OnCompare, publicAccess);
+ }
+ else
+ {
+ eClass_AddMethod(integerClass, "OnGetString", null, IntPtr32_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetDataFromString", null, Integer_OnGetDataFromString, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, IntPtr32_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnUnserialize", null, Int_OnUnserialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, IntPtr32_OnCompare, publicAccess);
+ }
}
// Float
{
Class enumClass = eSystem_FindClass(module, "enum");
- eClass_AddMethod(enumClass, "OnSerialize", null, Int_OnSerialize, publicAccess);
- eClass_AddMethod(enumClass, "OnUnserialize", null, Int_OnUnserialize, publicAccess);
+ eClass_AddMethod(enumClass, "OnSerialize", null, Enum_OnSerialize, publicAccess);
+ eClass_AddMethod(enumClass, "OnUnserialize", null, Enum_OnUnserialize, publicAccess);
// Data Types
RegisterClass_Integer(module);
RegisterClass_String(module);
}
-#define uint _uint
-#include <stdarg.h>
-#include <stdio.h>
-#undef uint
-
public int PrintStdArgsToBuffer(char * buffer, int maxLen, typed_object object, va_list args)
{
int len = 0;
if(data)
{
// TOFIX: OnGetString will need a maxLen as well
- result = (char *)_class._vTbl[__ecereVMethodID_class_OnGetString](_class, data, buffer + len, null, null);
+ result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)_class._vTbl[__ecereVMethodID_class_OnGetString])(_class, data, buffer + len, null, null);
if(result)
{
int newLen = strlen(result);
return string;
}
+#if defined(__ANDROID__)
+#include <android/log.h>
+#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "ecere-app", __VA_ARGS__))
+#endif
+
public void PrintLn(typed_object object, ...)
{
va_list args;
va_start(args, object);
PrintStdArgsToBuffer(buffer, sizeof(buffer), object, args);
va_end(args);
+#if defined(__ANDROID__) && !defined(ECERE_NOFILE)
+ LOGI("%s", buffer);
+#else
puts(buffer);
+#endif
}
public void Print(typed_object object, ...)
va_start(args, object);
PrintStdArgsToBuffer(buffer, sizeof(buffer), object, args);
va_end(args);
- fputs(buffer, stdout);
+ fputs(buffer, eC_stdout());
}
Ecere Software / sdk / blobdiff