compiler/libec: (#341, #351, #644, #771) Improved enum type matching and type handlin...

[sdk] / compiler / bootstrap / libec / bootstrap / pass2.c

diff --git a/compiler/bootstrap/libec/bootstrap/pass2.c b/compiler/bootstrap/libec/bootstrap/pass2.c
index 367683a..a172dcb 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass2.c
+++ b/compiler/bootstrap/libec/bootstrap/pass2.c
@@ -38,6 +38,8 @@ extern void *  __ecereNameSpace__ecere__com__eSystem_Renew(void *  memory, unsig
 
 extern void *  __ecereNameSpace__ecere__com__eSystem_Renew0(void *  memory, unsigned int size);
 
+extern void __ecereNameSpace__ecere__com__eSystem_Delete(void *  memory);
+
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
 
 struct __ecereNameSpace__ecere__sys__BTNode;
@@ -368,7 +370,11 @@ struct Identifier * identifier;
 } __attribute__ ((gcc_struct));
 struct Statement * compound;
 struct Instantiation * instance;
+struct
+{
 char *  string;
+unsigned int intlString;
+} __attribute__ ((gcc_struct));
 struct __ecereNameSpace__ecere__sys__OldList *  list;
 struct
 {
@@ -461,6 +467,7 @@ unsigned int isConstant;
 unsigned int addedThis;
 unsigned int needCast;
 unsigned int thisPtr;
+unsigned int opDestType;
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateDatatype;
@@ -787,7 +794,7 @@ unsigned int noExpansion;
 char *  defaultProperty;
 unsigned int comRedefinition;
 int count;
-unsigned int isRemote;
+int isRemote;
 unsigned int internalDecl;
 void *  data;
 unsigned int computeSize;
@@ -810,6 +817,8 @@ unsigned int byValueSystemClass;
 
 extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, char *  name);
 
+extern void __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
+
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
 
 struct __ecereNameSpace__ecere__com__Instance
@@ -879,7 +888,7 @@ struct __ecereNameSpace__ecere__com__Method * method;
 
 enum yytokentype
 {
-IDENTIFIER = 258, CONSTANT = 259, STRING_LITERAL = 260, SIZEOF = 261, PTR_OP = 262, INC_OP = 263, DEC_OP = 264, LEFT_OP = 265, RIGHT_OP = 266, LE_OP = 267, GE_OP = 268, EQ_OP = 269, NE_OP = 270, AND_OP = 271, OR_OP = 272, MUL_ASSIGN = 273, DIV_ASSIGN = 274, MOD_ASSIGN = 275, ADD_ASSIGN = 276, SUB_ASSIGN = 277, LEFT_ASSIGN = 278, RIGHT_ASSIGN = 279, AND_ASSIGN = 280, XOR_ASSIGN = 281, OR_ASSIGN = 282, TYPE_NAME = 283, TYPEDEF = 284, EXTERN = 285, STATIC = 286, AUTO = 287, REGISTER = 288, CHAR = 289, SHORT = 290, INT = 291, UINT = 292, INT64 = 293, LONG = 294, SIGNED = 295, UNSIGNED = 296, FLOAT = 297, DOUBLE = 298, CONST = 299, VOLATILE = 300, VOID = 301, VALIST = 302, STRUCT = 303, UNION = 304, ENUM = 305, ELLIPSIS = 306, CASE = 307, DEFAULT = 308, IF = 309, SWITCH = 310, WHILE = 311, DO = 312, FOR = 313, GOTO = 314, CONTINUE = 315, BREAK = 316, RETURN = 317, IFX = 318, ELSE = 319, CLASS = 320, THISCLASS = 321, CLASS_NAME = 322, PROPERTY = 323, SETPROP = 324, GETPROP = 325, NEWOP = 326, RENEW = 327, DELETE = 328, EXT_DECL = 329, EXT_STORAGE = 330, IMPORT = 331, DEFINE = 332, VIRTUAL = 333, ATTRIB = 334, PUBLIC = 335, PRIVATE = 336, TYPED_OBJECT = 337, ANY_OBJECT = 338, _INCREF = 339, EXTENSION = 340, ASM = 341, TYPEOF = 342, WATCH = 343, STOPWATCHING = 344, FIREWATCHERS = 345, WATCHABLE = 346, CLASS_DESIGNER = 347, CLASS_NO_EXPANSION = 348, CLASS_FIXED = 349, ISPROPSET = 350, CLASS_DEFAULT_PROPERTY = 351, PROPERTY_CATEGORY = 352, CLASS_DATA = 353, CLASS_PROPERTY = 354, SUBCLASS = 355, NAMESPACE = 356, NEW0OP = 357, RENEW0 = 358, VAARG = 359, DBTABLE = 360, DBFIELD = 361, DBINDEX = 362, DATABASE_OPEN = 363, ALIGNOF = 364, ATTRIB_DEP = 365, __ATTRIB = 366
+IDENTIFIER = 258, CONSTANT = 259, STRING_LITERAL = 260, SIZEOF = 261, PTR_OP = 262, INC_OP = 263, DEC_OP = 264, LEFT_OP = 265, RIGHT_OP = 266, LE_OP = 267, GE_OP = 268, EQ_OP = 269, NE_OP = 270, AND_OP = 271, OR_OP = 272, MUL_ASSIGN = 273, DIV_ASSIGN = 274, MOD_ASSIGN = 275, ADD_ASSIGN = 276, SUB_ASSIGN = 277, LEFT_ASSIGN = 278, RIGHT_ASSIGN = 279, AND_ASSIGN = 280, XOR_ASSIGN = 281, OR_ASSIGN = 282, TYPE_NAME = 283, TYPEDEF = 284, EXTERN = 285, STATIC = 286, AUTO = 287, REGISTER = 288, CHAR = 289, SHORT = 290, INT = 291, UINT = 292, INT64 = 293, LONG = 294, SIGNED = 295, UNSIGNED = 296, FLOAT = 297, DOUBLE = 298, CONST = 299, VOLATILE = 300, VOID = 301, VALIST = 302, STRUCT = 303, UNION = 304, ENUM = 305, ELLIPSIS = 306, CASE = 307, DEFAULT = 308, IF = 309, SWITCH = 310, WHILE = 311, DO = 312, FOR = 313, GOTO = 314, CONTINUE = 315, BREAK = 316, RETURN = 317, IFX = 318, ELSE = 319, CLASS = 320, THISCLASS = 321, CLASS_NAME = 322, PROPERTY = 323, SETPROP = 324, GETPROP = 325, NEWOP = 326, RENEW = 327, DELETE = 328, EXT_DECL = 329, EXT_STORAGE = 330, IMPORT = 331, DEFINE = 332, VIRTUAL = 333, ATTRIB = 334, PUBLIC = 335, PRIVATE = 336, TYPED_OBJECT = 337, ANY_OBJECT = 338, _INCREF = 339, EXTENSION = 340, ASM = 341, TYPEOF = 342, WATCH = 343, STOPWATCHING = 344, FIREWATCHERS = 345, WATCHABLE = 346, CLASS_DESIGNER = 347, CLASS_NO_EXPANSION = 348, CLASS_FIXED = 349, ISPROPSET = 350, CLASS_DEFAULT_PROPERTY = 351, PROPERTY_CATEGORY = 352, CLASS_DATA = 353, CLASS_PROPERTY = 354, SUBCLASS = 355, NAMESPACE = 356, NEW0OP = 357, RENEW0 = 358, VAARG = 359, DBTABLE = 360, DBFIELD = 361, DBINDEX = 362, DATABASE_OPEN = 363, ALIGNOF = 364, ATTRIB_DEP = 365, __ATTRIB = 366, BOOL = 367, _BOOL = 368, _COMPLEX = 369, _IMAGINARY = 370, RESTRICT = 371, THREAD = 372
 };
 
 typedef union YYSTYPE
@@ -948,6 +957,7 @@ struct AsmField * next;
 struct Location loc;
 char *  command;
 struct Expression * expression;
+struct Identifier * symbolic;
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attribute;
@@ -1022,9 +1032,13 @@ struct Statement * getStmt;
 struct Statement * setStmt;
 struct Statement * issetStmt;
 struct Symbol * symbol;
-unsigned int conversion;
-unsigned int isWatchable;
 struct Expression * category;
+struct
+{
+unsigned int conversion : 1;
+unsigned int isWatchable : 1;
+unsigned int isDBProp : 1;
+} __attribute__ ((gcc_struct));
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyWatch;
@@ -1084,6 +1098,8 @@ static struct Statement * curCompound;
 
 extern struct Expression * CopyExpression(struct Expression * exp);
 
+extern void FreeExpContents(struct Expression * exp);
+
 extern void FreeExpression(struct Expression * exp);
 
 void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void *  item);
