compiler/libec: Fixed wrong reference level causing crash in Key class

- Update bootstrap

diff --git a/compiler/bootstrap/ecc/bootstrap/ecc.c b/compiler/bootstrap/ecc/bootstrap/ecc.c
index e845368..ccb74a2 100644 (file)
--- a/compiler/bootstrap/ecc/bootstrap/ecc.c
+++ b/compiler/bootstrap/ecc/bootstrap/ecc.c
@@ -1058,14 +1058,13 @@ __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("byte"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("unsigned char", 0x0), ((struct Symbol *)__ecereTemp1)));
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("intptr_t"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("intptr", 0x0), ((struct Symbol *)__ecereTemp1)));
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("uintptr", 0x0), ((struct Symbol *)__ecereTemp1)));
-
 {
 struct GlobalData * data = (data = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_GlobalData), data->fullName = __ecereNameSpace__ecere__sys__CopyString("__thisModule"), data->dataTypeString = __ecereNameSpace__ecere__sys__CopyString("Module"), data->module = privateModule, data);
 
 data->key = (uintptr_t)data->fullName;
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalData.functions, (struct __ecereNameSpace__ecere__sys__BTNode *)data);
 }
-snprintf(command, sizeof command, "%s%s -x c -D_INTPTR_T_DEFINED -D_UINTPTR_T_DEFINED -E \"%s\"", cppCommand, cppOptions ? cppOptions : "", GetSourceFile());
+snprintf(command, sizeof command, "%s%s -x c -E -D_INTPTR_T_DEFINED -D_UINTPTR_T_DEFINED \"%s\"", cppCommand, cppOptions ? cppOptions : "", GetSourceFile());
 command[sizeof command - 1] = (char)0;
 if((cppOutput = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(0x1))), command)))
 {

diff --git a/compiler/bootstrap/ecere/bootstrap/instance.c b/compiler/bootstrap/ecere/bootstrap/instance.c
index b3f8e03..34de246 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/instance.c
+++ b/compiler/bootstrap/ecere/bootstrap/instance.c
@@ -1760,6 +1760,33 @@ id++;
 _class->memberID = _class->startMemberID = (base && (type == 0 || type == 5 || type == 1)) ? base->memberID : 0;
 if(type == 0 || type == 5)
 _class->offset = (base && base->structSize && base->type != 1000) ? base->structSize : ((type == 5) ? 0 : (force64Bits ? 24 : 12));
+if(force64Bits)
+{
+if(!strcmp(name, "ecere::com::Class"))
+size = 0;
+else if(!strcmp(name, "ecere::com::ClassProperty"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::BufferedFile"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::BTNode"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::StringBTNode"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::OldList"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::Item"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::NamedLink"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::OldLink"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::NamedItem"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::NamedItem64"))
+size = 0;
+else if(!strcmp(name, "ecere::sys::BinaryTree"))
+size = 0;
+}
 if(type == 1)
 {
 _class->memberOffset = (base && base->structSize && base->type != 1000) ? base->structSize : 0;
@@ -3336,7 +3363,6 @@ return _property;
 long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, char * name)
 {
 struct __ecereNameSpace__ecere__com__ClassProperty * _property = __ecereNameSpace__ecere__com__eClass_FindClassProperty(_class, name);
-char * propName = _property->name;
 
 if(_property && _property->Get && _property->Get != (void *)1)
 {
@@ -5154,7 +5180,7 @@ for(param = _class->templateParams.first; param; param = param->next)
 if(!strcmp(param->name, name))
 return param;
 }
-param = (__ecereTemp1 = __ecereNameSpace__ecere__com__eSystem_New0(36), ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(name), ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1)->type = type, ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1)->dataTypeString = (type == 1) ? info : __ecereNameSpace__ecere__sys__CopyString(info), ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1));
+param = (__ecereTemp1 = __ecereNameSpace__ecere__com__eSystem_New0(40), ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(name), ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1)->type = type, ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1)->dataTypeString = (type == 1) ? info : __ecereNameSpace__ecere__sys__CopyString(info), ((struct __ecereNameSpace__ecere__com__ClassTemplateParameter *)__ecereTemp1));
 if(defaultArg != (((void *)0)))
 {
 param->defaultArg = *defaultArg;

diff --git a/compiler/bootstrap/ecp/bootstrap/ecp.c b/compiler/bootstrap/ecp/bootstrap/ecp.c
index 39b70aa..5ff61f8 100644 (file)
--- a/compiler/bootstrap/ecp/bootstrap/ecp.c
+++ b/compiler/bootstrap/ecp/bootstrap/ecp.c
@@ -1575,7 +1575,6 @@ int memberType;
 } __attribute__ ((gcc_struct));
 struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
 void *  param;
-char __ecere_padding[4];
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__ClassTemplateParameter * __ecereNameSpace__ecere__com__eClass_AddTemplateParameter(struct __ecereNameSpace__ecere__com__Class * _class, char *  name, int type, void *  info, struct __ecereNameSpace__ecere__com__ClassTemplateArgument * defaultArg);
@@ -2702,6 +2701,8 @@ __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("uint32"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("unsigned int", 0x0), ((struct Symbol *)__ecereTemp1)));
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("uint16"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("unsigned short", 0x0), ((struct Symbol *)__ecereTemp1)));
 __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("byte"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("unsigned char", 0x0), ((struct Symbol *)__ecereTemp1)));
