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,20,0);
a.OnGetDataFromString(null);
/*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)
{
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;
{
// 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);
}
char memberString[1024];
Class memberType = member.dataTypeClass;
char * name = member.name;
+ if(member.id < 0) continue;
memberString[0] = 0;
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;
result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, *(Instance *)memberData, internalMemberString, null, &needClass);
else
result = ((char *(*)(void *, void *, char *, void *, bool *))(void *)memberType._vTbl[__ecereVMethodID_class_OnGetString])(memberType, memberData, internalMemberString, null, &needClass);
- if(needClass)
+ if(needClass && strcmp(memberType.dataTypeString, "char *"))
{
//strcpy(memberString, memberType.name);
strcat(memberString, "{ ");
if(dataType)
((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;
}
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;
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;
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;
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 true;
+ }
+ return false;
+}
+
static int Byte_OnCompare(Class _class, byte * data1, byte * data2)
{
int result = 0;
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;
*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];
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];
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.typeSize = sizeof(uintsize);
if(sizeof(uintsize) == 8)
{
- eClass_AddMethod(integerClass, "OnGetString", null, UInt64_OnGetString, publicAccess);
+ 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);
}
else
{
- eClass_AddMethod(integerClass, "OnCompare", null, UInteger_OnCompare, publicAccess);
- eClass_AddMethod(integerClass, "OnGetString", null, UInteger_OnGetString, publicAccess);
+ 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.dataTypeString = CopyString("uintptr_t");
integerClass.structSize = 0;
integerClass.typeSize = sizeof(uintptr);
+ integerClass.byValueSystemClass = true;
if(sizeof(uintptr) == 8)
{
- eClass_AddMethod(integerClass, "OnGetString", null, UInt64_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, UIntPtr64_OnGetString, publicAccess);
eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInt64_OnGetDataFromString, publicAccess);
- eClass_AddMethod(integerClass, "OnSerialize", null, Int64_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, IntPtr64_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
- eClass_AddMethod(integerClass, "OnCompare", null, UInt64_OnCompare, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, UIntPtr64_OnCompare, publicAccess);
}
else
{
- eClass_AddMethod(integerClass, "OnCompare", null, UInteger_OnCompare, publicAccess);
- eClass_AddMethod(integerClass, "OnGetString", null, UInteger_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, UIntPtr32_OnGetString, publicAccess);
eClass_AddMethod(integerClass, "OnGetDataFromString", null, UInteger_OnGetDataFromString, publicAccess);
- eClass_AddMethod(integerClass, "OnSerialize", null, Int_OnSerialize, 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.dataTypeString = CopyString("intptr_t");
integerClass.structSize = 0;
integerClass.typeSize = sizeof(intptr);
+ integerClass.byValueSystemClass = true;
if(sizeof(intptr) == 8)
{
- eClass_AddMethod(integerClass, "OnGetString", null, Int64_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, IntPtr64_OnGetString, publicAccess);
eClass_AddMethod(integerClass, "OnGetDataFromString", null, Int64_OnGetDataFromString, publicAccess);
- eClass_AddMethod(integerClass, "OnSerialize", null, Int64_OnSerialize, publicAccess);
+ eClass_AddMethod(integerClass, "OnSerialize", null, IntPtr64_OnSerialize, publicAccess);
eClass_AddMethod(integerClass, "OnUnserialize", null, Int64_OnUnserialize, publicAccess);
- eClass_AddMethod(integerClass, "OnCompare", null, Int64_OnCompare, publicAccess);
+ eClass_AddMethod(integerClass, "OnCompare", null, IntPtr64_OnCompare, publicAccess);
}
else
{
- eClass_AddMethod(integerClass, "OnCompare", null, Integer_OnCompare, publicAccess);
- eClass_AddMethod(integerClass, "OnGetString", null, Integer_OnGetString, publicAccess);
+ eClass_AddMethod(integerClass, "OnGetString", null, IntPtr32_OnGetString, publicAccess);
eClass_AddMethod(integerClass, "OnGetDataFromString", null, Integer_OnGetDataFromString, publicAccess);
- eClass_AddMethod(integerClass, "OnSerialize", null, Int_OnSerialize, 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);
}
}