@@ -1094,7 +1110,7 @@ static void _FixRefExp(struct Expression ** expPtr, struct Expression ** memberE
 {
 struct Expression * memberExp = *memberExpPtr;
 
-if(memberExp && memberExp->type == 8 && memberExp->member.exp && (memberExp->member.exp->type == 5 || memberExp->member.exp->type == 34))
+if(memberExp && memberExp->type == 8 && memberExp->member.exp && (memberExp->member.exp->type == 5 || memberExp->member.exp->type == 32))
 {
 struct Expression * bracketExp = memberExp->member.exp;
 struct Expression * idExp = (*bracketExp->list).last;
@@ -1106,6 +1122,7 @@ struct Expression * exp = *expPtr;
 
 *memberExpPtr = (((void *)0));
 newExp = CopyExpression(exp);
+FreeExpContents(exp);
 *(struct Expression **)((unsigned char *)newExp + ((unsigned char *)memberExpPtr - (unsigned char *)exp)) = memberExp;
 memberExp->member.exp = idExp;
 exp->type = 5;
@@ -1117,7 +1134,7 @@ FreeExpression(bracketExp);
 *expPtr = exp;
 }
 }
-else if(*expPtr && (*expPtr)->type == 4 && (*expPtr)->op.op == '&' && !(*expPtr)->op.exp1 && memberExp && (memberExp->type == 5 || memberExp->type == 34) && memberExp->list && (*memberExp->list).count > 1)
+else if(*expPtr && (*expPtr)->type == 4 && (*expPtr)->op.op == '&' && !(*expPtr)->op.exp1 && memberExp && (memberExp->type == 5 || memberExp->type == 32) && memberExp->list && (*memberExp->list).count > 1)
 {
 struct Expression * newExp = (((void *)0));
 struct Expression * exp = *expPtr;
@@ -1172,7 +1189,7 @@ struct Expression * exp = e;
 
 for(; ; )
 {
-if(exp->type == 5 || exp->type == 34)
+if(exp->type == 5 || exp->type == 32)
 {
 if(exp->list)
 {
@@ -1232,7 +1249,7 @@ unsigned int byReference = 0x0;
 
 for(; exp; )
 {
-if(exp->type == 5 || exp->type == 34)
+if(exp->type == 5 || exp->type == 32)
 {
 if((*exp->list).count > 1)
 byReference = 0x1;
@@ -1286,6 +1303,8 @@ extern struct Symbol * FindClass(char *  name);
 
 extern void DeclareClass(struct Symbol * classSym, char *  className);
 
+extern void FreeIdentifier(struct Identifier * id);
+
 extern struct Expression * MkExpCast(struct TypeName * typeName, struct Expression * expression);
 
 extern struct Expression * MkExpIndex(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * index);
@@ -1296,6 +1315,8 @@ extern struct Expression * MkExpIdentifier(struct Identifier * id);
 
 extern struct Identifier * MkIdentifier(char *  string);
 
+extern void FreeSpecifier(struct Specifier * spec);
+
 extern char *  __ecereNameSpace__ecere__sys__CopyString(char *  string);
 
 extern void ListAdd(struct __ecereNameSpace__ecere__sys__OldList * list, void *  item);
@@ -1368,16 +1389,12 @@ unsigned int constant;
 
 extern struct __ecereNameSpace__ecere__com__ClassProperty * __ecereNameSpace__ecere__com__eClass_FindClassProperty(struct __ecereNameSpace__ecere__com__Class * _class, char *  name);
 
-extern void FreeExpContents(struct Expression * exp);
+extern char *  QMkString(char *  source);
 
 extern struct Expression * MkExpString(char *  string);
 
-extern char *  QMkString(char *  source);
-
 extern struct Specifier * MkSpecifier(int specifier);
 
-extern void FreeIdentifier(struct Identifier * id);
-
 extern struct Context * PushContext(void);
 
 extern struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements);
@@ -1402,9 +1419,7 @@ extern void FreeType(struct Type * type);
 
 extern void Compiler_Error(char *  format, ...);
 
-extern char *  __ecereNameSpace__ecere__GetTranslatedString(struct __ecereNameSpace__ecere__com__Instance * module, char *  string, char *  stringAndContext);
-
-extern struct __ecereNameSpace__ecere__com__Instance * __thisModule;
+extern char *  __ecereNameSpace__ecere__GetTranslatedString(char * name, char *  string, char *  stringAndContext);
 
 extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_FindMethod(struct __ecereNameSpace__ecere__com__Class * _class, char *  name, struct __ecereNameSpace__ecere__com__Instance * module);
 
@@ -1446,6 +1461,8 @@ extern struct Context * SetupTemplatesContext(struct __ecereNameSpace__ecere__co
 
 extern void FinishTemplatesContext(struct Context * context);
 
+extern void FreeTypeName(struct TypeName * typeName);
+
 extern struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions);
 
 extern struct Type * ProcessTypeString(char *  string, unsigned int staticMethod);
@@ -1454,8 +1471,6 @@ extern void PrintTypeNoConst(struct Type * type, char *  string, unsigned int pr
 
 extern int ComputeTypeSize(struct Type * type);
 
-extern void FreeTypeName(struct TypeName * typeName);
-
 extern struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
 
 extern unsigned int internalValueCounter;
@@ -1466,8 +1481,6 @@ extern struct Type * ProcessTemplateParameterType(struct TemplateParameter * par
 
 extern void DeclareStruct(char *  name, unsigned int skipNoHead);
 
-extern void FreeSpecifier(struct Specifier * spec);
-
 static void ProcessStatement(struct Statement * stmt);
 
 extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (*  FreeFunction)(void * ));
@@ -1539,6 +1552,8 @@ MangleClassName(className);
 if(!_class->symbol)
 _class->symbol = FindClass(_class->fullName);
 DeclareClass(_class->symbol, className);
+if(exp->identifier)
+FreeIdentifier(exp->identifier);
 exp->type = 5;
 exp->list = MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name))))));
 }