+__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("intptr_t"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("intptr", 0x0), ((struct Symbol *)__ecereTemp1)));
+__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)(__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"), ((struct Symbol *)__ecereTemp1)->type = ProcessTypeString("uintptr", 0x0), ((struct Symbol *)__ecereTemp1)));
 {
 char * outputFilePath = GetOutputFile();
 

diff --git a/compiler/bootstrap/include/stdlib.h b/compiler/bootstrap/include/stdlib.h
index 5427657..b63440b 100644 (file)
--- a/compiler/bootstrap/include/stdlib.h
+++ b/compiler/bootstrap/include/stdlib.h
@@ -1,7 +1,16 @@
 #ifndef BSL_STDLIB_H
 #define BSL_STDLIB_H
 
-typedef uintptr size_t; // For now, until we add uintsize
+// For now, until we add uintsize
+#ifdef __MINGW32__
+#ifdef _WIN64
+typedef long long unsigned int size_t;
+#else
+typedef unsigned int size_t;
+#endif
+#else
+typedef uintptr size_t;
+#endif
 
 /*
 #include <stddef.h>

diff --git a/compiler/bootstrap/libec/bootstrap/ast.c b/compiler/bootstrap/libec/bootstrap/ast.c
index 442cccd..b713fcf 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ast.c
+++ b/compiler/bootstrap/libec/bootstrap/ast.c
@@ -3090,7 +3090,6 @@ int memberType;
 } __attribute__ ((gcc_struct));
 struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
 void *  param;
-char __ecere_padding[4];
 } __attribute__ ((gcc_struct));
 
 void SetupBaseSpecs(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs)

diff --git a/compiler/bootstrap/libec/bootstrap/ecdefs.c b/compiler/bootstrap/libec/bootstrap/ecdefs.c
index dcbd5b1..6b01906 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ecdefs.c
+++ b/compiler/bootstrap/libec/bootstrap/ecdefs.c
@@ -925,7 +925,7 @@ struct __ecereNameSpace__ecere__com__Method * method;
 } __attribute__ ((gcc_struct));
 } __attribute__ ((gcc_struct));
 
-typedef unsigned int size_t;
+typedef uintptr_t size_t;
 
 void exit(int status);
 

diff --git a/compiler/bootstrap/libec/bootstrap/expression.c b/compiler/bootstrap/libec/bootstrap/expression.c
index b44c0ac..6c5392d 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/expression.c
+++ b/compiler/bootstrap/libec/bootstrap/expression.c
@@ -1002,7 +1002,7 @@ static const yytype_uint8 yystos[] =
 (unsigned char)0, (unsigned char)1, (unsigned char)3, (unsigned char)4, (unsigned char)5, (unsigned char)6, (unsigned char)8, (unsigned char)9, (unsigned char)28, (unsigned char)71, (unsigned char)72, (unsigned char)73, (unsigned char)102, (unsigned char)103, (unsigned char)109, (unsigned char)112, (unsigned char)114, (unsigned char)119, (unsigned char)120, (unsigned char)121, (unsigned char)122, (unsigned char)123, (unsigned char)124, (unsigned char)138, (unsigned char)139, (unsigned char)140, (unsigned char)142, (unsigned char)145, (unsigned char)146, (unsigned char)148, (unsigned char)149, (unsigned char)150, (unsigned char)151, (unsigned char)152, (unsigned char)153, (unsigned char)154, (unsigned char)155, (unsigned char)156, (unsigned char)157, (unsigned char)158, (unsigned char)159, (unsigned char)160, (unsigned char)161, (unsigned char)180, (unsigned char)181, (unsigned char)229, (unsigned char)231, (unsigned char)245, (unsigned char)112, (unsigned char)140, (unsigned char)143, (unsigned char)145, (unsigned char)147, (unsigned char)112, (unsigned char)146, (unsigned char)146, (unsigned char)29, (unsigned char)30, (unsigned char)31, (unsigned char)32, (unsigned char)33, (unsigned char)34, (unsigned char)35, (unsigned char)36, (unsigned char)37, (unsigned char)38, (unsigned char)39, (unsigned char)40, (unsigned char)41, (unsigned char)42, (unsigned char)43, (unsigned char)44, (unsigned char)45, (unsigned char)46, (unsigned char)47, (unsigned char)48, (unsigned char)49, (unsigned char)50, (unsigned char)66, (unsigned char)75, (unsigned char)85, (unsigned char)100, (unsigned char)167, (unsigned char)172, (unsigned char)179, (unsigned char)180, (unsigned char)182, (unsigned char)184, (unsigned char)185, (unsigned char)186, (unsigned char)194, (unsigned char)195, (unsigned char)146, (unsigned char)160, (unsigned char)164, (unsigned char)167, (unsigned char)164, (unsigned char)112, (unsigned char)147, (unsigned char)113, (unsigned char)161, (unsigned char)163, (unsigned char)166, (unsigned char)179, (unsigned char)180, (unsigned char)182, (unsigned char)184, (unsigned char)195, (unsigned char)214, (unsigned char)229, (unsigned char)135, (unsigned char)7, (unsigned char)8, (unsigned char)9, (unsigned char)112, (unsigned char)115, (unsigned char)116, (unsigned char)18, (unsigned char)19, (unsigned char)20, (unsigned char)21, (unsigned char)22, (unsigned char)23, (unsigned char)24, (unsigned char)25, (unsigned char)26, (unsigned char)27, (unsigned char)133, (unsigned char)162, (unsigned char)149, (unsigned char)120, (unsigned char)125, (unsigned char)126, (unsigned char)121, (unsigned char)122, (unsigned char)10, (unsigned char)11, (unsigned char)12, (unsigned char)13, (unsigned char)127, (unsigned char)128, (unsigned char)14, (unsigned char)15, (unsigned char)119, (unsigned char)129, (unsigned char)130, (unsigned char)16, (unsigned char)17, (unsigned char)131, (unsigned char)135, (unsigned char)0, (unsigned char)146, (unsigned char)214, (unsigned char)7, (unsigned char)8, (unsigned char)9, (unsigned char)112, (unsigned char)115, (unsigned char)116, (unsigned char)135, (unsigned char)138, (unsigned char)181, (unsigned char)112, (unsigned char)74, (unsigned char)79, (unsigned char)110, (unsigned char)111, (unsigned char)112, (unsigned char)116, (unsigned char)120, (unsigned char)172, (unsigned char)173, (unsigned char)174, (unsigned char)178, (unsigned char)179, (unsigned char)182, (unsigned char)184, (unsigned char)195, (unsigned char)199, (unsigned char)201, (unsigned char)209, (unsigned char)135, (unsigned char)138, (unsigned char)173, (unsigned char)181, (unsigned char)34, (unsigned char)35, (unsigned char)36, (unsigned char)37, (unsigned char)38, (unsigned char)39, (unsigned char)40, (unsigned char)41, (unsigned char)42, (unsigned char)43, (unsigned char)46, (unsigned char)47, (unsigned char)66, (unsigned char)100, (unsigned char)169, (unsigned char)172, (unsigned char)179, (unsigned char)181, (unsigned char)183, (unsigned char)184, (unsigned char)185, (unsigned char)194, (unsigned char)195, (unsigned char)116, (unsigned char)201, (unsigned char)169, (unsigned char)146, (unsigned char)214, (unsigned char)113, (unsigned char)118, (unsigned char)112, (unsigned char)116, (unsigned char)173, (unsigned char)179, (unsigned char)182, (unsigned char)184, (unsigned char)195, (unsigned char)198, (unsigned char)200, (unsigned char)209, (unsigned char)113, (unsigned char)115, (unsigned char)134, (unsigned char)135, (unsigned char)136, (unsigned char)141, (unsigned char)142, (unsigned char)160, (unsigned char)167, (unsigned char)216, (unsigned char)232, (unsigned char)238, (unsigned char)239, (unsigned char)240, (unsigned char)241, (unsigned char)242, (unsigned char)243, (unsigned char)244, (unsigned char)138, (unsigned char)113, (unsigned char)141, (unsigned char)144, (unsigned char)161, (unsigned char)138, (unsigned char)163, (unsigned char)141, (unsigned char)161, (unsigned char)149, (unsigned char)149, (unsigned char)149, (unsigned char)150, (unsigned char)150, (unsigned char)151, (unsigned char)151, (unsigned char)152, (unsigned char)152, (unsigned char)152, (unsigned char)152, (unsigned char)153, (unsigned char)153, (unsigned char)154, (unsigned char)155, (unsigned char)156, (unsigned char)157, (unsigned char)158, (unsigned char)163, (unsigned char)136, (unsigned char)244, (unsigned char)113, (unsigned char)113, (unsigned char)138, (unsigned char)113, (unsigned char)144, (unsigned char)138, (unsigned char)163, (unsigned char)138, (unsigned char)196, (unsigned char)197, (unsigned char)135, (unsigned char)135, (unsigned char)180, (unsigned char)113, (unsigned char)167, (unsigned char)201, (unsigned char)210, (unsigned char)211, (unsigned char)212, (unsigned char)164, (unsigned char)179, (unsigned char)208, (unsigned char)209, (unsigned char)199, (unsigned char)209, (unsigned char)112, (unsigned char)112, (unsigned char)116, (unsigned char)199, (unsigned char)68, (unsigned char)78, (unsigned char)112, (unsigned char)123, (unsigned char)134, (unsigned char)136, (unsigned char)138, (unsigned char)142, (unsigned char)167, (unsigned char)173, (unsigned char)187, (unsigned char)188, (unsigned char)189, (unsigned char)190, (unsigned char)191, (unsigned char)203, (unsigned char)204, (unsigned char)206, (unsigned char)207, (unsigned char)209, (unsigned char)230, (unsigned char)231, (unsigned char)233, (unsigned char)234, (unsigned char)235, (unsigned char)236, (unsigned char)237, (unsigned char)135, (unsigned char)135, (unsigned char)138, (unsigned char)181, (unsigned char)135, (unsigned char)112, (unsigned char)116, (unsigned char)172, (unsigned char)179, (unsigned char)183, (unsigned char)184, (unsigned char)195, (unsigned char)201, (unsigned char)164, (unsigned char)116, (unsigned char)116, (unsigned char)201, (unsigned char)113, (unsigned char)113, (unsigned char)161, (unsigned char)113, (unsigned char)200, (unsigned char)210, (unsigned char)117, (unsigned char)164, (unsigned char)180, (unsigned char)198, (unsigned char)209, (unsigned char)112, (unsigned char)116, (unsigned char)198, (unsigned char)149, (unsigned char)229, (unsigned char)136, (unsigned char)244, (unsigned char)133, (unsigned char)112, (unsigned char)138, (unsigned char)204, (unsigned char)135, (unsigned char)223, (unsigned char)224, (unsigned char)118, (unsigned char)134, (unsigned char)134, (unsigned char)239, (unsigned char)241, (unsigned char)242, (unsigned char)136, (unsigned char)113, (unsigned char)118, (unsigned char)117, (unsigned char)132, (unsigned char)136, (unsigned char)113, (unsigned char)117, (unsigned char)133, (unsigned char)118, (unsigned char)136, (unsigned char)196, (unsigned char)196, (unsigned char)113, (unsigned char)112, (unsigned char)173, (unsigned char)200, (unsigned char)202, (unsigned char)203, (unsigned char)205, (unsigned char)207, (unsigned char)209, (unsigned char)113, (unsigned char)113, (unsigned char)118, (unsigned char)117, (unsigned char)179, (unsigned char)209, (unsigned char)199, (unsigned char)112, (unsigned char)113, (unsigned char)210, (unsigned char)164, (unsigned char)50, (unsigned char)168, (unsigned char)172, (unsigned char)179, (unsigned char)180, (unsigned char)182, (unsigned char)186, (unsigned char)167, (unsigned char)204, (unsigned char)112, (unsigned char)120, (unsigned char)173, (unsigned char)202, (unsigned char)209, (unsigned char)167, (unsigned char)133, (unsigned char)112, (unsigned char)132, (unsigned char)134, (unsigned char)138, (unsigned char)173, (unsigned char)192, (unsigned char)193, (unsigned char)202, (unsigned char)204, (unsigned char)207, (unsigned char)209, (unsigned char)207, (unsigned char)209, (unsigned char)136, (unsigned char)191, (unsigned char)118, (unsigned char)134, (unsigned char)112, (unsigned char)116, (unsigned char)113, (unsigned char)138, (unsigned char)210, (unsigned char)213, (unsigned char)173, (unsigned char)207, (unsigned char)134, (unsigned char)134, (unsigned char)224, (unsigned char)224, (unsigned char)224, (unsigned char)134, (unsigned char)224, (unsigned char)136, (unsigned char)187, (unsigned char)136, (unsigned char)187, (unsigned char)135, (unsigned char)135, (unsigned char)187, (unsigned char)180, (unsigned char)164, (unsigned char)116, (unsigned char)117, (unsigned char)164, (unsigned char)164, (unsigned char)116, (unsigned char)113, (unsigned char)113, (unsigned char)117, (unsigned char)117, (unsigned char)198, (unsigned char)113, (unsigned char)210, (unsigned char)117, (unsigned char)164, (unsigned char)180, (unsigned char)136, (unsigned char)216, (unsigned char)136, (unsigned char)52, (unsigned char)53, (unsigned char)54, (unsigned char)55, (unsigned char)56, (unsigned char)57, (unsigned char)58, (unsigned char)59, (unsigned char)60, (unsigned char)61, (unsigned char)62, (unsigned char)77, (unsigned char)134, (unsigned char)138, (unsigned char)163, (unsigned char)165, (unsigned char)167, (unsigned char)218, (unsigned char)219, (unsigned char)220, (unsigned char)221, (unsigned char)222, (unsigned char)224, (unsigned char)225, (unsigned char)226, (unsigned char)227, (unsigned char)228, (unsigned char)230, (unsigned char)240, (unsigned char)141, (unsigned char)161, (unsigned char)160, (unsigned char)164, (unsigned char)197, (unsigned char)134, (unsigned char)136, (unsigned char)134, (unsigned char)136, (unsigned char)203, (unsigned char)207, (unsigned char)209, (unsigned char)173, (unsigned char)205, (unsigned char)51, (unsigned char)212, (unsigned char)3, (unsigned char)28, (unsigned char)44, (unsigned char)74, (unsigned char)75, (unsigned char)113, (unsigned char)175, (unsigned char)176, (unsigned char)177, (unsigned char)113, (unsigned char)117, (unsigned char)138, (unsigned char)181, (unsigned char)135, (unsigned char)138, (unsigned char)172, (unsigned char)179, (unsigned char)180, (unsigned char)182, (unsigned char)200, (unsigned char)138, (unsigned char)173, (unsigned char)181, (unsigned char)204, (unsigned char)209, (unsigned char)113, (unsigned char)112, (unsigned char)216, (unsigned char)113, (unsigned char)164, (unsigned char)135, (unsigned char)207, (unsigned char)209, (unsigned char)118, (unsigned char)134, (unsigned char)132, (unsigned char)178, (unsigned char)173, (unsigned char)207, (unsigned char)207, (unsigned char)188, (unsigned char)117, (unsigned char)164, (unsigned char)180, (unsigned char)113, (unsigned char)113, (unsigned char)118, (unsigned char)207, (unsigned char)136, (unsigned char)136, (unsigned char)136, (unsigned char)187, (unsigned char)187, (unsigned char)136, (unsigned char)113, (unsigned char)117, (unsigned char)164, (unsigned char)117, (unsigned char)117, (unsigned char)164, (unsigned char)113, (unsigned char)117, (unsigned char)117, (unsigned char)164, (unsigned char)132, (unsigned char)112, (unsigned char)112, (unsigned char)112, (unsigned char)218, (unsigned char)112, (unsigned char)138, (unsigned char)134, (unsigned char)134, (unsigned char)134, (unsigned char)163, (unsigned char)138, (unsigned char)132, (unsigned char)134, (unsigned char)134, (unsigned char)170, (unsigned char)171, (unsigned char)202, (unsigned char)165, (unsigned char)221, (unsigned char)165, (unsigned char)218, (unsigned char)136, (unsigned char)134, (unsigned char)187, (unsigned char)187, (unsigned char)205, (unsigned char)113, (unsigned char)112, (unsigned char)113, (unsigned char)118, (unsigned char)176, (unsigned char)69, (unsigned char)70, (unsigned char)136, (unsigned char)135, (unsigned char)135, (unsigned char)138, (unsigned char)138, (unsigned char)181, (unsigned char)113, (unsigned char)136, (unsigned char)244, (unsigned char)207, (unsigned char)193, (unsigned char)164, (unsigned char)207, (unsigned char)117, (unsigned char)117, (unsigned char)138, (unsigned char)136, (unsigned char)136, (unsigned char)117, (unsigned char)117, (unsigned char)132, (unsigned char)218, (unsigned char)163, (unsigned char)163, (unsigned char)113, (unsigned char)163, (unsigned char)56, (unsigned char)113, (unsigned char)225, (unsigned char)134, (unsigned char)134, (unsigned char)133, (unsigned char)218, (unsigned char)118, (unsigned char)134, (unsigned char)133, (unsigned char)136, (unsigned char)136, (unsigned char)163, (unsigned char)113, (unsigned char)176, (unsigned char)224, (unsigned char)224, (unsigned char)69, (unsigned char)70, (unsigned char)136, (unsigned char)69, (unsigned char)70, (unsigned char)136, (unsigned char)135, (unsigned char)136, (unsigned char)132, (unsigned char)218, (unsigned char)113, (unsigned char)113, (unsigned char)218, (unsigned char)113, (unsigned char)112, (unsigned char)218, (unsigned char)113, (unsigned char)225, (unsigned char)164, (unsigned char)171, (unsigned char)135, (unsigned char)161, (unsigned char)215, (unsigned char)113, (unsigned char)70, (unsigned char)136, (unsigned char)69, (unsigned char)136, (unsigned char)224, (unsigned char)224, (unsigned char)224, (unsigned char)224, (unsigned char)69, (unsigned char)70, (unsigned char)136, (unsigned char)164, (unsigned char)218, (unsigned char)218, (unsigned char)218, (unsigned char)163, (unsigned char)218, (unsigned char)113, (unsigned char)163, (unsigned char)134, (unsigned char)215, (unsigned char)217, (unsigned char)224, (unsigned char)224, (unsigned char)70, (unsigned char)136, (unsigned char)69, (unsigned char)136, (unsigned char)70, (unsigned char)136, (unsigned char)69, (unsigned char)136, (unsigned char)224, (unsigned char)224, (unsigned char)64, (unsigned char)113, (unsigned char)218, (unsigned char)113, (unsigned char)118, (unsigned char)136, (unsigned char)136, (unsigned char)136, (unsigned char)224, (unsigned char)224, (unsigned char)224, (unsigned char)224, (unsigned char)70, (unsigned char)136, (unsigned char)69, (unsigned char)136, (unsigned char)218, (unsigned char)134, (unsigned char)218, (unsigned char)136, (unsigned char)215, (unsigned char)136, (unsigned char)136, (unsigned char)136, (unsigned char)136, (unsigned char)224, (unsigned char)224, (unsigned char)136, (unsigned char)136
 };
 
-typedef unsigned int size_t;
+typedef uintptr_t size_t;
 
 void exit(int status);
 

diff --git a/compiler/bootstrap/libec/bootstrap/freeAst.c b/compiler/bootstrap/libec/bootstrap/freeAst.c
index 92a6314..a3d2617 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/freeAst.c
+++ b/compiler/bootstrap/libec/bootstrap/freeAst.c
@@ -2309,7 +2309,6 @@ int memberType;
 } __attribute__ ((gcc_struct));
 struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
 void *  param;
-char __ecere_padding[4];
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__GlobalFunction;

diff --git a/compiler/bootstrap/libec/bootstrap/grammar.c b/compiler/bootstrap/libec/bootstrap/grammar.c
index 37078d2..f9715b1 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/grammar.c
+++ b/compiler/bootstrap/libec/bootstrap/grammar.c
@@ -1149,7 +1149,7 @@ static const yytype_uint16 yystos[] =
 (unsigned short)0, (unsigned short)3, (unsigned short)28, (unsigned short)29, (unsigned short)30, (unsigned short)31, (unsigned short)32, (unsigned short)33, (unsigned short)34, (unsigned short)35, (unsigned short)36, (unsigned short)37, (unsigned short)38, (unsigned short)39, (unsigned short)40, (unsigned short)41, (unsigned short)42, (unsigned short)43, (unsigned short)44, (unsigned short)45, (unsigned short)46, (unsigned short)47, (unsigned short)48, (unsigned short)49, (unsigned short)50, (unsigned short)53, (unsigned short)65, (unsigned short)66, (unsigned short)74, (unsigned short)75, (unsigned short)76, (unsigned short)77, (unsigned short)79, (unsigned short)80, (unsigned short)81, (unsigned short)82, (unsigned short)83, (unsigned short)85, (unsigned short)86, (unsigned short)87, (unsigned short)100, (unsigned short)101, (unsigned short)105, (unsigned short)110, (unsigned short)111, (unsigned short)112, (unsigned short)115, (unsigned short)118, (unsigned short)138, (unsigned short)139, (unsigned short)140, (unsigned short)142, (unsigned short)167, (unsigned short)204, (unsigned short)205, (unsigned short)206, (unsigned short)207, (unsigned short)208, (unsigned short)209, (unsigned short)264, (unsigned short)267, (unsigned short)268, (unsigned short)271, (unsigned short)272, (unsigned short)273, (unsigned short)274, (unsigned short)275, (unsigned short)276, (unsigned short)277, (unsigned short)279, (unsigned short)283, (unsigned short)286, (unsigned short)287, (unsigned short)288, (unsigned short)289, (unsigned short)290, (unsigned short)291, (unsigned short)296, (unsigned short)297, (unsigned short)305, (unsigned short)306, (unsigned short)307, (unsigned short)310, (unsigned short)311, (unsigned short)315, (unsigned short)318, (unsigned short)322, (unsigned short)349, (unsigned short)352, (unsigned short)353, (unsigned short)371, (unsigned short)372, (unsigned short)374, (unsigned short)375, (unsigned short)376, (unsigned short)377, (unsigned short)378, (unsigned short)379, (unsigned short)77, (unsigned short)124, (unsigned short)5, (unsigned short)31, (unsigned short)209, (unsigned short)373, (unsigned short)209, (unsigned short)115, (unsigned short)115, (unsigned short)115, (unsigned short)142, (unsigned short)209, (unsigned short)373, (unsigned short)277, (unsigned short)278, (unsigned short)310, (unsigned short)318, (unsigned short)209, (unsigned short)305, (unsigned short)307, (unsigned short)309, (unsigned short)310, (unsigned short)318, (unsigned short)321, (unsigned short)113, (unsigned short)118, (unsigned short)139, (unsigned short)140, (unsigned short)209, (unsigned short)122, (unsigned short)124, (unsigned short)118, (unsigned short)122, (unsigned short)121, (unsigned short)112, (unsigned short)113, (unsigned short)204, (unsigned short)209, (unsigned short)122, (unsigned short)142, (unsigned short)209, (unsigned short)122, (unsigned short)124, (unsigned short)121, (unsigned short)113, (unsigned short)122, (unsigned short)124, (unsigned short)122, (unsigned short)121, (unsigned short)122, (unsigned short)140, (unsigned short)209, (unsigned short)310, (unsigned short)1, (unsigned short)31, (unsigned short)118, (unsigned short)138, (unsigned short)206, (unsigned short)208, (unsigned short)209, (unsigned short)264, (unsigned short)274, (unsigned short)275, (unsigned short)277, (unsigned short)279, (unsigned short)307, (unsigned short)310, (unsigned short)318, (unsigned short)321, (unsigned short)322, (unsigned short)330, (unsigned short)331, (unsigned short)332, (unsigned short)333, (unsigned short)332, (unsigned short)115, (unsigned short)126, (unsigned short)1, (unsigned short)29, (unsigned short)30, (unsigned short)31, (unsigned short)32, (unsigned short)33, (unsigned short)65, (unsigned short)116, (unsigned short)138, (unsigned short)209, (unsigned short)263, (unsigned short)267, (unsigned short)269, (unsigned short)270, (unsigned short)277, (unsigned short)279, (unsigned short)283, (unsigned short)284, (unsigned short)285, (unsigned short)291, (unsigned short)295, (unsigned short)303, (unsigned short)304, (unsigned short)336, (unsigned short)337, (unsigned short)338, (unsigned short)339, (unsigned short)340, (unsigned short)341, (unsigned short)307, (unsigned short)318, (unsigned short)115, (unsigned short)307, (unsigned short)310, (unsigned short)34, (unsigned short)35, (unsigned short)36, (unsigned short)37, (unsigned short)38, (unsigned short)39, (unsigned short)40, (unsigned short)41, (unsigned short)42, (unsigned short)43, (unsigned short)46, (unsigned short)47, (unsigned short)66, (unsigned short)85, (unsigned short)87, (unsigned short)100, (unsigned short)122, (unsigned short)142, (unsigned short)163, (unsigned short)164, (unsigned short)263, (unsigned short)268, (unsigned short)269, (unsigned short)277, (unsigned short)280, (unsigned short)284, (unsigned short)286, (unsigned short)294, (unsigned short)351, (unsigned short)354, (unsigned short)355, (unsigned short)356, (unsigned short)361, (unsigned short)362, (unsigned short)363, (unsigned short)31, (unsigned short)76, (unsigned short)124, (unsigned short)206, (unsigned short)208, (unsigned short)296, (unsigned short)352, (unsigned short)353, (unsigned short)371, (unsigned short)372, (unsigned short)379, (unsigned short)1, (unsigned short)206, (unsigned short)273, (unsigned short)290, (unsigned short)296, (unsigned short)322, (unsigned short)349, (unsigned short)375, (unsigned short)1, (unsigned short)374, (unsigned short)375, (unsigned short)0, (unsigned short)209, (unsigned short)373, (unsigned short)373, (unsigned short)5, (unsigned short)119, (unsigned short)373, (unsigned short)1, (unsigned short)4, (unsigned short)6, (unsigned short)8, (unsigned short)9, (unsigned short)65, (unsigned short)71, (unsigned short)72, (unsigned short)73, (unsigned short)84, (unsigned short)85, (unsigned short)98, (unsigned short)102, (unsigned short)103, (unsigned short)104, (unsigned short)105, (unsigned short)106, (unsigned short)107, (unsigned short)108, (unsigned short)109, (unsigned short)112, (unsigned short)115, (unsigned short)117, (unsigned short)125, (unsigned short)126, (unsigned short)128, (unsigned short)129, (unsigned short)130, (unsigned short)131, (unsigned short)142, (unsigned short)168, (unsigned short)169, (unsigned short)209, (unsigned short)210, (unsigned short)211, (unsigned short)212, (unsigned short)215, (unsigned short)216, (unsigned short)220, (unsigned short)221, (unsigned short)223, (unsigned short)224, (unsigned short)225, (unsigned short)226, (unsigned short)227, (unsigned short)228, (unsigned short)229, (unsigned short)230, (unsigned short)231, (unsigned short)232, (unsigned short)233, (unsigned short)234, (unsigned short)235, (unsigned short)236, (unsigned short)237, (unsigned short)241, (unsigned short)243, (unsigned short)244, (unsigned short)246, (unsigned short)247, (unsigned short)248, (unsigned short)249, (unsigned short)250, (unsigned short)251, (unsigned short)252, (unsigned short)253, (unsigned short)254, (unsigned short)255, (unsigned short)256, (unsigned short)257, (unsigned short)373, (unsigned short)385, (unsigned short)386, (unsigned short)387, (unsigned short)388, (unsigned short)139, (unsigned short)209, (unsigned short)122, (unsigned short)142, (unsigned short)209, (unsigned short)277, (unsigned short)318, (unsigned short)305, (unsigned short)307, (unsigned short)318, (unsigned short)309, (unsigned short)310, (unsigned short)116, (unsigned short)310, (unsigned short)85, (unsigned short)142, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)198, (unsigned short)202, (unsigned short)203, (unsigned short)209, (unsigned short)221, (unsigned short)235, (unsigned short)236, (unsigned short)244, (unsigned short)256, (unsigned short)261, (unsigned short)294, (unsigned short)118, (unsigned short)113, (unsigned short)113, (unsigned short)118, (unsigned short)1, (unsigned short)68, (unsigned short)78, (unsigned short)80, (unsigned short)81, (unsigned short)85, (unsigned short)88, (unsigned short)91, (unsigned short)92, (unsigned short)93, (unsigned short)94, (unsigned short)96, (unsigned short)98, (unsigned short)99, (unsigned short)115, (unsigned short)117, (unsigned short)118, (unsigned short)121, (unsigned short)142, (unsigned short)143, (unsigned short)144, (unsigned short)145, (unsigned short)146, (unsigned short)147, (unsigned short)148, (unsigned short)149, (unsigned short)150, (unsigned short)165, (unsigned short)166, (unsigned short)168, (unsigned short)169, (unsigned short)172, (unsigned short)173, (unsigned short)174, (unsigned short)175, (unsigned short)176, (unsigned short)177, (unsigned short)178, (unsigned short)179, (unsigned short)180, (unsigned short)181, (unsigned short)185, (unsigned short)189, (unsigned short)190, (unsigned short)191, (unsigned short)192, (unsigned short)209, (unsigned short)216, (unsigned short)241, (unsigned short)295, (unsigned short)306, (unsigned short)308, (unsigned short)310, (unsigned short)318, (unsigned short)322, (unsigned short)323, (unsigned short)350, (unsigned short)80, (unsigned short)81, (unsigned short)209, (unsigned short)263, (unsigned short)267, (unsigned short)277, (unsigned short)280, (unsigned short)283, (unsigned short)291, (unsigned short)298, (unsigned short)299, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)140, (unsigned short)209, (unsigned short)1, (unsigned short)209, (unsigned short)265, (unsigned short)266, (unsigned short)1, (unsigned short)121, (unsigned short)266, (unsigned short)299, (unsigned short)65, (unsigned short)193, (unsigned short)195, (unsigned short)197, (unsigned short)199, (unsigned short)200, (unsigned short)201, (unsigned short)209, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)299, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)140, (unsigned short)209, (unsigned short)122, (unsigned short)307, (unsigned short)318, (unsigned short)307, (unsigned short)310, (unsigned short)1, (unsigned short)119, (unsigned short)355, (unsigned short)362, (unsigned short)363, (unsigned short)1, (unsigned short)118, (unsigned short)120, (unsigned short)120, (unsigned short)118, (unsigned short)127, (unsigned short)139, (unsigned short)209, (unsigned short)257, (unsigned short)261, (unsigned short)262, (unsigned short)120, (unsigned short)122, (unsigned short)142, (unsigned short)209, (unsigned short)121, (unsigned short)122, (unsigned short)121, (unsigned short)122, (unsigned short)310, (unsigned short)115, (unsigned short)126, (unsigned short)128, (unsigned short)138, (unsigned short)209, (unsigned short)263, (unsigned short)269, (unsigned short)277, (unsigned short)279, (unsigned short)284, (unsigned short)310, (unsigned short)316, (unsigned short)318, (unsigned short)319, (unsigned short)321, (unsigned short)1, (unsigned short)116, (unsigned short)120, (unsigned short)1, (unsigned short)116, (unsigned short)120, (unsigned short)1, (unsigned short)120, (unsigned short)1, (unsigned short)120, (unsigned short)116, (unsigned short)116, (unsigned short)307, (unsigned short)115, (unsigned short)307, (unsigned short)115, (unsigned short)115, (unsigned short)1, (unsigned short)118, (unsigned short)1, (unsigned short)121, (unsigned short)1, (unsigned short)118, (unsigned short)209, (unsigned short)263, (unsigned short)269, (unsigned short)277, (unsigned short)280, (unsigned short)284, (unsigned short)310, (unsigned short)332, (unsigned short)333, (unsigned short)1, (unsigned short)118, (unsigned short)1, (unsigned short)351, (unsigned short)354, (unsigned short)362, (unsigned short)363, (unsigned short)351, (unsigned short)354, (unsigned short)52, (unsigned short)53, (unsigned short)54, (unsigned short)55, (unsigned short)56, (unsigned short)57, (unsigned short)58, (unsigned short)59, (unsigned short)60, (unsigned short)61, (unsigned short)62, (unsigned short)86, (unsigned short)88, (unsigned short)89, (unsigned short)90, (unsigned short)118, (unsigned short)124, (unsigned short)186, (unsigned short)187, (unsigned short)188, (unsigned short)209, (unsigned short)216, (unsigned short)221, (unsigned short)237, (unsigned short)239, (unsigned short)244, (unsigned short)257, (unsigned short)258, (unsigned short)259, (unsigned short)315, (unsigned short)342, (unsigned short)343, (unsigned short)346, (unsigned short)347, (unsigned short)348, (unsigned short)355, (unsigned short)356, (unsigned short)357, (unsigned short)358, (unsigned short)359, (unsigned short)360, (unsigned short)362, (unsigned short)363, (unsigned short)365, (unsigned short)366, (unsigned short)367, (unsigned short)368, (unsigned short)369, (unsigned short)370, (unsigned short)121, (unsigned short)31, (unsigned short)209, (unsigned short)373, (unsigned short)209, (unsigned short)204, (unsigned short)205, (unsigned short)207, (unsigned short)208, (unsigned short)322, (unsigned short)355, (unsigned short)363, (unsigned short)206, (unsigned short)296, (unsigned short)119, (unsigned short)236, (unsigned short)116, (unsigned short)1, (unsigned short)115, (unsigned short)169, (unsigned short)212, (unsigned short)217, (unsigned short)220, (unsigned short)222, (unsigned short)242, (unsigned short)243, (unsigned short)245, (unsigned short)115, (unsigned short)221, (unsigned short)244, (unsigned short)221, (unsigned short)244, (unsigned short)115, (unsigned short)209, (unsigned short)263, (unsigned short)269, (unsigned short)277, (unsigned short)280, (unsigned short)284, (unsigned short)302, (unsigned short)261, (unsigned short)115, (unsigned short)115, (unsigned short)302, (unsigned short)261, (unsigned short)115, (unsigned short)115, (unsigned short)115, (unsigned short)115, (unsigned short)115, (unsigned short)115, (unsigned short)222, (unsigned short)245, (unsigned short)116, (unsigned short)237, (unsigned short)239, (unsigned short)259, (unsigned short)269, (unsigned short)277, (unsigned short)279, (unsigned short)284, (unsigned short)292, (unsigned short)334, (unsigned short)373, (unsigned short)122, (unsigned short)170, (unsigned short)171, (unsigned short)213, (unsigned short)218, (unsigned short)237, (unsigned short)122, (unsigned short)1, (unsigned short)121, (unsigned short)122, (unsigned short)1, (unsigned short)7, (unsigned short)8, (unsigned short)9, (unsigned short)115, (unsigned short)123, (unsigned short)126, (unsigned short)18, (unsigned short)19, (unsigned short)20, (unsigned short)21, (unsigned short)22, (unsigned short)23, (unsigned short)24, (unsigned short)25, (unsigned short)26, (unsigned short)27, (unsigned short)119, (unsigned short)238, (unsigned short)171, (unsigned short)213, (unsigned short)214, (unsigned short)224, (unsigned short)246, (unsigned short)112, (unsigned short)132, (unsigned short)133, (unsigned short)129, (unsigned short)130, (unsigned short)10, (unsigned short)11, (unsigned short)227, (unsigned short)249, (unsigned short)12, (unsigned short)13, (unsigned short)113, (unsigned short)114, (unsigned short)14, (unsigned short)15, (unsigned short)128, (unsigned short)134, (unsigned short)135, (unsigned short)16, (unsigned short)17, (unsigned short)136, (unsigned short)238, (unsigned short)116, (unsigned short)7, (unsigned short)8, (unsigned short)9, (unsigned short)115, (unsigned short)123, (unsigned short)126, (unsigned short)238, (unsigned short)112, (unsigned short)132, (unsigned short)133, (unsigned short)129, (unsigned short)130, (unsigned short)10, (unsigned short)11, (unsigned short)12, (unsigned short)13, (unsigned short)113, (unsigned short)114, (unsigned short)14, (unsigned short)15, (unsigned short)128, (unsigned short)134, (unsigned short)135, (unsigned short)16, (unsigned short)17, (unsigned short)136, (unsigned short)238, (unsigned short)116, (unsigned short)116, (unsigned short)107, (unsigned short)209, (unsigned short)295, (unsigned short)380, (unsigned short)383, (unsigned short)384, (unsigned short)122, (unsigned short)122, (unsigned short)309, (unsigned short)119, (unsigned short)11, (unsigned short)114, (unsigned short)120, (unsigned short)119, (unsigned short)136, (unsigned short)136, (unsigned short)115, (unsigned short)310, (unsigned short)318, (unsigned short)319, (unsigned short)65, (unsigned short)193, (unsigned short)201, (unsigned short)209, (unsigned short)201, (unsigned short)1, (unsigned short)209, (unsigned short)263, (unsigned short)277, (unsigned short)280, (unsigned short)291, (unsigned short)300, (unsigned short)295, (unsigned short)322, (unsigned short)323, (unsigned short)115, (unsigned short)142, (unsigned short)209, (unsigned short)209, (unsigned short)295, (unsigned short)1, (unsigned short)115, (unsigned short)300, (unsigned short)112, (unsigned short)115, (unsigned short)209, (unsigned short)295, (unsigned short)118, (unsigned short)362, (unsigned short)363, (unsigned short)362, (unsigned short)363, (unsigned short)362, (unsigned short)118, (unsigned short)362, (unsigned short)363, (unsigned short)118, (unsigned short)118, (unsigned short)1, (unsigned short)121, (unsigned short)118, (unsigned short)1, (unsigned short)1, (unsigned short)118, (unsigned short)120, (unsigned short)120, (unsigned short)69, (unsigned short)70, (unsigned short)91, (unsigned short)95, (unsigned short)97, (unsigned short)121, (unsigned short)69, (unsigned short)70, (unsigned short)121, (unsigned short)118, (unsigned short)1, (unsigned short)189, (unsigned short)190, (unsigned short)1, (unsigned short)189, (unsigned short)190, (unsigned short)1, (unsigned short)119, (unsigned short)115, (unsigned short)118, (unsigned short)124, (unsigned short)209, (unsigned short)281, (unsigned short)282, (unsigned short)305, (unsigned short)310, (unsigned short)318, (unsigned short)322, (unsigned short)323, (unsigned short)324, (unsigned short)1, (unsigned short)295, (unsigned short)303, (unsigned short)338, (unsigned short)308, (unsigned short)318, (unsigned short)308, (unsigned short)310, (unsigned short)115, (unsigned short)124, (unsigned short)149, (unsigned short)150, (unsigned short)165, (unsigned short)166, (unsigned short)168, (unsigned short)169, (unsigned short)178, (unsigned short)209, (unsigned short)295, (unsigned short)113, (unsigned short)142, (unsigned short)209, (unsigned short)209, (unsigned short)263, (unsigned short)277, (unsigned short)280, (unsigned short)113, (unsigned short)113, (unsigned short)119, (unsigned short)120, (unsigned short)1, (unsigned short)118, (unsigned short)122, (unsigned short)28, (unsigned short)141, (unsigned short)209, (unsigned short)209, (unsigned short)114, (unsigned short)120, (unsigned short)119, (unsigned short)118, (unsigned short)120, (unsigned short)121, (unsigned short)151, (unsigned short)152, (unsigned short)153, (unsigned short)154, (unsigned short)155, (unsigned short)156, (unsigned short)157, (unsigned short)158, (unsigned short)159, (unsigned short)160, (unsigned short)161, (unsigned short)162, (unsigned short)213, (unsigned short)214, (unsigned short)216, (unsigned short)236, (unsigned short)257, (unsigned short)294, (unsigned short)327, (unsigned short)328, (unsigned short)307, (unsigned short)307, (unsigned short)122, (unsigned short)237, (unsigned short)258, (unsigned short)325, (unsigned short)326, (unsigned short)362, (unsigned short)363, (unsigned short)330, (unsigned short)331, (unsigned short)330, (unsigned short)331, (unsigned short)127, (unsigned short)127, (unsigned short)127, (unsigned short)51, (unsigned short)336, (unsigned short)337, (unsigned short)1, (unsigned short)266, (unsigned short)122, (unsigned short)122, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)122, (unsigned short)116, (unsigned short)209, (unsigned short)303, (unsigned short)304, (unsigned short)319, (unsigned short)340, (unsigned short)341, (unsigned short)127, (unsigned short)139, (unsigned short)261, (unsigned short)262, (unsigned short)321, (unsigned short)316, (unsigned short)318, (unsigned short)115, (unsigned short)126, (unsigned short)316, (unsigned short)1, (unsigned short)1, (unsigned short)120, (unsigned short)1, (unsigned short)51, (unsigned short)209, (unsigned short)336, (unsigned short)337, (unsigned short)120, (unsigned short)1, (unsigned short)51, (unsigned short)209, (unsigned short)336, (unsigned short)337, (unsigned short)120, (unsigned short)1, (unsigned short)51, (unsigned short)209, (unsigned short)336, (unsigned short)337, (unsigned short)120, (unsigned short)51, (unsigned short)209, (unsigned short)336, (unsigned short)337, (unsigned short)3, (unsigned short)28, (unsigned short)44, (unsigned short)74, (unsigned short)75, (unsigned short)116, (unsigned short)312, (unsigned short)313, (unsigned short)314, (unsigned short)237, (unsigned short)139, (unsigned short)209, (unsigned short)121, (unsigned short)122, (unsigned short)118, (unsigned short)118, (unsigned short)124, (unsigned short)261, (unsigned short)262, (unsigned short)124, (unsigned short)115, (unsigned short)115, (unsigned short)1, (unsigned short)115, (unsigned short)52, (unsigned short)53, (unsigned short)54, (unsigned short)56, (unsigned short)57, (unsigned short)58, (unsigned short)59, (unsigned short)62, (unsigned short)86, (unsigned short)209, (unsigned short)259, (unsigned short)315, (unsigned short)342, (unsigned short)365, (unsigned short)369, (unsigned short)115, (unsigned short)209, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)213, (unsigned short)214, (unsigned short)239, (unsigned short)259, (unsigned short)115, (unsigned short)277, (unsigned short)115, (unsigned short)115, (unsigned short)182, (unsigned short)209, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)124, (unsigned short)123, (unsigned short)238, (unsigned short)1, (unsigned short)123, (unsigned short)118, (unsigned short)120, (unsigned short)239, (unsigned short)259, (unsigned short)238, (unsigned short)116, (unsigned short)120, (unsigned short)239, (unsigned short)1, (unsigned short)357, (unsigned short)358, (unsigned short)357, (unsigned short)358, (unsigned short)342, (unsigned short)343, (unsigned short)351, (unsigned short)354, (unsigned short)342, (unsigned short)343, (unsigned short)351, (unsigned short)354, (unsigned short)1, (unsigned short)1, (unsigned short)373, (unsigned short)373, (unsigned short)140, (unsigned short)209, (unsigned short)122, (unsigned short)122, (unsigned short)355, (unsigned short)363, (unsigned short)363, (unsigned short)236, (unsigned short)118, (unsigned short)65, (unsigned short)138, (unsigned short)209, (unsigned short)221, (unsigned short)244, (unsigned short)269, (unsigned short)277, (unsigned short)279, (unsigned short)284, (unsigned short)293, (unsigned short)335, (unsigned short)1, (unsigned short)1, (unsigned short)7, (unsigned short)8, (unsigned short)9, (unsigned short)115, (unsigned short)123, (unsigned short)126, (unsigned short)7, (unsigned short)8, (unsigned short)9, (unsigned short)115, (unsigned short)123, (unsigned short)126, (unsigned short)209, (unsigned short)294, (unsigned short)113, (unsigned short)115, (unsigned short)126, (unsigned short)209, (unsigned short)263, (unsigned short)269, (unsigned short)277, (unsigned short)280, (unsigned short)284, (unsigned short)310, (unsigned short)317, (unsigned short)318, (unsigned short)320, (unsigned short)209, (unsigned short)263, (unsigned short)269, (unsigned short)277, (unsigned short)280, (unsigned short)284, (unsigned short)301, (unsigned short)239, (unsigned short)334, (unsigned short)362, (unsigned short)209, (unsigned short)126, (unsigned short)320, (unsigned short)301, (unsigned short)237, (unsigned short)373, (unsigned short)373, (unsigned short)373, (unsigned short)237, (unsigned short)221, (unsigned short)244, (unsigned short)335, (unsigned short)116, (unsigned short)209, (unsigned short)269, (unsigned short)277, (unsigned short)279, (unsigned short)284, (unsigned short)319, (unsigned short)116, (unsigned short)123, (unsigned short)1, (unsigned short)161, (unsigned short)162, (unsigned short)1, (unsigned short)121, (unsigned short)120, (unsigned short)127, (unsigned short)1, (unsigned short)161, (unsigned short)162, (unsigned short)121, (unsigned short)1, (unsigned short)161, (unsigned short)162, (unsigned short)1, (unsigned short)209, (unsigned short)116, (unsigned short)214, (unsigned short)218, (unsigned short)219, (unsigned short)258, (unsigned short)1, (unsigned short)209, (unsigned short)239, (unsigned short)259, (unsigned short)213, (unsigned short)237, (unsigned short)1, (unsigned short)224, (unsigned short)246, (unsigned short)224, (unsigned short)246, (unsigned short)224, (unsigned short)246, (unsigned short)225, (unsigned short)247, (unsigned short)225, (unsigned short)247, (unsigned short)226, (unsigned short)248, (unsigned short)226, (unsigned short)248, (unsigned short)227, (unsigned short)249, (unsigned short)227, (unsigned short)249, (unsigned short)227, (unsigned short)249, (unsigned short)213, (unsigned short)214, (unsigned short)229, (unsigned short)250, (unsigned short)213, (unsigned short)214, (unsigned short)229, (unsigned short)250, (unsigned short)213, (unsigned short)214, (unsigned short)230, (unsigned short)251, (unsigned short)213, (unsigned short)214, (unsigned short)231, (unsigned short)252, (unsigned short)213, (unsigned short)214, (unsigned short)232, (unsigned short)253, (unsigned short)233, (unsigned short)254, (unsigned short)234, (unsigned short)255, (unsigned short)124, (unsigned short)213, (unsigned short)214, (unsigned short)239, (unsigned short)240, (unsigned short)259, (unsigned short)260, (unsigned short)213, (unsigned short)237, (unsigned short)1, (unsigned short)209, (unsigned short)116, (unsigned short)218, (unsigned short)219, (unsigned short)1, (unsigned short)209, (unsigned short)239, (unsigned short)259, (unsigned short)213, (unsigned short)237, (unsigned short)224, (unsigned short)246, (unsigned short)224, (unsigned short)246, (unsigned short)224, (unsigned short)246, (unsigned short)225, (unsigned short)247, (unsigned short)225, (unsigned short)247, (unsigned short)226, (unsigned short)248, (unsigned short)226, (unsigned short)248, (unsigned short)227, (unsigned short)249, (unsigned short)227, (unsigned short)249, (unsigned short)227, (unsigned short)249, (unsigned short)227, (unsigned short)249, (unsigned short)213, (unsigned short)214, (unsigned short)229, (unsigned short)250, (unsigned short)213, (unsigned short)214, (unsigned short)229, (unsigned short)250, (unsigned short)213, (unsigned short)214, (unsigned short)230, (unsigned short)251, (unsigned short)213, (unsigned short)214, (unsigned short)231, (unsigned short)252, (unsigned short)213, (unsigned short)214, (unsigned short)232, (unsigned short)253, (unsigned short)233, (unsigned short)254, (unsigned short)234, (unsigned short)255, (unsigned short)124, (unsigned short)239, (unsigned short)240, (unsigned short)259, (unsigned short)260, (unsigned short)213, (unsigned short)237, (unsigned short)113, (unsigned short)114, (unsigned short)209, (unsigned short)381, (unsigned short)382, (unsigned short)209, (unsigned short)121, (unsigned short)380, (unsigned short)383, (unsigned short)384, (unsigned short)384, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)198, (unsigned short)209, (unsigned short)202, (unsigned short)194, (unsigned short)196, (unsigned short)198, (unsigned short)239, (unsigned short)240, (unsigned short)259, (unsigned short)260, (unsigned short)239, (unsigned short)240, (unsigned short)259, (unsigned short)260, (unsigned short)318, (unsigned short)114, (unsigned short)119, (unsigned short)114, (unsigned short)122, (unsigned short)113, (unsigned short)122, (unsigned short)209, (unsigned short)263, (unsigned short)277, (unsigned short)280, (unsigned short)319, (unsigned short)322, (unsigned short)323, (unsigned short)182, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)282, (unsigned short)305, (unsigned short)310, (unsigned short)318, (unsigned short)122, (unsigned short)209, (unsigned short)122, (unsigned short)209, (unsigned short)319, (unsigned short)209, (unsigned short)115, (unsigned short)121, (unsigned short)172, (unsigned short)173, (unsigned short)172, (unsigned short)173, (unsigned short)362, (unsigned short)362, (unsigned short)362, (unsigned short)211, (unsigned short)362, (unsigned short)362, (unsigned short)1, (unsigned short)327, (unsigned short)328, (unsigned short)116, (unsigned short)261, (unsigned short)262, (unsigned short)122, (unsigned short)118, (unsigned short)120, (unsigned short)305, (unsigned short)318, (unsigned short)305, (unsigned short)310, (unsigned short)124, (unsigned short)315, (unsigned short)209, (unsigned short)115, (unsigned short)308, (unsigned short)308, (unsigned short)209, (unsigned short)118, (unsigned short)1, (unsigned short)118, (unsigned short)1, (unsigned short)118, (unsigned short)282, (unsigned short)203, (unsigned short)113, (unsigned short)201, (unsigned short)201, (unsigned short)261, (unsigned short)262, (unsigned short)265, (unsigned short)191, (unsigned short)192, (unsigned short)1, (unsigned short)121, (unsigned short)266, (unsigned short)119, (unsigned short)124, (unsigned short)119, (unsigned short)124, (unsigned short)119, (unsigned short)200, (unsigned short)196, (unsigned short)209, (unsigned short)362, (unsigned short)363, (unsigned short)1, (unsigned short)118, (unsigned short)120, (unsigned short)118, (unsigned short)120, (unsigned short)118, (unsigned short)153, (unsigned short)154, (unsigned short)157, (unsigned short)158, (unsigned short)159, (unsigned short)121, (unsigned short)151, (unsigned short)154, (unsigned short)118, (unsigned short)121, (unsigned short)153, (unsigned short)154, (unsigned short)157, (unsigned short)158, (unsigned short)159, (unsigned short)119, (unsigned short)322, (unsigned short)323, (unsigned short)324, (unsigned short)325, (unsigned short)326, (unsigned short)329, (unsigned short)1, (unsigned short)121, (unsigned short)266, (unsigned short)1, (unsigned short)121, (unsigned short)266, (unsigned short)1, (unsigned short)121, (unsigned short)191, (unsigned short)192, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)127, (unsigned short)316, (unsigned short)116, (unsigned short)340, (unsigned short)341, (unsigned short)127, (unsigned short)139, (unsigned short)261, (unsigned short)262, (unsigned short)336, (unsigned short)337, (unsigned short)295, (unsigned short)336, (unsigned short)336, (unsigned short)336, (unsigned short)337, (unsigned short)116, (unsigned short)115, (unsigned short)116, (unsigned short)120, (unsigned short)313, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)1, (unsigned short)161, (unsigned short)162, (unsigned short)342, (unsigned short)343, (unsigned short)124, (unsigned short)124, (unsigned short)342, (unsigned short)343, (unsigned short)239, (unsigned short)259, (unsigned short)239, (unsigned short)259, (unsigned short)116, (unsigned short)239, (unsigned short)259, (unsigned short)124, (unsigned short)261, (unsigned short)262, (unsigned short)124, (unsigned short)115, (unsigned short)115, (unsigned short)342, (unsigned short)115, (unsigned short)214, (unsigned short)259, (unsigned short)115, (unsigned short)124, (unsigned short)56, (unsigned short)1, (unsigned short)116, (unsigned short)118, (unsigned short)209, (unsigned short)239, (unsigned short)259, (unsigned short)364, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)373, (unsigned short)115, (unsigned short)237, (unsigned short)237, (unsigned short)209, (unsigned short)342, (unsigned short)343, (unsigned short)90, (unsigned short)214, (unsigned short)258, (unsigned short)88, (unsigned short)89, (unsigned short)90, (unsigned short)237, (unsigned short)258, (unsigned short)214, (unsigned short)258, (unsigned short)237, (unsigned short)258, (unsigned short)113, (unsigned short)363, (unsigned short)118, (unsigned short)138, (unsigned short)139, (unsigned short)116, (unsigned short)138, (unsigned short)269, (unsigned short)277, (unsigned short)279, (unsigned short)284, (unsigned short)319, (unsigned short)116, (unsigned short)1, (unsigned short)209, (unsigned short)116, (unsigned short)218, (unsigned short)219, (unsigned short)1, (unsigned short)209, (unsigned short)239, (unsigned short)259, (unsigned short)1, (unsigned short)209, (unsigned short)116, (unsigned short)218, (unsigned short)219, (unsigned short)1, (unsigned short)209, (unsigned short)239, (unsigned short)259, (unsigned short)116, (unsigned short)116, (unsigned short)319, (unsigned short)203, (unsigned short)116, (unsigned short)320, (unsigned short)340, (unsigned short)341, (unsigned short)261, (unsigned short)262, (unsigned short)113, (unsigned short)317, (unsigned short)318, (unsigned short)115, (unsigned short)317, (unsigned short)126, (unsigned short)113, (unsigned short)126, (unsigned short)209, (unsigned short)263, (unsigned short)269, (unsigned short)277, (unsigned short)280, (unsigned short)284, (unsigned short)320, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)261, (unsigned short)262, (unsigned short)126, (unsigned short)126, (unsigned short)320, (unsigned short)120, (unsigned short)116, (unsigned short)120, (unsigned short)120, (unsigned short)120, (unsigned short)116, (unsigned short)116, (unsigned short)224, (unsigned short)246, (unsigned short)373, (unsigned short)1, (unsigned short)121, (unsigned short)213, (unsigned short)237, (unsigned short)1, (unsigned short)1, (unsigned short)116, (unsigned short)120, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)1, (unsigned short)120, (unsigned short)124, (unsigned short)124, (unsigned short)120, (unsigned short)124, (unsigned short)124, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)209, (unsigned short)209, (unsigned short)118, (unsigned short)120, (unsigned short)209, (unsigned short)373, (unsigned short)121, (unsigned short)121, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)124, (unsigned short)196, (unsigned short)203, (unsigned short)113, (unsigned short)122, (unsigned short)122, (unsigned short)209, (unsigned short)116, (unsigned short)118, (unsigned short)305, (unsigned short)318, (unsigned short)305, (unsigned short)310, (unsigned short)116, (unsigned short)122, (unsigned short)122, (unsigned short)209, (unsigned short)116, (unsigned short)1, (unsigned short)161, (unsigned short)162, (unsigned short)281, (unsigned short)310, (unsigned short)305, (unsigned short)305, (unsigned short)261, (unsigned short)262, (unsigned short)115, (unsigned short)116, (unsigned short)118, (unsigned short)114, (unsigned short)203, (unsigned short)114, (unsigned short)114, (unsigned short)118, (unsigned short)1, (unsigned short)118, (unsigned short)194, (unsigned short)209, (unsigned short)193, (unsigned short)194, (unsigned short)193, (unsigned short)198, (unsigned short)1, (unsigned short)155, (unsigned short)156, (unsigned short)1, (unsigned short)155, (unsigned short)156, (unsigned short)363, (unsigned short)1, (unsigned short)327, (unsigned short)328, (unsigned short)120, (unsigned short)121, (unsigned short)325, (unsigned short)326, (unsigned short)1, (unsigned short)118, (unsigned short)1, (unsigned short)118, (unsigned short)116, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)127, (unsigned short)319, (unsigned short)321, (unsigned short)239, (unsigned short)116, (unsigned short)313, (unsigned short)1, (unsigned short)342, (unsigned short)343, (unsigned short)342, (unsigned short)343, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)1, (unsigned short)342, (unsigned short)116, (unsigned short)239, (unsigned short)342, (unsigned short)343, (unsigned short)124, (unsigned short)124, (unsigned short)259, (unsigned short)116, (unsigned short)239, (unsigned short)259, (unsigned short)56, (unsigned short)259, (unsigned short)364, (unsigned short)373, (unsigned short)115, (unsigned short)342, (unsigned short)124, (unsigned short)118, (unsigned short)1, (unsigned short)118, (unsigned short)1, (unsigned short)116, (unsigned short)259, (unsigned short)364, (unsigned short)3, (unsigned short)116, (unsigned short)124, (unsigned short)373, (unsigned short)116, (unsigned short)116, (unsigned short)120, (unsigned short)115, (unsigned short)115, (unsigned short)182, (unsigned short)116, (unsigned short)116, (unsigned short)1, (unsigned short)116, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)116, (unsigned short)114, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)203, (unsigned short)317, (unsigned short)116, (unsigned short)340, (unsigned short)341, (unsigned short)261, (unsigned short)262, (unsigned short)203, (unsigned short)261, (unsigned short)262, (unsigned short)113, (unsigned short)126, (unsigned short)115, (unsigned short)122, (unsigned short)325, (unsigned short)127, (unsigned short)127, (unsigned short)261, (unsigned short)262, (unsigned short)261, (unsigned short)262, (unsigned short)126, (unsigned short)334, (unsigned short)209, (unsigned short)209, (unsigned short)237, (unsigned short)1, (unsigned short)214, (unsigned short)258, (unsigned short)213, (unsigned short)214, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)213, (unsigned short)214, (unsigned short)236, (unsigned short)256, (unsigned short)381, (unsigned short)118, (unsigned short)118, (unsigned short)114, (unsigned short)203, (unsigned short)122, (unsigned short)362, (unsigned short)305, (unsigned short)305, (unsigned short)119, (unsigned short)122, (unsigned short)1, (unsigned short)124, (unsigned short)124, (unsigned short)114, (unsigned short)191, (unsigned short)192, (unsigned short)118, (unsigned short)191, (unsigned short)192, (unsigned short)119, (unsigned short)119, (unsigned short)121, (unsigned short)325, (unsigned short)326, (unsigned short)1, (unsigned short)191, (unsigned short)192, (unsigned short)191, (unsigned short)192, (unsigned short)116, (unsigned short)342, (unsigned short)342, (unsigned short)342, (unsigned short)342, (unsigned short)342, (unsigned short)343, (unsigned short)116, (unsigned short)115, (unsigned short)364, (unsigned short)116, (unsigned short)239, (unsigned short)259, (unsigned short)239, (unsigned short)342, (unsigned short)1, (unsigned short)116, (unsigned short)239, (unsigned short)259, (unsigned short)344, (unsigned short)345, (unsigned short)373, (unsigned short)118, (unsigned short)345, (unsigned short)3, (unsigned short)116, (unsigned short)124, (unsigned short)122, (unsigned short)182, (unsigned short)237, (unsigned short)237, (unsigned short)1, (unsigned short)1, (unsigned short)114, (unsigned short)116, (unsigned short)116, (unsigned short)127, (unsigned short)127, (unsigned short)114, (unsigned short)127, (unsigned short)127, (unsigned short)203, (unsigned short)261, (unsigned short)262, (unsigned short)334, (unsigned short)329, (unsigned short)127, (unsigned short)127, (unsigned short)127, (unsigned short)127, (unsigned short)261, (unsigned short)262, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)114, (unsigned short)327, (unsigned short)261, (unsigned short)262, (unsigned short)261, (unsigned short)262, (unsigned short)191, (unsigned short)192, (unsigned short)194, (unsigned short)194, (unsigned short)1, (unsigned short)64, (unsigned short)64, (unsigned short)239, (unsigned short)259, (unsigned short)116, (unsigned short)239, (unsigned short)259, (unsigned short)116, (unsigned short)118, (unsigned short)116, (unsigned short)118, (unsigned short)342, (unsigned short)343, (unsigned short)116, (unsigned short)342, (unsigned short)343, (unsigned short)116, (unsigned short)120, (unsigned short)124, (unsigned short)115, (unsigned short)3, (unsigned short)116, (unsigned short)124, (unsigned short)345, (unsigned short)118, (unsigned short)345, (unsigned short)73, (unsigned short)182, (unsigned short)183, (unsigned short)184, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)120, (unsigned short)114, (unsigned short)127, (unsigned short)127, (unsigned short)116, (unsigned short)120, (unsigned short)121, (unsigned short)127, (unsigned short)127, (unsigned short)118, (unsigned short)342, (unsigned short)342, (unsigned short)116, (unsigned short)116, (unsigned short)118, (unsigned short)342, (unsigned short)239, (unsigned short)342, (unsigned short)343, (unsigned short)118, (unsigned short)344, (unsigned short)345, (unsigned short)237, (unsigned short)345, (unsigned short)118, (unsigned short)345, (unsigned short)116, (unsigned short)124, (unsigned short)3, (unsigned short)116, (unsigned short)124, (unsigned short)362, (unsigned short)362, (unsigned short)121, (unsigned short)183, (unsigned short)122, (unsigned short)182, (unsigned short)224, (unsigned short)246, (unsigned short)325, (unsigned short)121, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)124, (unsigned short)118, (unsigned short)345, (unsigned short)345, (unsigned short)118, (unsigned short)345, (unsigned short)184, (unsigned short)116, (unsigned short)342, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)345, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)124, (unsigned short)121, (unsigned short)116, (unsigned short)118, (unsigned short)118, (unsigned short)118, (unsigned short)345, (unsigned short)118, (unsigned short)116, (unsigned short)118
 };
 
-typedef unsigned int size_t;
+typedef uintptr_t size_t;
 
 void exit(int status);
 

diff --git a/compiler/bootstrap/libec/bootstrap/pass15.c b/compiler/bootstrap/libec/bootstrap/pass15.c
index b52e4a9..865aabb 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass15.c
+++ b/compiler/bootstrap/libec/bootstrap/pass15.c
@@ -926,7 +926,7 @@ struct __ecereNameSpace__ecere__com__Method * method;
 } __attribute__ ((gcc_struct));
 } __attribute__ ((gcc_struct));
 
-typedef unsigned int size_t;
+typedef uintptr_t size_t;
 
 void exit(int status);
 
@@ -1466,7 +1466,6 @@ int memberType;
 } __attribute__ ((gcc_struct));
 struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
 void *  param;
-char __ecere_padding[4];
 } __attribute__ ((gcc_struct));
 
 extern struct Expression * GetTemplateArgExpByName(char *  paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType);
@@ -2232,12 +2231,14 @@ void ComputeClassMembers(struct __ecereNameSpace__ecere__com__Class * _class, un
 struct __ecereNameSpace__ecere__com__DataMember * member = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
 struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
 
-if(member || ((_class->type == 2 || _class->type == 0 || _class->type == 1 || _class->type == 5) && (_class->type == 2 || _class->structSize == _class->offset) && _class->computeSize))
+if(member || ((_class->type == 2 || _class->type == 0 || _class->type == 1 || _class->type == 5) && (_class->type == 2 || (!_class->structSize || _class->structSize == _class->offset)) && _class->computeSize))
 {
 int c;
 int unionMemberOffset = 0;
 int bitFields = 0;
 
+if(!member && (_class->type == 1 || _class->type == 0 || _class->type == 5) && _class->memberOffset && _class->memberOffset > _class->base->structSize)
+_class->memberOffset = (_class->base && _class->base->type != 1000) ? _class->base->structSize : 0;
 if(!member && _class->destructionWatchOffset)
 _class->memberOffset += sizeof(struct __ecereNameSpace__ecere__sys__OldList);
 {
@@ -2444,7 +2445,14 @@ if(!isMember)
 {
 if(_class->type != 2)
 {
-_class->structSize = (_class->base ? (_class->base->templateClass ? _class->base->templateClass->structSize : _class->base->structSize) : 0) + _class->memberOffset;
+int extra = 0;
+
+if(_class->structAlignment)
+{
+if(_class->memberOffset % _class->structAlignment)
+extra += _class->structAlignment - (_class->memberOffset % _class->structAlignment);
+}
+_class->structSize = (_class->base ? (_class->base->templateClass ? _class->base->templateClass->structSize : _class->base->structSize) : 0) + _class->memberOffset + extra;
 if(!member)
 {
 struct __ecereNameSpace__ecere__com__Property * prop;
@@ -2818,11 +2826,18 @@ else
 }
 else if(totalSize < maxSize && _class->type != 1000)
 {
+int autoPadding = 0;
+
+if(!isMember && _class->structAlignment && totalSize % _class->structAlignment)
+autoPadding = _class->structAlignment - (totalSize % _class->structAlignment);
+if(totalSize + autoPadding < maxSize)
+{
 char sizeString[50];
 
 sprintf(sizeString, "%d", maxSize - totalSize);
 ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(CHAR)), MkListOne(MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__ecere_padding")), MkExpConstant(sizeString))), (((void *)0)))));
 }
+}
 if(context)
 FinishTemplatesContext(context);
 return topMember ? topMember->memberID : _class->memberID;

diff --git a/compiler/bootstrap/libec/bootstrap/pass2.c b/compiler/bootstrap/libec/bootstrap/pass2.c
index 99f1f3f..bc40075 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass2.c
+++ b/compiler/bootstrap/libec/bootstrap/pass2.c
@@ -2692,7 +2692,10 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list),
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
 }
 else if(parentExp && parentExp->type == 11)
+{
 parentExp->cast.exp = newExp;
+parentExp->cast.typeName->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), parentExp->cast.typeName->declarator);
+}
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), parentExp ? parentExp : newExp);
 }
 else

diff --git a/compiler/bootstrap/libec/bootstrap/type.c b/compiler/bootstrap/libec/bootstrap/type.c
index 363d295..a5dc5ed 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/type.c
+++ b/compiler/bootstrap/libec/bootstrap/type.c
@@ -1030,7 +1030,7 @@ static const yytype_uint16 yystos[] =
 (unsigned short)0, (unsigned short)1, (unsigned short)3, (unsigned short)28, (unsigned short)29, (unsigned short)30, (unsigned short)31, (unsigned short)32, (unsigned short)33, (unsigned short)34, (unsigned short)35, (unsigned short)36, (unsigned short)37, (unsigned short)38, (unsigned short)39, (unsigned short)40, (unsigned short)41, (unsigned short)42, (unsigned short)43, (unsigned short)44, (unsigned short)45, (unsigned short)46, (unsigned short)47, (unsigned short)48, (unsigned short)49, (unsigned short)50, (unsigned short)65, (unsigned short)66, (unsigned short)74, (unsigned short)75, (unsigned short)79, (unsigned short)82, (unsigned short)83, (unsigned short)85, (unsigned short)100, (unsigned short)110, (unsigned short)111, (unsigned short)138, (unsigned short)139, (unsigned short)140, (unsigned short)141, (unsigned short)142, (unsigned short)147, (unsigned short)179, (unsigned short)180, (unsigned short)185, (unsigned short)186, (unsigned short)187, (unsigned short)191, (unsigned short)192, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)197, (unsigned short)203, (unsigned short)211, (unsigned short)212, (unsigned short)230, (unsigned short)261, (unsigned short)112, (unsigned short)115, (unsigned short)120, (unsigned short)147, (unsigned short)186, (unsigned short)215, (unsigned short)217, (unsigned short)219, (unsigned short)220, (unsigned short)222, (unsigned short)223, (unsigned short)224, (unsigned short)227, (unsigned short)135, (unsigned short)142, (unsigned short)147, (unsigned short)115, (unsigned short)123, (unsigned short)186, (unsigned short)219, (unsigned short)227, (unsigned short)219, (unsigned short)115, (unsigned short)113, (unsigned short)1, (unsigned short)112, (unsigned short)113, (unsigned short)147, (unsigned short)138, (unsigned short)147, (unsigned short)185, (unsigned short)186, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)212, (unsigned short)217, (unsigned short)219, (unsigned short)115, (unsigned short)135, (unsigned short)141, (unsigned short)142, (unsigned short)147, (unsigned short)186, (unsigned short)132, (unsigned short)0, (unsigned short)193, (unsigned short)226, (unsigned short)227, (unsigned short)116, (unsigned short)147, (unsigned short)217, (unsigned short)219, (unsigned short)228, (unsigned short)229, (unsigned short)230, (unsigned short)1, (unsigned short)4, (unsigned short)5, (unsigned short)6, (unsigned short)8, (unsigned short)9, (unsigned short)71, (unsigned short)72, (unsigned short)73, (unsigned short)102, (unsigned short)103, (unsigned short)109, (unsigned short)112, (unsigned short)115, (unsigned short)117, (unsigned short)118, (unsigned short)121, (unsigned short)123, (unsigned short)124, (unsigned short)125, (unsigned short)126, (unsigned short)140, (unsigned short)147, (unsigned short)148, (unsigned short)149, (unsigned short)150, (unsigned short)154, (unsigned short)155, (unsigned short)157, (unsigned short)158, (unsigned short)159, (unsigned short)160, (unsigned short)161, (unsigned short)162, (unsigned short)163, (unsigned short)164, (unsigned short)165, (unsigned short)166, (unsigned short)167, (unsigned short)168, (unsigned short)169, (unsigned short)170, (unsigned short)174, (unsigned short)248, (unsigned short)251, (unsigned short)215, (unsigned short)220, (unsigned short)223, (unsigned short)227, (unsigned short)115, (unsigned short)120, (unsigned short)186, (unsigned short)115, (unsigned short)120, (unsigned short)116, (unsigned short)147, (unsigned short)228, (unsigned short)231, (unsigned short)186, (unsigned short)215, (unsigned short)224, (unsigned short)147, (unsigned short)213, (unsigned short)214, (unsigned short)135, (unsigned short)135, (unsigned short)219, (unsigned short)227, (unsigned short)140, (unsigned short)147, (unsigned short)140, (unsigned short)147, (unsigned short)161, (unsigned short)178, (unsigned short)185, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)198, (unsigned short)199, (unsigned short)200, (unsigned short)201, (unsigned short)202, (unsigned short)212, (unsigned short)115, (unsigned short)68, (unsigned short)78, (unsigned short)115, (unsigned short)117, (unsigned short)134, (unsigned short)136, (unsigned short)143, (unsigned short)144, (unsigned short)145, (unsigned short)146, (unsigned short)147, (unsigned short)150, (unsigned short)179, (unsigned short)186, (unsigned short)204, (unsigned short)205, (unsigned short)206, (unsigned short)207, (unsigned short)208, (unsigned short)220, (unsigned short)221, (unsigned short)223, (unsigned short)227, (unsigned short)250, (unsigned short)251, (unsigned short)253, (unsigned short)135, (unsigned short)135, (unsigned short)135, (unsigned short)142, (unsigned short)147, (unsigned short)140, (unsigned short)174, (unsigned short)193, (unsigned short)227, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)122, (unsigned short)115, (unsigned short)149, (unsigned short)152, (unsigned short)154, (unsigned short)156, (unsigned short)115, (unsigned short)155, (unsigned short)155, (unsigned short)147, (unsigned short)179, (unsigned short)174, (unsigned short)179, (unsigned short)174, (unsigned short)115, (unsigned short)156, (unsigned short)116, (unsigned short)155, (unsigned short)170, (unsigned short)171, (unsigned short)173, (unsigned short)176, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)212, (unsigned short)232, (unsigned short)248, (unsigned short)121, (unsigned short)135, (unsigned short)135, (unsigned short)7, (unsigned short)8, (unsigned short)9, (unsigned short)115, (unsigned short)119, (unsigned short)120, (unsigned short)158, (unsigned short)112, (unsigned short)127, (unsigned short)128, (unsigned short)124, (unsigned short)125, (unsigned short)10, (unsigned short)11, (unsigned short)161, (unsigned short)12, (unsigned short)13, (unsigned short)113, (unsigned short)114, (unsigned short)14, (unsigned short)15, (unsigned short)123, (unsigned short)129, (unsigned short)130, (unsigned short)16, (unsigned short)17, (unsigned short)131, (unsigned short)121, (unsigned short)215, (unsigned short)224, (unsigned short)116, (unsigned short)228, (unsigned short)121, (unsigned short)140, (unsigned short)174, (unsigned short)121, (unsigned short)140, (unsigned short)174, (unsigned short)116, (unsigned short)116, (unsigned short)122, (unsigned short)133, (unsigned short)122, (unsigned short)136, (unsigned short)213, (unsigned short)213, (unsigned short)116, (unsigned short)116, (unsigned short)133, (unsigned short)115, (unsigned short)147, (unsigned short)185, (unsigned short)186, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)212, (unsigned short)217, (unsigned short)227, (unsigned short)133, (unsigned short)11, (unsigned short)114, (unsigned short)122, (unsigned short)3, (unsigned short)28, (unsigned short)44, (unsigned short)74, (unsigned short)75, (unsigned short)116, (unsigned short)188, (unsigned short)189, (unsigned short)190, (unsigned short)34, (unsigned short)35, (unsigned short)36, (unsigned short)37, (unsigned short)38, (unsigned short)39, (unsigned short)40, (unsigned short)41, (unsigned short)42, (unsigned short)43, (unsigned short)46, (unsigned short)47, (unsigned short)50, (unsigned short)66, (unsigned short)100, (unsigned short)142, (unsigned short)147, (unsigned short)181, (unsigned short)185, (unsigned short)193, (unsigned short)195, (unsigned short)197, (unsigned short)203, (unsigned short)211, (unsigned short)179, (unsigned short)221, (unsigned short)112, (unsigned short)115, (unsigned short)147, (unsigned short)179, (unsigned short)135, (unsigned short)242, (unsigned short)243, (unsigned short)243, (unsigned short)243, (unsigned short)134, (unsigned short)243, (unsigned short)133, (unsigned short)115, (unsigned short)132, (unsigned short)134, (unsigned short)147, (unsigned short)186, (unsigned short)209, (unsigned short)210, (unsigned short)220, (unsigned short)221, (unsigned short)225, (unsigned short)227, (unsigned short)223, (unsigned short)227, (unsigned short)136, (unsigned short)208, (unsigned short)122, (unsigned short)134, (unsigned short)186, (unsigned short)223, (unsigned short)134, (unsigned short)134, (unsigned short)204, (unsigned short)136, (unsigned short)204, (unsigned short)136, (unsigned short)204, (unsigned short)135, (unsigned short)135, (unsigned short)51, (unsigned short)230, (unsigned short)138, (unsigned short)147, (unsigned short)155, (unsigned short)177, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)212, (unsigned short)233, (unsigned short)7, (unsigned short)8, (unsigned short)9, (unsigned short)115, (unsigned short)119, (unsigned short)120, (unsigned short)115, (unsigned short)120, (unsigned short)186, (unsigned short)216, (unsigned short)218, (unsigned short)227, (unsigned short)147, (unsigned short)182, (unsigned short)185, (unsigned short)193, (unsigned short)195, (unsigned short)196, (unsigned short)212, (unsigned short)120, (unsigned short)218, (unsigned short)182, (unsigned short)155, (unsigned short)233, (unsigned short)18, (unsigned short)19, (unsigned short)20, (unsigned short)21, (unsigned short)22, (unsigned short)23, (unsigned short)24, (unsigned short)25, (unsigned short)26, (unsigned short)27, (unsigned short)133, (unsigned short)172, (unsigned short)116, (unsigned short)122, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)212, (unsigned short)217, (unsigned short)116, (unsigned short)119, (unsigned short)134, (unsigned short)135, (unsigned short)136, (unsigned short)150, (unsigned short)151, (unsigned short)170, (unsigned short)178, (unsigned short)235, (unsigned short)252, (unsigned short)254, (unsigned short)255, (unsigned short)256, (unsigned short)257, (unsigned short)258, (unsigned short)259, (unsigned short)260, (unsigned short)136, (unsigned short)260, (unsigned short)147, (unsigned short)116, (unsigned short)151, (unsigned short)153, (unsigned short)171, (unsigned short)147, (unsigned short)173, (unsigned short)158, (unsigned short)158, (unsigned short)158, (unsigned short)159, (unsigned short)159, (unsigned short)160, (unsigned short)160, (unsigned short)161, (unsigned short)161, (unsigned short)161, (unsigned short)163, (unsigned short)163, (unsigned short)164, (unsigned short)165, (unsigned short)166, (unsigned short)167, (unsigned short)168, (unsigned short)173, (unsigned short)116, (unsigned short)121, (unsigned short)121, (unsigned short)121, (unsigned short)121, (unsigned short)147, (unsigned short)174, (unsigned short)214, (unsigned short)134, (unsigned short)136, (unsigned short)134, (unsigned short)136, (unsigned short)198, (unsigned short)199, (unsigned short)200, (unsigned short)227, (unsigned short)199, (unsigned short)200, (unsigned short)201, (unsigned short)116, (unsigned short)115, (unsigned short)116, (unsigned short)122, (unsigned short)189, (unsigned short)142, (unsigned short)147, (unsigned short)115, (unsigned short)113, (unsigned short)135, (unsigned short)147, (unsigned short)185, (unsigned short)193, (unsigned short)195, (unsigned short)217, (unsigned short)147, (unsigned short)186, (unsigned short)221, (unsigned short)186, (unsigned short)115, (unsigned short)136, (unsigned short)52, (unsigned short)53, (unsigned short)54, (unsigned short)55, (unsigned short)56, (unsigned short)57, (unsigned short)58, (unsigned short)59, (unsigned short)60, (unsigned short)61, (unsigned short)62, (unsigned short)77, (unsigned short)134, (unsigned short)147, (unsigned short)173, (unsigned short)175, (unsigned short)178, (unsigned short)237, (unsigned short)238, (unsigned short)239, (unsigned short)240, (unsigned short)241, (unsigned short)243, (unsigned short)244, (unsigned short)245, (unsigned short)246, (unsigned short)247, (unsigned short)249, (unsigned short)235, (unsigned short)116, (unsigned short)174, (unsigned short)135, (unsigned short)220, (unsigned short)227, (unsigned short)122, (unsigned short)134, (unsigned short)132, (unsigned short)191, (unsigned short)186, (unsigned short)220, (unsigned short)223, (unsigned short)205, (unsigned short)223, (unsigned short)136, (unsigned short)136, (unsigned short)136, (unsigned short)204, (unsigned short)136, (unsigned short)204, (unsigned short)116, (unsigned short)138, (unsigned short)193, (unsigned short)194, (unsigned short)196, (unsigned short)212, (unsigned short)217, (unsigned short)116, (unsigned short)147, (unsigned short)116, (unsigned short)153, (unsigned short)147, (unsigned short)173, (unsigned short)116, (unsigned short)218, (unsigned short)228, (unsigned short)174, (unsigned short)216, (unsigned short)227, (unsigned short)115, (unsigned short)120, (unsigned short)216, (unsigned short)113, (unsigned short)120, (unsigned short)147, (unsigned short)185, (unsigned short)193, (unsigned short)195, (unsigned short)196, (unsigned short)212, (unsigned short)218, (unsigned short)174, (unsigned short)120, (unsigned short)120, (unsigned short)218, (unsigned short)116, (unsigned short)116, (unsigned short)151, (unsigned short)171, (unsigned short)171, (unsigned short)158, (unsigned short)248, (unsigned short)136, (unsigned short)260, (unsigned short)133, (unsigned short)147, (unsigned short)221, (unsigned short)225, (unsigned short)243, (unsigned short)122, (unsigned short)134, (unsigned short)134, (unsigned short)255, (unsigned short)257, (unsigned short)258, (unsigned short)136, (unsigned short)136, (unsigned short)116, (unsigned short)122, (unsigned short)121, (unsigned short)132, (unsigned short)204, (unsigned short)204, (unsigned short)173, (unsigned short)116, (unsigned short)189, (unsigned short)140, (unsigned short)147, (unsigned short)202, (unsigned short)69, (unsigned short)70, (unsigned short)136, (unsigned short)113, (unsigned short)135, (unsigned short)135, (unsigned short)147, (unsigned short)142, (unsigned short)147, (unsigned short)116, (unsigned short)174, (unsigned short)132, (unsigned short)115, (unsigned short)115, (unsigned short)115, (unsigned short)237, (unsigned short)115, (unsigned short)147, (unsigned short)134, (unsigned short)134, (unsigned short)134, (unsigned short)173, (unsigned short)147, (unsigned short)132, (unsigned short)134, (unsigned short)134, (unsigned short)147, (unsigned short)183, (unsigned short)184, (unsigned short)219, (unsigned short)175, (unsigned short)240, (unsigned short)175, (unsigned short)237, (unsigned short)136, (unsigned short)134, (unsigned short)136, (unsigned short)260, (unsigned short)220, (unsigned short)186, (unsigned short)210, (unsigned short)220, (unsigned short)227, (unsigned short)174, (unsigned short)220, (unsigned short)136, (unsigned short)136, (unsigned short)116, (unsigned short)121, (unsigned short)116, (unsigned short)116, (unsigned short)121, (unsigned short)216, (unsigned short)116, (unsigned short)228, (unsigned short)174, (unsigned short)202, (unsigned short)174, (unsigned short)113, (unsigned short)120, (unsigned short)121, (unsigned short)174, (unsigned short)174, (unsigned short)120, (unsigned short)136, (unsigned short)235, (unsigned short)256, (unsigned short)151, (unsigned short)171, (unsigned short)170, (unsigned short)136, (unsigned short)136, (unsigned short)116, (unsigned short)116, (unsigned short)116, (unsigned short)114, (unsigned short)243, (unsigned short)243, (unsigned short)202, (unsigned short)69, (unsigned short)70, (unsigned short)136, (unsigned short)69, (unsigned short)70, (unsigned short)136, (unsigned short)135, (unsigned short)132, (unsigned short)237, (unsigned short)173, (unsigned short)173, (unsigned short)116, (unsigned short)173, (unsigned short)56, (unsigned short)116, (unsigned short)244, (unsigned short)134, (unsigned short)134, (unsigned short)133, (unsigned short)237, (unsigned short)135, (unsigned short)122, (unsigned short)134, (unsigned short)133, (unsigned short)136, (unsigned short)220, (unsigned short)227, (unsigned short)186, (unsigned short)220, (unsigned short)132, (unsigned short)116, (unsigned short)121, (unsigned short)114, (unsigned short)121, (unsigned short)202, (unsigned short)174, (unsigned short)121, (unsigned short)121, (unsigned short)174, (unsigned short)70, (unsigned short)136, (unsigned short)69, (unsigned short)136, (unsigned short)114, (unsigned short)243, (unsigned short)243, (unsigned short)243, (unsigned short)243, (unsigned short)69, (unsigned short)70, (unsigned short)136, (unsigned short)237, (unsigned short)116, (unsigned short)116, (unsigned short)237, (unsigned short)116, (unsigned short)115, (unsigned short)237, (unsigned short)116, (unsigned short)244, (unsigned short)174, (unsigned short)136, (unsigned short)260, (unsigned short)184, (unsigned short)135, (unsigned short)171, (unsigned short)234, (unsigned short)220, (unsigned short)220, (unsigned short)174, (unsigned short)114, (unsigned short)121, (unsigned short)121, (unsigned short)243, (unsigned short)243, (unsigned short)70, (unsigned short)136, (unsigned short)69, (unsigned short)136, (unsigned short)70, (unsigned short)136, (unsigned short)69, (unsigned short)136, (unsigned short)243, (unsigned short)243, (unsigned short)237, (unsigned short)237, (unsigned short)237, (unsigned short)173, (unsigned short)237, (unsigned short)116, (unsigned short)173, (unsigned short)134, (unsigned short)136, (unsigned short)234, (unsigned short)236, (unsigned short)136, (unsigned short)136, (unsigned short)243, (unsigned short)243, (unsigned short)243, (unsigned short)243, (unsigned short)70, (unsigned short)136, (unsigned short)69, (unsigned short)136, (unsigned short)64, (unsigned short)116, (unsigned short)237, (unsigned short)116, (unsigned short)122, (unsigned short)136, (unsigned short)136, (unsigned short)136, (unsigned short)136, (unsigned short)136, (unsigned short)243, (unsigned short)243, (unsigned short)237, (unsigned short)134, (unsigned short)237, (unsigned short)136, (unsigned short)234, (unsigned short)136, (unsigned short)136
 };
 
-typedef unsigned int size_t;
+typedef uintptr_t size_t;
 
 void exit(int status);
 

diff --git a/compiler/libec/src/pass2.ec b/compiler/libec/src/pass2.ec
index c41aeb0..14cbea2 100644 (file)
--- a/compiler/libec/src/pass2.ec
+++ b/compiler/libec/src/pass2.ec
@@ -1838,8 +1838,11 @@ static void ProcessExpression(Expression exp)
                               parentExp.list->Add(newExp);
                            }
                            else if(parentExp && parentExp.type == castExp)
+                           {
                               parentExp.cast.exp = newExp;
-
+                              // Add a dereference level here
+                              parentExp.cast.typeName.declarator = MkDeclaratorPointer(MkPointer(null, null), parentExp.cast.typeName.declarator);
+                           }
                            exp.call.arguments->Insert(null, parentExp ? parentExp : newExp);
                         }
                         else