@@ -1552,6 +1567,7 @@ FullClassNameCat(name, method->_class->fullName, 0x0);
 strcat(name, "_");
 strcat(name, method->name);
 (__ecereNameSpace__ecere__com__eSystem_Delete(exp->identifier->string), exp->identifier->string = 0);
+FreeSpecifier(exp->identifier->_class);
 exp->identifier->_class = (((void *)0));
 exp->identifier->string = __ecereNameSpace__ecere__sys__CopyString(name);
 DeclareMethod(method, name);
@@ -1564,13 +1580,13 @@ break;
 case 3:
 break;
 case 13:
-case 28:
+case 26:
 case 14:
-case 29:
+case 27:
 {
 struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
 
-if(exp->type == 14 || exp->type == 29)
+if(exp->type == 14 || exp->type == 27)
 ListAdd(args, exp->_renew.exp);
 ListAdd(args, MkExpOp(MkExpTypeSize(exp->_new.typeName), '*', MkExpBrackets(MkListOne(exp->_new.size))));
 switch(exp->type)
@@ -1578,13 +1594,13 @@ switch(exp->type)
 case 13:
 exp->call.exp = QMkExpId("ecere::com::eSystem_New");
 break;
-case 28:
+case 26:
 exp->call.exp = QMkExpId("ecere::com::eSystem_New0");
 break;
 case 14:
 exp->call.exp = QMkExpId("ecere::com::eSystem_Renew");
 break;
-case 29:
+case 27:
 exp->call.exp = QMkExpId("ecere::com::eSystem_Renew0");
 break;
 }
@@ -1681,7 +1697,7 @@ while(testExp)
 {
 if(testExp->type == 11)
 testExp = testExp->cast.exp;
-else if(testExp->type == 5 || testExp->type == 34)
+else if(testExp->type == 5 || testExp->type == 32)
 testExp = (*testExp->list).last;
 else if(testExp->type == 8)
 break;
@@ -1789,10 +1805,10 @@ exp2 = exp->op.exp2;
 }
 }
 memberExp = exp->op.exp1;
-while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 34 || memberExp->type == 25))
+while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 32 || memberExp->type == 23))
 {
 parentExp = memberExp;
-if(memberExp->type == 25)
+if(memberExp->type == 23)
 memberExp = (*((struct Statement *)(*memberExp->compound->compound.statements).last)->expressions).last;
 else
 memberExp = (*memberExp->list).last;
@@ -1800,18 +1816,18 @@ memberExp = (*memberExp->list).last;
 if(memberExp && memberExp->type == 6 && memberExp->index.exp && memberExp->index.exp->expType && memberExp->index.exp->expType->kind == 8 && memberExp->index.exp->expType->_class && memberExp->index.exp->expType->_class->registered && memberExp->index.exp->expType->_class->registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(memberExp->index.exp->expType->_class->registered, containerClass))
 {
 ProcessExpression(memberExp);
-while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 34 || memberExp->type == 25))
+while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 32 || memberExp->type == 23))
 {
 parentExp = memberExp;
-if(memberExp->type == 25)
+if(memberExp->type == 23)
 memberExp = (*((struct Statement *)(*memberExp->compound->compound.statements).last)->expressions).last;
 else
 memberExp = (*memberExp->list).last;
 }
-if(memberExp && memberExp->type == 25)
+if(memberExp && memberExp->type == 23)
 {
 parentExp = memberExp;
-if(memberExp->type == 25)
+if(memberExp->type == 23)
 {
 struct Statement * stmt = memberExp->compound->compound.statements ? (*memberExp->compound->compound.statements).last : (((void *)0));
 
@@ -1848,7 +1864,7 @@ if(memberExp == exp1)
 exp1 = (((void *)0));
 else
 {
-if(parentExp->type == 25)
+if(parentExp->type == 23)
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), memberExp);
 else
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), memberExp);
@@ -1916,7 +1932,12 @@ exp->type = 7;
 exp->call.exp = MkExpIdentifier(MkIdentifier("ecere::com::eClass_SetProperty"));
 exp->call.arguments = MkList();
 ListAdd(exp->call.arguments, classExp);
-ListAdd(exp->call.arguments, MkExpString(QMkString(id->string)));
+{
+char * s = QMkString(id->string);
+
+ListAdd(exp->call.arguments, MkExpString(s));
+(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
+}
 ListAdd(exp->call.arguments, MkExpCast(MkTypeName(MkListOne(MkSpecifier(INT64)), (((void *)0))), value));
 FreeIdentifier(id);
 ProcessExpression(exp);
@@ -2003,7 +2024,7 @@ exp->tempCount++;
 curExternal->function->tempCount = (__simpleStruct0 = curExternal->function->tempCount, __simpleStruct1 = exp->tempCount, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1);
 sprintf(ecereTemp, "__ecTemp%d", exp->tempCount);
 curContext = context;
-exp->type = 25;
+exp->type = 23;
 exp->compound = MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifier(VOID)), MkListOne(MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier(ecereTemp))), MkInitializerAssignment(QBrackets(memberExp->member.exp)))))), list);
 args = MkList();
 if(convertTo)
@@ -2032,7 +2053,7 @@ else
 {
 struct Expression * newExp = exp;
 
-if(parentExp && parentExp->type == 25)
+if(parentExp && parentExp->type == 23)
 {
 newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), newExp);
@@ -2077,7 +2098,7 @@ if(member)
 memberExp->member.memberType = 3;
 }
 else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "no set defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "no set defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
 }
 }
 else
@@ -2149,6 +2170,8 @@ struct Expression * object = exp->op.exp2;
 
 exp->op.exp2 = (((void *)0));
 FreeExpContents(exp);
+FreeType(exp->expType);
+FreeType(exp->destType);
 exp->expType = (((void *)0));
 exp->destType = (((void *)0));
 exp->op.op = INC_OP;
@@ -2367,7 +2390,7 @@ FreeExpression(exp2);
 break;
 }
 case 5:
-case 34:
+case 32:
 {
 if(exp->list)
 {
@@ -2394,9 +2417,9 @@ struct Expression * e;
 struct Expression * checkedExp = exp->index.exp;
 unsigned int isBuiltin = 0x0;
 
-while(checkedExp->type == 25 || checkedExp->type == 5 || checkedExp->type == 11)
+while(checkedExp->type == 23 || checkedExp->type == 5 || checkedExp->type == 11)
 {
-if(checkedExp->type == 25)
+if(checkedExp->type == 23)
 {
 isBuiltin = 0x1;
 break;
@@ -2506,7 +2529,6 @@ break;
 case 7:
 {
 struct Expression * e;
-struct Expression * memberExp;
 unsigned int typedObject = 0x0;
 struct Type * ellipsisDestType = (((void *)0));
 unsigned int usedEllipsis = 0x0;
@@ -2529,9 +2551,10 @@ exp->call.exp->usage = (exp->call.exp->usage & ~0x1) | (((unsigned int)0x1) << 0
 exp->call.exp->usage = (exp->call.exp->usage & ~0x8) | (((unsigned int)0x1) << 3);
 exp->call.exp->tempCount = exp->tempCount;
 ProcessExpression(exp->call.exp);
-memberExp = (exp->call.exp->type == 8) ? exp->call.exp : (((void *)0));
 if(exp->call.exp->expType && exp->call.exp->expType->kind == 16)
 {
+unsigned int nullMemberExp = 0x0;
+struct Expression * memberExp = (exp->call.exp->type == 8) ? exp->call.exp : (((void *)0));
 struct __ecereNameSpace__ecere__com__Class * _class = exp->call.exp->expType->methodClass;
 struct __ecereNameSpace__ecere__com__Class * argClass = exp->call.exp->expType->methodClass;
 struct __ecereNameSpace__ecere__com__Method * method = exp->call.exp->expType->method;
@@ -2569,7 +2592,10 @@ struct TypeName * firstParam = ((struct TypeName *)(*funcDecl->function.paramete
 struct Specifier * firstSpec = firstParam ? (*firstParam->qualifiers).first : (((void *)0));
 
 if(firstParam && firstSpec && firstSpec->type == 0 && firstSpec->specifier == VOID && !firstParam->declarator)
+{
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*funcDecl->function.parameters), (*funcDecl->function.parameters).first);
+FreeTypeName(firstParam);
+}
 }
 if(method->dataType->thisClass && !strcmp(method->dataType->thisClass->string, "class"))
 {
@@ -2655,6 +2681,8 @@ exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPoin
 }
 else if(_class || exp->call.exp->expType->methodClass || !memberExp || !regClass || regClass->type != 0 || !strcmp(regClass->dataTypeString, "char *"))
 {
+if(!memberExp)
+FreeExpression(exp->call.exp);
 exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
 }
 else
@@ -2663,6 +2691,7 @@ struct Expression * c;
 struct Context * context = PushContext();
 
 c = MkExpExtensionCompound(MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifierName("Instance")), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_ClassInst")), MkInitializerAssignment(CopyExpression(memberExp->member.exp)))))), MkListOne(MkExpressionStmt(MkListOne(MkExpCondition(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkListOne(MkExpPointer(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkIdentifier("_vTbl"))), MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl"))))))));
+c->loc = exp->loc;
 c->compound->compound.context = context;
 PopContext(context);
 exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(c, MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
@@ -2677,6 +2706,8 @@ strcpy(name, "__ecereMethod_");
 FullClassNameCat(name, method->_class->fullName, 0x0);
 strcat(name, "_");
 strcat(name, method->name);
+if(!memberExp)
+FreeExpression(exp->call.exp);
 exp->call.exp = MkExpIdentifier(MkIdentifier(name));
 DeclareMethod(method, name);
 if(memberExp && memberExp->expType && method->dataType)
@@ -2719,17 +2750,34 @@ else if(!memberExp->member.exp->byReference)
 struct Expression * checkedExp = memberExp->member.exp;
 struct Expression * parentExp = (((void *)0));
 struct Expression * newExp;
+unsigned int disconnected = 0x0;
 
-while(((checkedExp->type == 5 || checkedExp->type == 34) && checkedExp->list) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32) && checkedExp->list) || checkedExp->type == 11)
 {
 parentExp = checkedExp;
-if(checkedExp->type == 5 || checkedExp->type == 34)
+if(checkedExp->type == 5 || checkedExp->type == 32)
+{
 checkedExp = (*checkedExp->list).last;
+if(checkedExp && !disconnected)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
+disconnected = 0x1;
+}
+}
 else if(checkedExp->type == 11)
+{
 checkedExp = checkedExp->cast.exp;
+if(checkedExp && !disconnected)
+{
+checkedExp->cast.exp = (((void *)0));
+disconnected = 0x1;
 }
+}
+}
+if(!parentExp)
+nullMemberExp = 0x1;
 newExp = (typedObject && !memberExp->member.exp->expType->classObjectType) ? checkedExp : MkExpOp((((void *)0)), '&', checkedExp);
-if(parentExp && (parentExp->type == 5 || parentExp->type == 34))
+if(parentExp && (parentExp->type == 5 || parentExp->type == 32))
 {
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
@@ -2743,6 +2791,8 @@ if(typedObject && !memberExp->member.exp->expType->classObjectType)
 {
 struct Type * destType = (destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), destType->refCount = 1, destType->kind = 8, destType->classObjectType = 3, destType);
 
+FreeType((parentExp ? parentExp : newExp)->expType);
+FreeType((parentExp ? parentExp : newExp)->destType);
 (parentExp ? parentExp : newExp)->expType = checkedExp->expType;
 (parentExp ? parentExp : newExp)->destType = destType;
 if(checkedExp->expType)
@@ -2751,10 +2801,16 @@ checkedExp->expType->refCount++;
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), parentExp ? parentExp : newExp);
 }
 else
+{
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
+nullMemberExp = 0x1;
+}
 }
 else
+{
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
+nullMemberExp = 0x1;
+}
 {
 char className[1024];
 struct Type * type = memberExp->member.exp ? memberExp->member.exp->expType : (((void *)0));
@@ -2794,9 +2850,16 @@ if(memberExpMemberExp)
 FreeExpression(memberExpMemberExp);
 }
 else
+{
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
-memberExp->member.exp = (((void *)0));
+nullMemberExp = 0x1;
+}
+}
 }
+if(memberExp)
+{
+if(nullMemberExp)
+memberExp->member.exp = (((void *)0));
 FreeExpression(memberExp);
 }
 }
@@ -2854,12 +2917,12 @@ struct Expression * newExp;
 
 checkedExp = e;
 parentExp = exp;
-while(((checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25) && checkedExp->list) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->list) || checkedExp->type == 11)
 {
 parentExp = checkedExp;
-if(checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25)
+if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
 {
-if(checkedExp->type == 25)
+if(checkedExp->type == 23)
 {
 checkedExp = (*((struct Statement *)(*checkedExp->compound->compound.statements).last)->expressions).last;
 }
@@ -2888,7 +2951,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.argument
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->call.arguments), e);
 e = newExp;
 }
-else if(parentExp->type == 5 || parentExp->type == 34)
+else if(parentExp->type == 5 || parentExp->type == 32)
 {
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
@@ -2902,7 +2965,7 @@ parentExp->cast.typeName = MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclarator
 }
 parentExp->cast.exp = newExp;
 }
-else if(parentExp->type == 25)
+else if(parentExp->type == 23)
 {
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), checkedExp);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), newExp);
@@ -2940,7 +3003,7 @@ PrintTypeNoConst(e->expType, typeString, 0x0, 0x1);
 decl = SpecDeclFromString(typeString, specs, (((void *)0)));
 newExp->destType = ProcessType(specs, decl);
 curContext = context;
-e->type = 25;
+e->type = 23;
 if(curCompound)
 {
 char name[100];
@@ -2963,12 +3026,12 @@ curContext = context->parent;
 }
 checkedExp = e;
 parentExp = exp;
-while(((checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25) && checkedExp->list) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->list) || checkedExp->type == 11)
 {
 parentExp = checkedExp;
-if(checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25)
+if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
 {
-if(checkedExp->type == 25)
+if(checkedExp->type == 23)
 {
 checkedExp = (*((struct Statement *)(*checkedExp->compound->compound.statements).last)->expressions).last;
 }
@@ -2986,14 +3049,14 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.argument
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->call.arguments), e);
 e = newExp;
 }
-else if(parentExp->type == 5 || parentExp->type == 34)
+else if(parentExp->type == 5 || parentExp->type == 32)
 {
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
 }
 else if(parentExp->type == 11)
 parentExp->cast.exp = newExp;
-else if(parentExp->type == 5 || parentExp->type == 25)
+else if(parentExp->type == 5 || parentExp->type == 23)
 {
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), checkedExp);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), newExp);
@@ -3027,11 +3090,18 @@ if(_class->type == 0 && destType->byReference == 0x0 && strcmp(_class->dataTypeS
 struct Expression * c;
 struct Context * context = PushContext();
 
+if(_class->templateClass && !strcmp(_class->templateClass->name, "Container") && e->list && (*e->list).first && ((struct Expression *)(*e->list).first)->type == 11 && ((struct Expression *)(*e->list).first)->cast.exp && ((struct Expression *)(*e->list).first)->cast.exp->type == 4 && ((struct Expression *)(*e->list).first)->cast.exp->op.op == '&' && ((struct Expression *)(*e->list).first)->cast.exp->op.exp2 && ((struct Expression *)(*e->list).first)->cast.exp->op.exp2->type == 33)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), e->prev, MkExpIdentifier(MkIdentifier(className)));
+}
+else
+{
 c = MkExpExtensionCompound(MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifierName("Instance")), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_ClassInst")), MkInitializerAssignment(CopyExpression(e)))))), MkListOne(MkExpressionStmt(MkListOne(MkExpCondition(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkListOne(MkExpPointer(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkIdentifier("_class"))), MkExpIdentifier(MkIdentifier(className))))))));
 c->compound->compound.context = context;
 PopContext(context);
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), e->prev, c);
 }
+}
 else
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), e->prev, MkExpIdentifier(MkIdentifier(className)));
 }
@@ -3077,7 +3147,7 @@ struct __ecereNameSpace__ecere__com__Class * convertTo = (((void *)0));
 struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
 unsigned int thisPtr = exp->member.thisPtr;
 
-if(type->kind == 19 && exp->member.exp->type == 26)
+if(type->kind == 19 && exp->member.exp->type == 24)
 _class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::com::Class");
 if(!_class)
 {
@@ -3112,11 +3182,11 @@ prop = (((void *)0));
 else
 {
 if(((unsigned int)((exp->usage & 0x40) >> 6)))
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "cannot obtain address of property\n", (((void *)0))));
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot obtain address of property\n", (((void *)0))));
 else if(!prop->Get)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
 else if(((unsigned int)((exp->usage & 0x80) >> 7)))
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
 }
 }
 }
@@ -3280,7 +3350,12 @@ exp->type = 7;
 exp->call.exp = MkExpIdentifier(MkIdentifier("ecere::com::eClass_GetProperty"));
 exp->call.arguments = MkList();
 ListAdd(exp->call.arguments, classExp);
-ListAdd(exp->call.arguments, MkExpString(QMkString(id->string)));
+{
+char * s = QMkString(id->string);
+
+ListAdd(exp->call.arguments, MkExpString(s));
+(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
+}
 FreeIdentifier(id);
 ProcessExpression(exp);
 return ;
@@ -3313,6 +3388,7 @@ MangleClassName(className);
 if(!_class->symbol)
 _class->symbol = FindClass(_class->fullName);
 DeclareClass(_class->symbol, className);
+FreeExpression(exp->member.exp);
 exp->index.exp = MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl"));
 }
 else
@@ -3348,7 +3424,7 @@ if(((unsigned int)((exp->usage & 0x1) >> 0)))
 exp->member.exp->usage = (exp->member.exp->usage & ~0x1) | (((unsigned int)0x1) << 0);
 }
 ProcessExpression(exp->member.exp);
-if(type->kind == 8)
+if(type->kind == 8 && type->_class && type->_class->registered)
 DeclareStruct(type->_class->registered->fullName, 0x0);
 if(_class->type == 5)
 {
@@ -3382,7 +3458,7 @@ else if(_class->type == 3)
 }
 else
 {
-if(exp->member.exp->type == 0 && thisPtr && (!exp->member.exp->expType || !exp->member.exp->expType->typedByReference))
+if(exp->member.exp->type == 0 && thisPtr && type->kind == 8 && (!exp->member.exp->expType || !exp->member.exp->expType->typedByReference))
 {
 char pointerName[1024];
 
@@ -3410,9 +3486,9 @@ DeclareStruct(member->_class->fullName, 0x0);
 structName[0] = (char)0;
 FullClassNameCat(structName, member->_class->fullName, 0x0);
 checkedExp = exp->member.exp;
-while(((checkedExp->type == 5 || checkedExp->type == 34) && checkedExp->list && (*checkedExp->list).count == 1) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32) && checkedExp->list && (*checkedExp->list).count == 1) || checkedExp->type == 11)
 {
-if(checkedExp->type == 5 || checkedExp->type == 34)
+if(checkedExp->type == 5 || checkedExp->type == 32)
 checkedExp = (*checkedExp->list).last;
 else if(checkedExp->type == 11)
 checkedExp = checkedExp->cast.exp;
@@ -3422,7 +3498,6 @@ if(checkedExp->type != 0 && checkedExp->type != 2 && checkedExp->type != 8 && ch
 int __simpleStruct0, __simpleStruct1;
 char ecereTemp[100];
 struct Statement * compound;
-struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
 struct Context * context = PushContext();
 
 if(exp->member.exp->tempCount > exp->tempCount)
@@ -3491,7 +3566,7 @@ exp->type = 9;
 }
 break;
 }
-case 25:
+case 23:
 {
 struct Expression * e = (*((struct Statement *)(*exp->compound->compound.statements).last)->expressions).last;
 
@@ -3559,7 +3634,7 @@ exp->cond.elseExp->usage = (exp->cond.elseExp->usage & ~0x1) | (((unsigned int)0
 ProcessExpression(exp->cond.elseExp);
 break;
 }
-case 26:
+case 24:
 {
 if(exp->_classExp.specifiers && (*exp->_classExp.specifiers).first && ((struct Specifier *)(*exp->_classExp.specifiers).first)->type == 8)
 {
@@ -3597,12 +3672,12 @@ exp->identifier = MkIdentifier(className);
 }
 break;
 }
-case 36:
+case 34:
 {
 ProcessExpression(exp->vaArg.exp);
 break;
 }
-case 35:
+case 33:
 {
 ProcessInitializer(exp->initializer.initializer);
 break;
@@ -3617,6 +3692,8 @@ static void ProcessInitializer(struct Initializer * init)
 switch(init->type)
 {
 case 0:
+if(init->exp)
+{
 init->exp->usage = (init->exp->usage & ~0x1) | (((unsigned int)0x1) << 0);
 ProcessExpression(init->exp);
 if(init->exp->destType && init->exp->destType->kind == 8 && init->exp->destType->_class && init->exp->destType->_class->registered && init->exp->destType->_class->registered->type == 5)
@@ -3625,13 +3702,17 @@ FixReference(init->exp, 0x1);
 }
 else if(init->exp->destType && init->exp->destType->kind == 8)
 FixReference(init->exp, 0x0);
+}
 break;
 case 1:
 {
+if(init->list)
+{
 struct Initializer * i;
 
 for(i = (*init->list).first; i; i = i->next)
 ProcessInitializer(i);
+}
 break;
 }
 }
@@ -3738,11 +3819,14 @@ case 5:
 {
 struct Expression * exp;
 
+if(stmt->switchStmt.exp && (*stmt->switchStmt.exp).last)
+{
 ((struct Expression *)(*stmt->switchStmt.exp).last)->usage = (((struct Expression *)(*stmt->switchStmt.exp).last)->usage & ~0x1) | (((unsigned int)0x1) << 0);
 for(exp = (*stmt->switchStmt.exp).first; exp; exp = exp->next)
 {
 ProcessExpression(exp);
 }
+}
 ProcessStatement(stmt->switchStmt.stmt);
 break;
 }
@@ -3750,11 +3834,14 @@ case 6:
 {
 struct Expression * exp;
 
+if(stmt->whileStmt.exp && (*stmt->whileStmt.exp).last)
+{
 ((struct Expression *)(*stmt->whileStmt.exp).last)->usage = (((struct Expression *)(*stmt->whileStmt.exp).last)->usage & ~0x1) | (((unsigned int)0x1) << 0);
 for(exp = (*stmt->whileStmt.exp).first; exp; exp = exp->next)
 {
 ProcessExpression(exp);
 }
+}
 ProcessStatement(stmt->whileStmt.stmt);
 break;
 }