marked all generated bootstrap C source files with 'code generated from eC srouce...

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

diff --git a/compiler/bootstrap/libec/bootstrap/ast.c b/compiler/bootstrap/libec/bootstrap/ast.c
index f1d7423..2d41adb 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/ast.c
+++ b/compiler/bootstrap/libec/bootstrap/ast.c
@@ -1,6 +1,10 @@
+/* Code generated from eC source file. */
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
+#ifndef _WIN32
+#define __declspec(x)
+#endif
 #elif defined(__TINYC__)
 #include <stdarg.h>
 #define __builtin_va_list va_list
@@ -10,6 +14,8 @@ typedef unsigned long long uint64;
 #define strcasecmp stricmp
 #define strncasecmp strnicmp
 #define __declspec(x) __attribute__((x))
+#else
+#define __declspec(x)
 #endif
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -22,6 +28,28 @@ typedef unsigned __int64 uint64;
 #else
 #define __ENDIAN_PAD(x) 0
 #endif
+#include <stdint.h>
+#include <sys/types.h>
+
+#if /*defined(_W64) || */(defined(__WORDSIZE) && __WORDSIZE == 8) || defined(__x86_64__)
+#define _64BIT 1
+#else
+#define _64BIT 0
+#endif
+
+#define arch_PointerSize                  sizeof(void *)
+#define structSize_Instance               (_64BIT ? 24 : 12)
+#define structSize_OldLink                (_64BIT ? 24 : 12)
+#define structSize_NamedLink              (_64BIT ? 32 : 16)
+
+extern void *  __ecereNameSpace__ecere__com__eSystem_New(unsigned int size);
+
+extern void *  __ecereNameSpace__ecere__com__eSystem_New0(unsigned int size);
+
+extern void *  __ecereNameSpace__ecere__com__eSystem_Renew(void *  memory, unsigned int size);
+
+extern void *  __ecereNameSpace__ecere__com__eSystem_Renew0(void *  memory, unsigned int size);
+
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
 
 struct __ecereNameSpace__ecere__sys__BTNode;
@@ -32,7 +60,7 @@ struct __ecereNameSpace__ecere__sys__BinaryTree
 {
 struct __ecereNameSpace__ecere__sys__BTNode * root;
 int count;
-int (*  CompareKey)(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, unsigned int a, unsigned int b);
+int (*  CompareKey)(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, uintptr_t a, uintptr_t b);
 void (*  FreeKey)(void *  key);
 } __attribute__ ((gcc_struct));
 
@@ -80,9 +108,9 @@ struct __ecereNameSpace__ecere__com__Class * _class;
 char *  dataTypeString;
 struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
 struct Type * dataType;
-void (*  Set)();
-int (*  Get)();
-unsigned int (*  IsSet)();
+void (*  Set)(void * , int);
+int (*  Get)(void * );
+unsigned int (*  IsSet)(void * );
 void *  data;
 void *  symbol;
 int vid;
@@ -101,7 +129,7 @@ struct CodePosition
 int line;
 int charPos;
 int pos;
-unsigned int included;
+int included;
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Location;
@@ -448,7 +476,7 @@ struct TypeName * typeName;
 } __attribute__ ((gcc_struct));
 unsigned int debugValue;
 struct __ecereNameSpace__ecere__com__DataValue val;
-unsigned int address;
+uint64 address;
 unsigned int hasAddress;
 struct Type * expType;
 struct Type * destType;
@@ -531,6 +559,7 @@ struct __ecereNameSpace__ecere__sys__OldList *  baseSpecs;
 struct __ecereNameSpace__ecere__sys__OldList *  definitions;
 unsigned int addNameSpace;
 struct Context * ctx;
+struct ExtDecl * extDeclStruct;
 } __attribute__ ((gcc_struct));
 struct Expression * expression;
 struct Specifier * _class;
@@ -775,25 +804,27 @@ struct Symbol * enumClass;
 struct Type * type;
 struct TemplateParameter * templateParameter;
 } __attribute__ ((gcc_struct));
-unsigned int isSigned;
 int kind;
-unsigned int constant;
 unsigned int size;
 char *  name;
 char *  typeName;
-unsigned int count;
-unsigned int truth;
 int classObjectType;
-unsigned int byReference;
-unsigned int extraParam;
 int alignment;
-unsigned int directClassAccess;
-unsigned int computing;
-unsigned int dllExport;
 unsigned int offset;
-unsigned int keepCast;
-unsigned int passAsTemplate;
 int bitFieldCount;
+int count;
+unsigned int isSigned : 1;
+unsigned int constant : 1;
+unsigned int truth : 1;
+unsigned int byReference : 1;
+unsigned int extraParam : 1;
+unsigned int directClassAccess : 1;
+unsigned int computing : 1;
+unsigned int keepCast : 1;
+unsigned int passAsTemplate : 1;
+unsigned int dllExport : 1;
+unsigned int attrStdcall : 1;
+unsigned int declaredWithStruct : 1;
 } __attribute__ ((gcc_struct));
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Class;
@@ -852,8 +883,11 @@ struct __ecereNameSpace__ecere__com__ClassTemplateArgument *  templateArgs;
 struct __ecereNameSpace__ecere__com__Class * templateClass;
 struct __ecereNameSpace__ecere__sys__OldList templatized;
 int numParams;
+unsigned int isInstanceClass;
 } __attribute__ ((gcc_struct));
 
+extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, char *  name);
+
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
 
 struct __ecereNameSpace__ecere__com__Instance
@@ -1163,7 +1197,7 @@ char * defaultNameSpace;
 
 int defaultNameSpaceLen;
 
-extern int strlen(const char * );
+extern size_t strlen(const char * );
 
 void SetDefaultNameSpace(char * s)
 {
@@ -1231,7 +1265,7 @@ if(item)
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(list, (((void *)0)), item);
 }
 
-extern void *  memcpy(void * , const void * , unsigned int size);
+extern void *  memcpy(void * , const void * , size_t size);
 
 extern int strcmp(const char * , const char * );
 
@@ -1243,7 +1277,7 @@ extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplatedType;
 
 struct TemplatedType
 {
-unsigned int key;
+uintptr_t key;
 struct __ecereNameSpace__ecere__sys__BTNode * parent;
 struct __ecereNameSpace__ecere__sys__BTNode * left;
 struct __ecereNameSpace__ecere__sys__BTNode * right;
@@ -1263,7 +1297,6 @@ extern void *  __ecereNameSpace__ecere__com__eInstance_New(struct __ecereNameSpa
 
 struct Identifier * MkIdentifier(char * string)
 {
-void * __ecereTemp1;
 struct Identifier * id = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Identifier);
 int c;
 
@@ -1291,7 +1324,7 @@ memcpy(name, string, c + 1);
 name[c + 1] = '\0';
 if(!strcmp(name, "typed_object"))
 {
-id->_class = MkSpecifierName("class");
+id->_class = MkSpecifierName("typed_object");
 id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
 }
 else if(!strcmp(name, "property"))
@@ -1315,7 +1348,11 @@ struct TemplatedType * templatedType = FindTemplateTypeParameter(curContext, nam
 
 if(templatedType)
 {
-id->_class = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 8, ((struct Specifier *)__ecereTemp1)->templateParameter = templatedType->param, ((struct Specifier *)__ecereTemp1));
+id->_class = __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+
+__ecereInstance1->type = 8, __ecereInstance1->templateParameter = templatedType->param, __ecereInstance1;
+});
 id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
 }
 else
@@ -1351,7 +1388,7 @@ struct TemplateParameter * MkTypeTemplateParameter(struct Identifier * identifie
 if(identifier->string)
 {
 struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 0, param->identifier = identifier, param->dataType = baseTplDatatype, param->defaultArgument = defaultArgument, param);
-struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (unsigned int)identifier->string, type->param = param, type);
+struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (uintptr_t)identifier->string, type->param = param, type);
 
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
 ((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor(type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor(type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
@@ -1412,30 +1449,38 @@ return argument;
 
 struct Expression * MkExpExtensionCompound(struct Statement * compound)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 25, ((struct Expression *)__ecereTemp1)->compound = compound, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 25, __ecereInstance1->compound = compound, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpExtensionExpression(struct __ecereNameSpace__ecere__sys__OldList * expressions)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 34, ((struct Expression *)__ecereTemp1)->list = expressions, ((struct Expression *)__ecereTemp1)->loc = yylloc, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 34, __ecereInstance1->list = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpExtensionInitializer(struct TypeName * typeName, struct Initializer * initializer)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 35, ((struct Expression *)__ecereTemp1)->initializer.typeName = typeName, ((struct Expression *)__ecereTemp1)->initializer.initializer = initializer, ((struct Expression *)__ecereTemp1)->loc = yylloc, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 35, __ecereInstance1->initializer.typeName = typeName, __ecereInstance1->initializer.initializer = initializer, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpIdentifier(struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 0, ((struct Expression *)__ecereTemp1)->identifier = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->identifier = id, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpDummy()
@@ -1447,16 +1492,20 @@ return exp;
 
 struct Expression * MkExpConstant(char * string)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 2, ((struct Expression *)__ecereTemp1)->constant = __ecereNameSpace__ecere__sys__CopyString(string), ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->constant = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1;
+});
 }
 
 struct Expression * MkExpString(char * string)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 3, ((struct Expression *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(string), ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1;
+});
 }
 
 struct ContextStringPair
@@ -1611,133 +1660,169 @@ return exp;
 
 struct Expression * MkExpIndex(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * index)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 6, ((struct Expression *)__ecereTemp1)->index.exp = expression, ((struct Expression *)__ecereTemp1)->index.index = index, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->index.exp = expression, __ecereInstance1->index.index = index, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpCall(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * arguments)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 7, ((struct Expression *)__ecereTemp1)->call.exp = expression, ((struct Expression *)__ecereTemp1)->call.arguments = arguments, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->call.exp = expression, __ecereInstance1->call.arguments = arguments, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpMember(struct Expression * expression, struct Identifier * member)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 8, ((struct Expression *)__ecereTemp1)->member.exp = expression, ((struct Expression *)__ecereTemp1)->member.member = member, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 8, __ecereInstance1->member.exp = expression, __ecereInstance1->member.member = member, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpPointer(struct Expression * expression, struct Identifier * member)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 9, ((struct Expression *)__ecereTemp1)->member.exp = expression, ((struct Expression *)__ecereTemp1)->member.member = member, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 9, __ecereInstance1->member.exp = expression, __ecereInstance1->member.member = member, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpTypeSize(struct TypeName * typeName)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 10, ((struct Expression *)__ecereTemp1)->typeName = typeName, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 10, __ecereInstance1->typeName = typeName, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpTypeAlign(struct TypeName * typeName)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 38, ((struct Expression *)__ecereTemp1)->typeName = typeName, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 38, __ecereInstance1->typeName = typeName, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpClassSize(struct Specifier * _class)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 15, ((struct Expression *)__ecereTemp1)->_class = _class, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 15, __ecereInstance1->_class = _class, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpCast(struct TypeName * typeName, struct Expression * expression)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 11, ((struct Expression *)__ecereTemp1)->cast.typeName = typeName, ((struct Expression *)__ecereTemp1)->cast.exp = expression, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 11, __ecereInstance1->cast.typeName = typeName, __ecereInstance1->cast.exp = expression, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpCondition(struct Expression * cond, struct __ecereNameSpace__ecere__sys__OldList * expressions, struct Expression * elseExp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 12, ((struct Expression *)__ecereTemp1)->cond.cond = cond, ((struct Expression *)__ecereTemp1)->cond.exp = expressions, ((struct Expression *)__ecereTemp1)->cond.elseExp = elseExp, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 12, __ecereInstance1->cond.cond = cond, __ecereInstance1->cond.exp = expressions, __ecereInstance1->cond.elseExp = elseExp, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpRenew(struct Expression * memExp, struct TypeName * type, struct Expression * size)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 14, ((struct Expression *)__ecereTemp1)->_renew.exp = memExp, ((struct Expression *)__ecereTemp1)->_renew.typeName = type, ((struct Expression *)__ecereTemp1)->_renew.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 14, __ecereInstance1->_renew.exp = memExp, __ecereInstance1->_renew.typeName = type, __ecereInstance1->_renew.size = size, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpRenew0(struct Expression * memExp, struct TypeName * type, struct Expression * size)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 29, ((struct Expression *)__ecereTemp1)->_renew.exp = memExp, ((struct Expression *)__ecereTemp1)->_renew.typeName = type, ((struct Expression *)__ecereTemp1)->_renew.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 29, __ecereInstance1->_renew.exp = memExp, __ecereInstance1->_renew.typeName = type, __ecereInstance1->_renew.size = size, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpNew(struct TypeName * type, struct Expression * size)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 13, ((struct Expression *)__ecereTemp1)->_new.typeName = type, ((struct Expression *)__ecereTemp1)->_new.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 13, __ecereInstance1->_new.typeName = type, __ecereInstance1->_new.size = size, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpNew0(struct TypeName * type, struct Expression * size)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 28, ((struct Expression *)__ecereTemp1)->_new.typeName = type, ((struct Expression *)__ecereTemp1)->_new.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 28, __ecereInstance1->_new.typeName = type, __ecereInstance1->_new.size = size, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpVaArg(struct Expression * exp, struct TypeName * type)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 36, ((struct Expression *)__ecereTemp1)->vaArg.exp = exp, ((struct Expression *)__ecereTemp1)->vaArg.typeName = type, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 36, __ecereInstance1->vaArg.exp = exp, __ecereInstance1->vaArg.typeName = type, __ecereInstance1;
+});
 }
 
 struct Specifier * MkSpecifier(int specifier)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 0, ((struct Specifier *)__ecereTemp1)->specifier = specifier, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->specifier = specifier, __ecereInstance1;
+});
 }
 
 struct Specifier * MkSpecifierTypeOf(struct Expression * expression)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 6, ((struct Specifier *)__ecereTemp1)->expression = expression, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->expression = expression, __ecereInstance1;
+});
 }
 
 struct Specifier * MkSpecifierSubClass(struct Specifier * _class)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 7, ((struct Specifier *)__ecereTemp1)->_class = _class, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->_class = _class, __ecereInstance1;
+});
 }
 
 struct Specifier * MkSpecifierExtended(struct ExtDecl * extDecl)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 5, ((struct Specifier *)__ecereTemp1)->extDecl = extDecl, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->extDecl = extDecl, __ecereInstance1;
+});
 }
 
 struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
 
-extern char *  strstr(char * , const char * );
+extern char *  strstr(const char * , const char * );
 
 extern void FreeSymbol(struct Symbol * symbol);
 
@@ -1787,7 +1872,6 @@ struct Symbol * FindType(struct Context * ctx, char *  name);
 
 struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions)
 {
-void * __ecereTemp1;
 struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = type, spec->id = id, spec);
 
 if(id && FindType(curContext, id->string))
@@ -1802,7 +1886,11 @@ struct __ecereNameSpace__ecere__sys__OldList specs =
 struct Symbol * symbol;
 
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec);
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(&specs, (((void *)0))), ((struct Symbol *)__ecereTemp1)->isStruct = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 0x1, __ecereInstance1;
+});
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
 FreeSymbol(symbol);
 }
@@ -1811,8 +1899,6 @@ return spec;
 
 void AddStructDefinitions(struct Specifier * spec, struct __ecereNameSpace__ecere__sys__OldList * definitions)
 {
-void * __ecereTemp1;
-
 spec->definitions = definitions;
 if(definitions && spec->id && !declMode)
 {
@@ -1823,7 +1909,11 @@ struct __ecereNameSpace__ecere__sys__OldList specs =
 };
 
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec);
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(spec->id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(&specs, (((void *)0))), ((struct Symbol *)__ecereTemp1)->isStruct = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(spec->id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 0x1, __ecereInstance1;
+});
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->parent->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
 FreeSymbol(symbol);
 }
@@ -1831,135 +1921,272 @@ FreeSymbol(symbol);
 
 struct Attribute * MkAttribute(char * attr, struct Expression * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Attribute * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Attribute);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Attribute), ((struct Attribute *)__ecereTemp1)->attr = attr, ((struct Attribute *)__ecereTemp1)->exp = exp, ((struct Attribute *)__ecereTemp1));
+__ecereInstance1->attr = attr, __ecereInstance1->exp = exp, __ecereInstance1;
+});
 }
 
 struct Attrib * MkAttrib(int type, struct __ecereNameSpace__ecere__sys__OldList * attribs)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Attrib * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Attrib);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Attrib), ((struct Attrib *)__ecereTemp1)->type = type, ((struct Attrib *)__ecereTemp1)->attribs = attribs, ((struct Attrib *)__ecereTemp1));
+__ecereInstance1->type = type, __ecereInstance1->attribs = attribs, __ecereInstance1;
+});
 }
 
 struct ExtDecl * MkExtDeclString(char * s)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ExtDecl * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl), ((struct ExtDecl *)__ecereTemp1)->type = 0, ((struct ExtDecl *)__ecereTemp1)->s = s, ((struct ExtDecl *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->s = s, __ecereInstance1;
+});
 }
 
 struct ExtDecl * MkExtDeclAttrib(struct Attrib * attr)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ExtDecl * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl), ((struct ExtDecl *)__ecereTemp1)->type = 1, ((struct ExtDecl *)__ecereTemp1)->attr = attr, ((struct ExtDecl *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->attr = attr, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorIdentifier(struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 1, ((struct Declarator *)__ecereTemp1)->identifier = id, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->identifier = id, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorFunction(struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * parameters)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 4, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->function.parameters = parameters, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 4, __ecereInstance1->declarator = declarator, __ecereInstance1->function.parameters = parameters, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorExtended(struct ExtDecl * extended, struct Declarator * declarator)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 6, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->extended.extended = extended, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->declarator = declarator, __ecereInstance1->extended.extended = extended, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorExtendedEnd(struct ExtDecl * extended, struct Declarator * declarator)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 7, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->extended.extended = extended, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->declarator = declarator, __ecereInstance1->extended.extended = extended, __ecereInstance1;
+});
 }
 
 struct Declarator * MkStructDeclarator(struct Declarator * declarator, struct Expression * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 0, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->structDecl.exp = exp, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->declarator = declarator, __ecereInstance1->structDecl.exp = exp, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorBrackets(struct Declarator * declarator)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 2, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorArray(struct Declarator * declarator, struct Expression * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 3, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->array.exp = exp, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->array.exp = exp, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorEnumArray(struct Declarator * declarator, struct Specifier * _class)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 3, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->array.enumClass = _class, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->array.enumClass = _class, __ecereInstance1;
+});
 }
 
 struct Declarator * MkDeclaratorPointer(struct Pointer * pointer, struct Declarator * declarator)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 5, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->pointer.pointer = pointer, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->declarator = declarator, __ecereInstance1->pointer.pointer = pointer, __ecereInstance1;
+});
 }
 
 struct Enumerator * MkEnumerator(struct Identifier * id, struct Expression * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Enumerator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Enumerator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Enumerator), ((struct Enumerator *)__ecereTemp1)->id = id, ((struct Enumerator *)__ecereTemp1)->exp = exp, ((struct Enumerator *)__ecereTemp1));
+__ecereInstance1->id = id, __ecereInstance1->exp = exp, __ecereInstance1;
+});
 }
 
 struct Pointer * MkPointer(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Pointer * pointer)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Pointer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Pointer);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Pointer), ((struct Pointer *)__ecereTemp1)->qualifiers = qualifiers, ((struct Pointer *)__ecereTemp1)->pointer = pointer, ((struct Pointer *)__ecereTemp1));
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->pointer = pointer, __ecereInstance1;
+});
 }
 
 struct Initializer * MkInitializerAssignment(struct Expression * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Initializer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer), ((struct Initializer *)__ecereTemp1)->type = 0, ((struct Initializer *)__ecereTemp1)->exp = exp, ((struct Initializer *)__ecereTemp1)->loc = yylloc, ((struct Initializer *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->exp = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Initializer * MkInitializerList(struct __ecereNameSpace__ecere__sys__OldList * list)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Initializer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer), ((struct Initializer *)__ecereTemp1)->type = 1, ((struct Initializer *)__ecereTemp1)->list = list, ((struct Initializer *)__ecereTemp1)->loc = yylloc, ((struct Initializer *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->list = list, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct InitDeclarator * MkInitDeclarator(struct Declarator * declarator, struct Initializer * initializer)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct InitDeclarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_InitDeclarator);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_InitDeclarator), ((struct InitDeclarator *)__ecereTemp1)->declarator = declarator, ((struct InitDeclarator *)__ecereTemp1)->initializer = initializer, ((struct InitDeclarator *)__ecereTemp1));
+__ecereInstance1->declarator = declarator, __ecereInstance1->initializer = initializer, __ecereInstance1;
+});
 }
 
+int CheckType(char *  text);
+
+extern void FreeDeclarator(struct Declarator * decl);
+
 struct TypeName * MkTypeName(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
 {
-void * __ecereTemp1;
+if(qualifiers != (((void *)0)))
+{
+struct Declarator * parentDecl = declarator;
+struct Declarator * decl = declarator;
+
+while(decl && decl->type == 3)
+decl = decl->declarator;
+if(decl && decl->type == 1 && decl->identifier->string && CheckType(decl->identifier->string) == TYPE_NAME)
+{
+struct Specifier * spec;
+
+for(spec = qualifiers->first; spec; spec = spec->next)
+{
+if(spec->type == 0)
+{
+if(spec->specifier == CONST || spec->specifier == VOLATILE || spec->specifier == EXTERN || spec->specifier == STATIC || spec->specifier == AUTO || spec->specifier == REGISTER)
+continue;
+break;
+}
+else if(spec->type != 5)
+break;
+}
+if(!spec)
+{
+ListAdd(qualifiers, MkSpecifierName(decl->identifier->string));
+FreeDeclarator(decl);
+parentDecl->declarator = (((void *)0));
+}
+}
+}
+return __extension__ ({
+struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
+
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
+}
+
+extern char *  __ecereNameSpace__ecere__sys__RSearchString(char *  buffer, char *  subStr, int maxLen, unsigned int matchCase, unsigned int matchWord);
+
+extern void FreeSpecifier(struct Specifier * spec);
+
+void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void *  item);
+
+struct TypeName * MkTypeNameGuessDecl(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
+{
+if(qualifiers != (((void *)0)))
+{
+unsigned int gotType = 0x0;
+unsigned int gotFullType = 0x0;
+struct Specifier * spec, * next;
+
+for(spec = qualifiers->first; spec; spec = next)
+{
+next = spec->next;
+if(gotType && !declarator && ((spec->type == 1 && spec->name) || (spec->type == 0 && gotFullType)))
+{
+char * s = (((void *)0));
+
+if(spec->type == 1)
+{
+char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+
+s = colon ? colon + 2 : spec->name;
+}
+else if(spec->type == 0)
+{
+if(spec->specifier == INT64)
+s = "int64";
+}
+if(s)
+{
+declarator = MkDeclaratorIdentifier(MkIdentifier(s));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(qualifiers, spec);
+FreeSpecifier(spec);
+spec = (((void *)0));
+}
+}
+if(spec && spec->type != 5)
+{
+if(spec->type == 0)
+{
+if(spec->specifier == CONST || spec->specifier == VOLATILE || spec->specifier == EXTERN || spec->specifier == STATIC || spec->specifier == AUTO || spec->specifier == REGISTER)
+continue;
+else if(spec->specifier != UNSIGNED && spec->specifier != SIGNED && spec->specifier != LONG)
+gotFullType = 0x1;
+gotType = 0x1;
+}
+else
+{
+gotFullType = 0x1;
+gotType = 0x1;
+}
+}
+}
+}
+return __extension__ ({
+struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), ((struct TypeName *)__ecereTemp1)->qualifiers = qualifiers, ((struct TypeName *)__ecereTemp1)->declarator = declarator, ((struct TypeName *)__ecereTemp1));
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
 }
 
 struct Identifier * GetDeclId(struct Declarator * decl)
@@ -1971,9 +2198,11 @@ return decl ? decl->identifier : (((void *)0));
 
 struct Declaration * MkDeclarationClassInst(struct Instantiation * inst)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Declaration * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), ((struct Declaration *)__ecereTemp1)->type = 2, ((struct Declaration *)__ecereTemp1)->inst = inst, ((struct Declaration *)__ecereTemp1)->loc = yylloc, ((struct Declaration *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->inst = inst, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 extern struct Context * globalContext;
@@ -1984,7 +2213,6 @@ extern struct __ecereNameSpace__ecere__sys__OldList *  excludedSymbols;
 
 struct Declaration * MkDeclarationInst(struct Instantiation * inst)
 {
-void * __ecereTemp1;
 struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 2, decl->inst = inst, decl->loc = yylloc, decl);
 struct Symbol * symbol;
 
@@ -2014,7 +2242,11 @@ name[len] = (char)0;
 (__ecereNameSpace__ecere__com__eSystem_Delete(inst->exp->identifier->string), inst->exp->identifier->string = 0);
 inst->exp->identifier->string = __ecereNameSpace__ecere__sys__CopyString(name);
 }
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys__CopyString(inst->exp->identifier->string) : (((void *)0)), ((struct Symbol *)__ecereTemp1)->type = MkClassTypeSymbol(inst->_class->symbol), ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys__CopyString(inst->exp->identifier->string) : (((void *)0)), __ecereInstance1->type = MkClassTypeSymbol(inst->_class->symbol), __ecereInstance1;
+});
 symbol->idCode = symbol->id = curContext->nextID++;
 if(strstr(symbol->string, "::"))
 curContext->hasNameSpace = 0x1;
@@ -2090,16 +2322,17 @@ struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ec
 
 struct Declaration * MkDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * initDeclarators)
 {
-void * __ecereTemp1;
 struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 1, decl->declarators = initDeclarators, decl->specifiers = specifiers, decl->loc = yylloc, decl);
 unsigned int variable = 0x1;
 
 if(specifiers != (((void *)0)))
 {
-struct Specifier * spec;
+unsigned int gotType = 0x0;
+struct Specifier * spec, * next;
 
-for(spec = specifiers->first; spec; spec = spec->next)
+for(spec = specifiers->first; spec; spec = next)
 {
+next = spec->next;
 if(spec->type == 0 && spec->specifier == TYPEDEF)
 {
 if(initDeclarators != (((void *)0)))
@@ -2121,16 +2354,35 @@ decl->symbol = d->declarator->symbol = type;
 }
 else if(spec->next)
 {
-for(; spec; spec = spec->next)
+spec = specifiers->last;
+{
+if((spec->type == 1 && spec->name) || spec->type == 0)
+{
+char * s = (((void *)0));
+
+if(spec->type == 1)
+{
+char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+
+s = colon ? colon + 2 : spec->name;
+}
+else if(spec->type == 0)
 {
-if(spec->type == 1 && spec->name)
+if(spec->specifier == INT64)
+s = "int64";
+}
+if(s)
 {
-struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(spec->name), type->type = ProcessType(specifiers, (((void *)0))), type);
+struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(s), type->type = ProcessType(specifiers, (((void *)0))), type);
 
 type->id = type->idCode = curContext->nextID++;
+decl->symbol = type;
+decl->declarators = initDeclarators = MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+FreeSpecifier(spec);
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->types, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), type);
-decl->symbol = type;
+}
 }
 }
 }
@@ -2139,6 +2391,34 @@ break;
 }
 else if(spec->type == 0 && (spec->specifier == STRUCT || spec->specifier == UNION))
 variable = 0x0;
+else
+{
+if(gotType && initDeclarators == (((void *)0)) && !spec->next && ((spec->type == 1 && spec->name) || spec->type == 0))
+{
+char * s = (((void *)0));
+
+if(spec->type == 1)
+{
+char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+
+s = colon ? colon + 2 : spec->name;
+}
+else if(spec->type == 0)
+{
+if(spec->specifier == INT64)
+s = "int64";
+}
+if(s)
+{
+decl->declarators = initDeclarators = MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+FreeSpecifier(spec);
+spec = (((void *)0));
+}
+}
+}
+if(spec && spec->type != 5)
+gotType = 0x1;
 }
 }
 if(variable && initDeclarators)
@@ -2184,7 +2464,11 @@ id->string = __ecereNameSpace__ecere__sys__CopyString(name);
 symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, id->string);
 if(!symbol)
 {
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(specifiers, d->declarator), ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(specifiers, d->declarator), __ecereInstance1;
+});
 if(strstr(symbol->string, "::"))
 curContext->hasNameSpace = 0x1;
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
@@ -2240,127 +2524,231 @@ return decl;
 
 struct Declaration * MkStructDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * declarators, struct Specifier * extStorage)
 {
-void * __ecereTemp1;
+struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 0, decl->declarators = declarators, decl->specifiers = specifiers, decl->extStorage = extStorage, decl->loc = yylloc, decl);
+
+if(specifiers != (((void *)0)))
+{
+unsigned int gotType = 0x0;
+struct Specifier * spec, * next;
+
+for(spec = specifiers->first; spec; spec = next)
+{
+next = spec->next;
+if(gotType && declarators == (((void *)0)) && ((spec->type == 1 && spec->name) || spec->type == 0))
+{
+char * s = (((void *)0));
+
+if(spec->type == 1)
+{
+char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), ((struct Declaration *)__ecereTemp1)->type = 0, ((struct Declaration *)__ecereTemp1)->declarators = declarators, ((struct Declaration *)__ecereTemp1)->specifiers = specifiers, ((struct Declaration *)__ecereTemp1)->extStorage = extStorage, ((struct Declaration *)__ecereTemp1)->loc = yylloc, ((struct Declaration *)__ecereTemp1));
+s = colon ? colon + 2 : spec->name;
+}
+else if(spec->type == 0)
+{
+if(spec->specifier == INT64)
+s = "int64";
+}
+if(s)
+{
+decl->declarators = declarators = MkListOne(MkStructDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+FreeSpecifier(spec);
+spec = (((void *)0));
+}
+}
+if(spec && spec->type != 5)
+gotType = 0x1;
+}
+}
+return decl;
 }
 
 struct Statement * MkLabeledStmt(struct Identifier * id, struct Statement * statement)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 0, ((struct Statement *)__ecereTemp1)->labeled.id = id, ((struct Statement *)__ecereTemp1)->labeled.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->labeled.id = id, __ecereInstance1->labeled.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkCaseStmt(struct Expression * exp, struct Statement * statement)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 1, ((struct Statement *)__ecereTemp1)->caseStmt.exp = exp, ((struct Statement *)__ecereTemp1)->caseStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->caseStmt.exp = exp, __ecereInstance1->caseStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 2, ((struct Statement *)__ecereTemp1)->compound.declarations = declarations, ((struct Statement *)__ecereTemp1)->compound.statements = statements, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->compound.declarations = declarations, __ecereInstance1->compound.statements = statements, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkExpressionStmt(struct __ecereNameSpace__ecere__sys__OldList * expressions)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 3, ((struct Statement *)__ecereTemp1)->expressions = expressions, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->expressions = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkBadDeclStmt(struct Declaration * decl)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 14, ((struct Statement *)__ecereTemp1)->decl = decl, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 14, __ecereInstance1->decl = decl, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkIfStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement, struct Statement * elseStmt)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 4, ((struct Statement *)__ecereTemp1)->ifStmt.exp = exp, ((struct Statement *)__ecereTemp1)->ifStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->ifStmt.elseStmt = elseStmt, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 4, __ecereInstance1->ifStmt.exp = exp, __ecereInstance1->ifStmt.stmt = statement, __ecereInstance1->ifStmt.elseStmt = elseStmt, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkSwitchStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
 {
-void * __ecereTemp1;
-
 if(statement)
 statement->compound.isSwitch = 0x1;
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 5, ((struct Statement *)__ecereTemp1)->switchStmt.exp = exp, ((struct Statement *)__ecereTemp1)->switchStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+
+__ecereInstance1->type = 5, __ecereInstance1->switchStmt.exp = exp, __ecereInstance1->switchStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkWhileStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 6, ((struct Statement *)__ecereTemp1)->whileStmt.exp = exp, ((struct Statement *)__ecereTemp1)->whileStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->whileStmt.exp = exp, __ecereInstance1->whileStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkDoWhileStmt(struct Statement * statement, struct __ecereNameSpace__ecere__sys__OldList * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 7, ((struct Statement *)__ecereTemp1)->doWhile.exp = exp, ((struct Statement *)__ecereTemp1)->doWhile.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->doWhile.exp = exp, __ecereInstance1->doWhile.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkForStmt(struct Statement * init, struct Statement * check, struct __ecereNameSpace__ecere__sys__OldList * inc, struct Statement * statement)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 8, ((struct Statement *)__ecereTemp1)->forStmt.init = init, ((struct Statement *)__ecereTemp1)->forStmt.check = check, ((struct Statement *)__ecereTemp1)->forStmt.increment = inc, ((struct Statement *)__ecereTemp1)->forStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 8, __ecereInstance1->forStmt.init = init, __ecereInstance1->forStmt.check = check, __ecereInstance1->forStmt.increment = inc, __ecereInstance1->forStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkForEachStmt(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * exp, struct __ecereNameSpace__ecere__sys__OldList * filter, struct Statement * statement)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 18, ((struct Statement *)__ecereTemp1)->forEachStmt.id = id, ((struct Statement *)__ecereTemp1)->forEachStmt.exp = exp, ((struct Statement *)__ecereTemp1)->forEachStmt.filter = filter, ((struct Statement *)__ecereTemp1)->forEachStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 18, __ecereInstance1->forEachStmt.id = id, __ecereInstance1->forEachStmt.exp = exp, __ecereInstance1->forEachStmt.filter = filter, __ecereInstance1->forEachStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkGotoStmt(struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 9, ((struct Statement *)__ecereTemp1)->gotoStmt.id = id, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 9, __ecereInstance1->gotoStmt.id = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkContinueStmt()
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 10, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 10, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkBreakStmt()
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 11, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 11, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
 struct Statement * MkReturnStmt(struct __ecereNameSpace__ecere__sys__OldList * exp)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 12, ((struct Statement *)__ecereTemp1)->expressions = exp, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 12, __ecereInstance1->expressions = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
 }
 
+struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit);
+
 struct FunctionDefinition * MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList)
 {
-void * __ecereTemp1;
-
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionDefinition), ((struct FunctionDefinition *)__ecereTemp1)->specifiers = specifiers, ((struct FunctionDefinition *)__ecereTemp1)->declarator = declarator, ((struct FunctionDefinition *)__ecereTemp1)->declarations = declarationList, ((struct FunctionDefinition *)__ecereTemp1));
+return _MkFunction(specifiers, declarator, declarationList, 0x1);
 }
 
 extern struct Declarator * GetFuncDecl(struct Declarator * decl);
 
+extern void Compiler_Error(char *  format, ...);
+
+struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit)
+{
+if(errorOnOmit)
+{
+struct Declarator * funcDecl = GetFuncDecl(declarator);
+
+if(funcDecl && funcDecl->function.parameters)
+{
+struct TypeName * tn;
+
+for(tn = (*funcDecl->function.parameters).first; tn; tn = tn->next)
+{
+if(tn->qualifiers || tn->declarator)
+{
+struct Identifier * declID = tn->declarator ? GetDeclId(tn->declarator) : (((void *)0));
+
+if(!declID)
+{
+struct Specifier * spec = tn->qualifiers ? (*tn->qualifiers).first : (((void *)0));
+
+if(!tn->declarator && !tn->prev && !tn->next && spec && !spec->next && spec->type == 0 && spec->specifier == VOID)
+;
+else
+Compiler_Error("parameter name omitted\n");
+break;
+}
+}
+}
+}
+}
+return __extension__ ({
+struct FunctionDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionDefinition);
+
+__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = declarator, __ecereInstance1->declarations = declarationList, __ecereInstance1;
+});
+}
+
 struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(struct __ecereNameSpace__ecere__sys__BinaryTree * this);
 
 extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__sys__BinaryTree_first;
@@ -2369,11 +2757,8 @@ struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecer
 
 extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__sys__BTNode_next;
 
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void *  item);
-
 void ProcessFunctionBody(struct FunctionDefinition * func, struct Statement * body)
 {
-void * __ecereTemp1;
 struct Declarator * declarator = func->declarator;
 struct Declarator * funcDecl = GetFuncDecl(declarator);
 struct Symbol * symbol;
@@ -2399,7 +2784,11 @@ if(!strcmp(symbol->string, string))
 break;
 if(!symbol && id)
 {
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(param->qualifiers, param->declarator), ((struct Symbol *)__ecereTemp1)->isParam = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 0x1, __ecereInstance1;
+});
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
 symbol->id = context->nextID++;
@@ -2439,7 +2828,11 @@ name[len] = (char)0;
 (__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
 id->string = __ecereNameSpace__ecere__sys__CopyString(name);
 }
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(func->specifiers, declarator), ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(func->specifiers, declarator), __ecereInstance1;
+});
 symbol->idCode = symbol->id = globalContext->nextID++;
 if(strstr(symbol->string, "::"))
 globalContext->hasNameSpace = 0x1;
@@ -2494,7 +2887,7 @@ external->symbol->methodExternal = external;
 return external;
 }
 
-extern char *  strncpy(char * , const char * , int n);
+extern char *  strncpy(char * , const char * , size_t n);
 
 extern void ImportModule(char *  name, int importType, int importAccess, unsigned int loadDllOnly);
 
@@ -2559,7 +2952,7 @@ extern char *  StringFromSpecDecl(struct __ecereNameSpace__ecere__sys__OldList *
 
 struct Symbol * _DeclClass(int symbolID, char *  name);
 
-extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* )(void * ));
+extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (*  FreeFunction)(void * ));
 
 extern void FreeTemplateArgument(struct TemplateArgument * arg);
 
@@ -2574,8 +2967,6 @@ void *  data;
 
 void SetClassTemplateArgs(struct Specifier * spec, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
 {
-void * __ecereTemp1;
-
 if(spec->type == 1)
 {
 struct Symbol * symbol = spec->symbol;
@@ -2647,7 +3038,11 @@ if(!symbol && spec->symbol)
 symbol = _DeclClass((((int)0x7fffffff)), templateString);
 }
 if(spec->symbol)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&spec->symbol->templatedClasses, (__ecereTemp1 = __ecereNameSpace__ecere__com__eSystem_New0(12), ((struct __ecereNameSpace__ecere__sys__OldLink *)__ecereTemp1)->data = symbol, ((struct __ecereNameSpace__ecere__sys__OldLink *)__ecereTemp1)));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&spec->symbol->templatedClasses, __extension__ ({
+struct __ecereNameSpace__ecere__sys__OldLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_OldLink);
+
+__ecereInstance1->data = symbol, __ecereInstance1;
+}));
 (__ecereNameSpace__ecere__com__eSystem_Delete(spec->name), spec->name = 0);
 spec->symbol = symbol;
 spec->name = __ecereNameSpace__ecere__sys__CopyString(symbol ? symbol->string : templateString);
@@ -2657,7 +3052,7 @@ else
 FreeList(templateArgs, FreeTemplateArgument);
 }
 
-extern int strncmp(const char * , const char * , int n);
+extern int strncmp(const char * , const char * , size_t n);
 
 struct Specifier * _MkSpecifierName(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
 {
@@ -2714,18 +3109,17 @@ return _MkSpecifierName(name, (((void *)0)), templateArgs);
 
 struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassFunction * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassFunction);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassFunction), ((struct ClassFunction *)__ecereTemp1)->specifiers = specifiers, ((struct ClassFunction *)__ecereTemp1)->declarator = decl, ((struct ClassFunction *)__ecereTemp1)->declarations = declList, ((struct ClassFunction *)__ecereTemp1));
+__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = decl, __ecereInstance1->declarations = declList, __ecereInstance1;
+});
 }
 
 extern struct Specifier * CopySpecifier(struct Specifier * spec);
 
-extern void FreeSpecifier(struct Specifier * spec);
-
 void ProcessClassFunctionBody(struct ClassFunction * func, struct Statement * body)
 {
-void * __ecereTemp1;
 struct Symbol * symbol;
 struct Declarator * decl = func->declarator;
 struct Declarator * funcDecl = GetFuncDecl(func->declarator);
@@ -2754,7 +3148,11 @@ symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree
 }
 if(!symbol && id)
 {
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(param->qualifiers, param->declarator), ((struct Symbol *)__ecereTemp1)->isParam = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 0x1, __ecereInstance1;
+});
 symbol->idCode = symbol->id = context->nextID++;
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
@@ -2812,9 +3210,11 @@ return list;
 
 struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct MemberInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit), ((struct MemberInit *)__ecereTemp1)->identifiers = ids, ((struct MemberInit *)__ecereTemp1)->initializer = initializer, ((struct MemberInit *)__ecereTemp1));
+__ecereInstance1->identifiers = ids, __ecereInstance1->initializer = initializer, __ecereInstance1;
+});
 }
 
 extern void FreeExpression(struct Expression * exp);
@@ -2840,27 +3240,31 @@ return init;
 
 struct MembersInit * MkMembersInitList(struct __ecereNameSpace__ecere__sys__OldList * dataMembers)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit), ((struct MembersInit *)__ecereTemp1)->type = 0, ((struct MembersInit *)__ecereTemp1)->dataMembers = dataMembers, ((struct MembersInit *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->dataMembers = dataMembers, __ecereInstance1;
+});
 }
 
 struct MembersInit * MkMembersInitMethod(struct ClassFunction * function)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit), ((struct MembersInit *)__ecereTemp1)->type = 1, ((struct MembersInit *)__ecereTemp1)->function = function, ((struct MembersInit *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->function = function, __ecereInstance1;
+});
 }
 
 struct Instantiation * MkInstantiation(struct Specifier * _class, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Instantiation * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation), ((struct Instantiation *)__ecereTemp1)->_class = _class, ((struct Instantiation *)__ecereTemp1)->exp = exp, ((struct Instantiation *)__ecereTemp1)->members = members, ((struct Instantiation *)__ecereTemp1));
+__ecereInstance1->_class = _class, __ecereInstance1->exp = exp, __ecereInstance1->members = members, __ecereInstance1;
+});
 }
 
-extern void Compiler_Error(char *  format, ...);
-
 struct Instantiation * MkInstantiationNamed(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
 {
 struct Instantiation * inst = (inst = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation), inst->exp = exp, inst->members = members, inst);
@@ -2888,65 +3292,83 @@ return inst;
 
 struct ClassDef * MkClassDefAccessOverride(int access, struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 13, ((struct ClassDef *)__ecereTemp1)->id = id, ((struct ClassDef *)__ecereTemp1)->memberAccess = access, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 13, __ecereInstance1->id = id, __ecereInstance1->memberAccess = access, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefMemberAccess()
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 12, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 12, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefDeclaration(struct Declaration * decl)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 2, ((struct ClassDef *)__ecereTemp1)->decl = decl, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->decl = decl, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefClassData(struct Declaration * decl)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 9, ((struct ClassDef *)__ecereTemp1)->decl = decl, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 9, __ecereInstance1->decl = decl, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefDesigner(char * designer)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 5, ((struct ClassDef *)__ecereTemp1)->designer = __ecereNameSpace__ecere__sys__CopyString(designer), ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->designer = __ecereNameSpace__ecere__sys__CopyString(designer), __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefNoExpansion()
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 6, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefFixed()
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 7, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefDesignerDefaultProperty(struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 8, ((struct ClassDef *)__ecereTemp1)->defaultProperty = id, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 8, __ecereInstance1->defaultProperty = id, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefDefaultProperty(struct __ecereNameSpace__ecere__sys__OldList * defProperties)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 1, ((struct ClassDef *)__ecereTemp1)->defProperties = defProperties, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->defProperties = defProperties, __ecereInstance1;
+});
 }
 
 extern void FreeClassFunction(struct ClassFunction * func);
@@ -3004,7 +3426,7 @@ name[len] = (char)0;
 return _DeclClass(symbolID, name);
 }
 
-extern char *  strchr(char * , int);
+extern char *  strchr(const char * , int);
 
 struct Symbol * DeclClass(int symbolID, char * name)
 {
@@ -3016,14 +3438,17 @@ return DeclClassAddNameSpace(symbolID, name);
 
 struct Symbol * _DeclClass(int symbolID, char * name)
 {
-void * __ecereTemp1;
 struct Symbol * symbol = FindClass(name);
 
 if(!symbol)
 {
 if(name[0] == ':' && name[1] == ':')
 name += 2;
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(name), ((struct Symbol *)__ecereTemp1)->idCode = symbolID, ((struct Symbol *)__ecereTemp1)->id = symbolID, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->idCode = symbolID, __ecereInstance1->id = symbolID, __ecereInstance1;
+});
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
 {
@@ -3063,13 +3488,10 @@ 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)
 {
-void * __ecereTemp1;
-
 if(baseSpecs && baseSpecs->first && ((struct Specifier *)baseSpecs->first)->type == 1)
 {
 char name[1024];
@@ -3110,9 +3532,17 @@ struct TemplatedType * type;
 
 if(!param)
 {
-p->param = param = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), ((struct TemplateParameter *)__ecereTemp1)->identifier = MkIdentifier(p->name), ((struct TemplateParameter *)__ecereTemp1)->type = p->type, ((struct TemplateParameter *)__ecereTemp1)->dataTypeString = p->dataTypeString, ((struct TemplateParameter *)__ecereTemp1));
+p->param = param = __extension__ ({
+struct TemplateParameter * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter);
+
+__ecereInstance1->identifier = MkIdentifier(p->name), __ecereInstance1->type = p->type, __ecereInstance1->dataTypeString = p->dataTypeString, __ecereInstance1;
+});
 }
-type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), ((struct TemplatedType *)__ecereTemp1)->key = (unsigned int)p->name, ((struct TemplatedType *)__ecereTemp1)->param = param, ((struct TemplatedType *)__ecereTemp1));
+type = __extension__ ({
+struct TemplatedType * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType);
+
+__ecereInstance1->key = (uintptr_t)p->name, __ecereInstance1->param = param, __ecereInstance1;
+});
 if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
 ((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor(type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor(type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
 }
@@ -3130,7 +3560,6 @@ extern void FreeContext(struct Context * context);
 
 struct ClassDefinition * MkClass(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs, struct __ecereNameSpace__ecere__sys__OldList * definitions)
 {
-void * __ecereTemp1;
 struct ClassDefinition * classDef;
 
 SetupBaseSpecs(symbol, baseSpecs);
@@ -3156,30 +3585,37 @@ FreeContext(symbol->ctx);
 ((symbol->ctx ? (__ecereClass_Context->Destructor ? __ecereClass_Context->Destructor(symbol->ctx) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(symbol->ctx)) : 0), symbol->ctx = 0);
 }
 symbol->ctx = curContext;
-classDef = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDefinition), ((struct ClassDefinition *)__ecereTemp1)->symbol = symbol, ((struct ClassDefinition *)__ecereTemp1)->_class = MkSpecifierName(symbol->string), ((struct ClassDefinition *)__ecereTemp1)->baseSpecs = baseSpecs, ((struct ClassDefinition *)__ecereTemp1)->definitions = definitions, ((struct ClassDefinition *)__ecereTemp1)->nameLoc = symbol->nameLoc, ((struct ClassDefinition *)__ecereTemp1));
+classDef = __extension__ ({
+struct ClassDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDefinition);
+
+__ecereInstance1->symbol = symbol, __ecereInstance1->_class = MkSpecifierName(symbol->string), __ecereInstance1->baseSpecs = baseSpecs, __ecereInstance1->definitions = definitions, __ecereInstance1->nameLoc = symbol->nameLoc, __ecereInstance1;
+});
 curContext->classDef = classDef;
 return classDef;
 }
 
 struct Expression * MkExpInstance(struct Instantiation * inst)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 1, ((struct Expression *)__ecereTemp1)->instance = inst, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->instance = inst, __ecereInstance1;
+});
 }
 
 struct External * MkExternalClass(struct ClassDefinition * _class)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), ((struct External *)__ecereTemp1)->type = 2, ((struct External *)__ecereTemp1)->_class = _class, ((struct External *)__ecereTemp1)->symbol = _class->symbol, ((struct External *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->_class = _class, __ecereInstance1->symbol = _class->symbol, __ecereInstance1;
+});
 }
 
-extern void PrintType(struct Type * type, char *  string, unsigned int printName, unsigned int fullName);
+extern void PrintTypeNoConst(struct Type * type, char *  string, unsigned int printName, unsigned int fullName);
 
 struct PropertyDef * MkProperty(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Identifier * id, struct Statement * setStmt, struct Statement * getStmt)
 {
-void * __ecereTemp1;
 struct PropertyDef * prop = (prop = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyDef), prop->specifiers = specs, prop->declarator = decl, prop->setStmt = setStmt, prop->getStmt = getStmt, prop);
 struct Symbol * symbol;
 struct Type * type = ProcessType(specs, decl);
@@ -3189,12 +3625,16 @@ if(!id)
 char typeString[1024];
 
 typeString[0] = '\0';
-PrintType(type, typeString, 0x0, 0x1);
+PrintTypeNoConst(type, typeString, 0x0, 0x1);
 id = MkIdentifier(typeString);
 prop->conversion = 0x1;
 }
 prop->id = id;
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = type, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = type, __ecereInstance1;
+});
 symbol->idCode = symbol->id = globalContext->nextID++;
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
 globalContext->nextID++;
@@ -3205,23 +3645,29 @@ return prop;
 
 struct ClassDef * MkClassDefProperty(struct PropertyDef * propertyDef)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 3, ((struct ClassDef *)__ecereTemp1)->propertyDef = propertyDef, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->propertyDef = propertyDef, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefClassProperty(struct PropertyDef * propertyDef)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 10, ((struct ClassDef *)__ecereTemp1)->propertyDef = propertyDef, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 10, __ecereInstance1->propertyDef = propertyDef, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefClassPropertyValue(struct Identifier * id, struct Initializer * initializer)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 11, ((struct ClassDef *)__ecereTemp1)->id = id, ((struct ClassDef *)__ecereTemp1)->initializer = initializer, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 11, __ecereInstance1->id = id, __ecereInstance1->initializer = initializer, __ecereInstance1;
+});
 }
 
 int CheckType(char * text)
@@ -3337,7 +3783,7 @@ struct __ecereNameSpace__ecere__com__SubModule * subModule;
 
 if(searchFor == searchIn)
 return 0x1;
-for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + 12)))->modules.first; subModule; subModule = subModule->next)
+for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->modules.first; subModule; subModule = subModule->next)
 {
 if(subModule->importMode == 1)
 {
@@ -3354,17 +3800,20 @@ extern struct __ecereNameSpace__ecere__sys__OldList *  imports;
 
 struct ModuleImport * FindModule(struct __ecereNameSpace__ecere__com__Instance * moduleToFind)
 {
-void * __ecereTemp1;
 struct ModuleImport * module;
 
-if(!((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->name)
+if(!((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name)
 return mainModule;
 for(module = (*imports).first; module; module = module->next)
-if(module->name && !strcmp(module->name, ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->name))
+if(module->name && !strcmp(module->name, ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name))
 break;
 if(!module)
 {
-module = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport), ((struct ModuleImport *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->name), ((struct ModuleImport *)__ecereTemp1)->importType = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->importType, ((struct ModuleImport *)__ecereTemp1)->importAccess = ModuleAccess(privateModule, moduleToFind) ? 1 : 2, ((struct ModuleImport *)__ecereTemp1));
+module = __extension__ ({
+struct ModuleImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport);
+
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name), __ecereInstance1->importType = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->importType, __ecereInstance1->importAccess = ModuleAccess(privateModule, moduleToFind) ? 1 : 2, __ecereInstance1;
+});
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*imports), module);
 }
 return module;
@@ -3374,7 +3823,6 @@ extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com
 
 struct Symbol * FindClass(char * name)
 {
-void * __ecereTemp1;
 struct Symbol * cl = (((void *)0));
 struct __ecereNameSpace__ecere__com__Class * _class;
 unsigned int global = 0x0;
@@ -3432,7 +3880,11 @@ name = _class->fullName;
 cl = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, name);
 if(!cl)
 {
-cl = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(name), ((struct Symbol *)__ecereTemp1)->registered = _class, ((struct Symbol *)__ecereTemp1)->id = (((int)0x7fffffff)), ((struct Symbol *)__ecereTemp1)->idCode = (((int)0x7fffffff)), ((struct Symbol *)__ecereTemp1)->imported = 0x1, ((struct Symbol *)__ecereTemp1));
+cl = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->registered = _class, __ecereInstance1->id = (((int)0x7fffffff)), __ecereInstance1->idCode = (((int)0x7fffffff)), __ecereInstance1->imported = 0x1, __ecereInstance1;
+});
 _class->symbol = cl;
 if(_class->module)
 cl->module = FindModule(_class->module);
@@ -3464,11 +3916,8 @@ void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(struct __ecereNam
 
 void CopyTypeInto(struct Type * type, struct Type * src)
 {
-void * __ecereTemp1;
-
 *type = *src;
 type->name = __ecereNameSpace__ecere__sys__CopyString(src->name);
-type->enumName = __ecereNameSpace__ecere__sys__CopyString(src->enumName);
 type->refCount = 1;
 if(src->kind == 15)
 {
@@ -3477,8 +3926,13 @@ struct __ecereNameSpace__ecere__sys__NamedLink * member;
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&type->members);
 for(member = src->members.first; member; member = member->next)
 {
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->members, (__ecereTemp1 = __ecereNameSpace__ecere__com__eSystem_New0(16), ((struct __ecereNameSpace__ecere__sys__NamedLink *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(member->name), ((struct __ecereNameSpace__ecere__sys__NamedLink *)__ecereTemp1)->data = member->data, ((struct __ecereNameSpace__ecere__sys__NamedLink *)__ecereTemp1)));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->members, __extension__ ({
+struct __ecereNameSpace__ecere__sys__NamedLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink);
+
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(member->name), __ecereInstance1->data = member->data, __ecereInstance1;
+}));
 }
+type->enumName = __ecereNameSpace__ecere__sys__CopyString(src->enumName);
 }
 else if(src->kind == 9 || src->kind == 10)
 {
@@ -3486,6 +3940,7 @@ struct Type * member;
 
 for(member = type->members.first; member; member = member->next)
 member->refCount++;
+type->enumName = __ecereNameSpace__ecere__sys__CopyString(src->enumName);
 }
 else if(src->kind == 11)
 {
@@ -3506,73 +3961,76 @@ type->arraySizeExp = CopyExpression(type->arraySizeExp);
 }
 }
 
-extern void ProcessExpressionType(struct Expression * exp);
-
-extern void ComputeExpression(struct Expression * exp);
+extern int targetBits;
 
-extern unsigned long strtoul(const char *  nptr, char * *  endptr, int base);
+extern int targetPlatform;
 
 extern struct Symbol * FindSymbol(char *  name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace);
 
-struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl)
+static struct Type * ProcessTypeSpecs(struct __ecereNameSpace__ecere__sys__OldList * specs, unsigned int assumeEllipsis, unsigned int keepTypeName)
 {
-void * __ecereTemp1;
-struct Type * type = (((void *)0));
-unsigned int isTypedef = 0x0;
+struct Type * specType = (specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), specType->refCount = 1, specType->kind = 3, specType->isSigned = 0x1, specType);
 
-if(!specs || specs->first)
+if(specs != (((void *)0)))
 {
-struct Declarator * funcDecl = GetFuncDecl(decl);
-struct Type * specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-unsigned int dllExport = 0x0;
+unsigned int isTypedef = 0x0;
+struct Specifier * spec;
+unsigned int isLong = 0x0;
 
-specType->kind = 3;
-specType->isSigned = 0x1;
-specType->refCount = 1;
-type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-while(decl && (decl->type == 0 || decl->type == 6 || decl->type == 7))
-{
-if(decl->type == 0 && decl->structDecl.exp)
+for(spec = specs->first; spec; spec = spec->next)
 {
-ProcessExpressionType(decl->structDecl.exp);
-ComputeExpression(decl->structDecl.exp);
-if(decl->structDecl.exp->type == 2)
-specType->bitFieldCount = strtoul(decl->structDecl.exp->constant, (((void *)0)), 0);
-}
-if((decl->type == 6 || decl->type == 7) && decl->extended.extended && decl->extended.extended->type == 0 && decl->extended.extended->s && (!strcmp(decl->extended.extended->s, "__declspec(dllexport)") || !strcmp(decl->extended.extended->s, "dllexport")))
+if(spec->type == 5)
 {
-dllExport = 0x1;
-}
-if((decl->type == 6 || decl->type == 7) && decl->extended.extended && decl->extended.extended->type == 1)
+struct ExtDecl * extDecl = spec->extDecl;
+
+if(extDecl->type == 0)
 {
-specType->keepCast = 0x1;
-}
-decl = decl->declarator;
+char * s = spec->extDecl->s;
+
+if(!strcmp(spec->extDecl->s, "__declspec(dllexport)") || !strcmp(spec->extDecl->s, "dllexport"))
+specType->dllExport = 0x1;
+else if(!strcmp(spec->extDecl->s, "__declspec(stdcall)") || !strcmp(spec->extDecl->s, "stdcall"))
+specType->attrStdcall = 0x1;
 }
-if(funcDecl || !decl || decl->type == 1)
+else if(extDecl->type == 1)
 {
-struct Specifier * spec;
+struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->attr->attribs;
 
-if(specs != (((void *)0)))
+if(attribs)
 {
-unsigned int isLong = 0x0;
+struct Attribute * attr;
 
-for(spec = specs->first; spec; spec = spec->next)
+for(attr = (*attribs).first; attr; attr = attr->next)
 {
-if(spec->type == 5 && spec->extDecl && spec->extDecl->type == 0 && spec->extDecl->s && (!strcmp(spec->extDecl->s, "__declspec(dllexport)") || !strcmp(spec->extDecl->s, "dllexport")))
+char * s = attr->attr;
+
+if(s)
 {
-dllExport = 0x1;
+if(!strcmp(s, "dllexport"))
+specType->dllExport = 0x1;
+else if(!strcmp(s, "stdcall"))
+specType->attrStdcall = 0x1;
+}
+}
 }
-if(spec->type == 5 && spec->extDecl->type == 1)
-{
 specType->keepCast = 0x1;
 }
+}
 if(spec->specifier != CONST && (specType->kind == 9 || specType->kind == 10))
 {
 FreeType(specType);
-specType = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->kind = 3, ((struct Type *)__ecereTemp1)->isSigned = 0x1, ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
+specType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0x1, __ecereInstance1->refCount = 1, __ecereInstance1;
+});
 }
-if(spec->type == 0)
+if(isTypedef && keepTypeName)
+{
+specType->kind = 18;
+return specType;
+}
+else if(spec->type == 0)
 {
 if(spec->specifier == TYPEDEF)
 isTypedef = 0x1;
@@ -3582,7 +4040,7 @@ else if(spec->specifier == CHAR)
 specType->kind = 1;
 else if(spec->specifier == INT)
 {
-if(specType->kind != 2 && specType->kind != 5)
+if(specType->kind != 2 && specType->kind != 5 && !isLong)
 specType->kind = 3;
 }
 else if(spec->specifier == UINT)
@@ -3599,7 +4057,7 @@ else if(spec->specifier == SHORT)
 specType->kind = 2;
 else if(spec->specifier == LONG)
 {
-if(isLong)
+if(isLong || (targetBits == 64 && targetPlatform != 1))
 specType->kind = 4;
 else
 specType->kind = 3;
@@ -3615,21 +4073,20 @@ else if(spec->specifier == UNSIGNED)
 specType->isSigned = 0x0;
 else if(spec->specifier == CONST)
 specType->constant = 0x1;
-else if(spec->specifier == TYPED_OBJECT)
+else if(spec->specifier == TYPED_OBJECT || spec->specifier == ANY_OBJECT || spec->specifier == CLASS)
 {
-specType->classObjectType = 2;
-specType->kind = 8;
-specType->_class = FindClass("class");
-}
-else if(spec->specifier == ANY_OBJECT)
+switch(spec->specifier)
 {
+case TYPED_OBJECT:
+specType->classObjectType = 2;
+break;
+case ANY_OBJECT:
 specType->classObjectType = 3;
-specType->kind = 8;
-specType->_class = FindClass("class");
-}
-else if(spec->specifier == CLASS)
-{
+break;
+case CLASS:
 specType->classObjectType = 1;
+break;
+}
 specType->kind = 8;
 specType->_class = FindClass("class");
 }
@@ -3638,6 +4095,20 @@ specType->kind = 21;
 }
 else if(spec->type == 1)
 {
+if(spec->name && (!strcmp(spec->name, "intptr") || !strcmp(spec->name, "uintptr")))
+{
+specType->kind = 22;
+if(!strcmp(spec->name, "uintptr"))
+specType->isSigned = 0x0;
+}
+else if(spec->name && (!strcmp(spec->name, "uintsize") || !strcmp(spec->name, "intsize")))
+{
+specType->kind = 23;
+if(!strcmp(spec->name, "uintsize"))
+specType->isSigned = 0x0;
+}
+else
+{
 struct Symbol * symbol = spec->name ? FindType(curContext, spec->name) : (((void *)0));
 
 if(symbol && symbol->type)
@@ -3657,6 +4128,7 @@ if(!specType->_class)
 specType->kind = 3;
 }
 }
+}
 else if(spec->type == 2)
 {
 specType->kind = 15;
@@ -3668,7 +4140,7 @@ int nextValue = 0;
 
 for(e = (*spec->list).first; e; e = e->next)
 {
-struct __ecereNameSpace__ecere__sys__NamedLink * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(16), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i);
+struct __ecereNameSpace__ecere__sys__NamedLink * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i);
 
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, i);
 }
@@ -3685,12 +4157,14 @@ struct Symbol * _class = spec->id ? FindClass(spec->id->string) : (((void *)0));
 
 if(_class)
 {
+specType->declaredWithStruct = 0x1;
 if(!_class->registered || _class->registered->type != 1)
 specType->directClassAccess = 0x1;
 specType->_class = _class;
 specType->kind = 8;
 break;
 }
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->members);
 if(spec->type == 3)
 specType->kind = 9;
 else if(spec->type == 4)
@@ -3715,7 +4189,7 @@ struct __ecereNameSpace__ecere__sys__NamedLink * member;
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->members);
 for(member = symbol->type->members.first; member; member = member->next)
 {
-struct __ecereNameSpace__ecere__sys__NamedLink * item = (item = __ecereNameSpace__ecere__com__eSystem_New0(16), item->name = __ecereNameSpace__ecere__sys__CopyString(member->name), item->data = member->data, item);
+struct __ecereNameSpace__ecere__sys__NamedLink * item = (item = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), item->name = __ecereNameSpace__ecere__sys__CopyString(member->name), item->data = member->data, item);
 
 __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, item);
 }
@@ -3790,310 +4264,238 @@ specType->_class = spec->_class->symbol;
 }
 }
 }
-else if(!decl)
+else if(assumeEllipsis)
 specType->kind = 14;
+return specType;
 }
-if(funcDecl)
+
+extern void ProcessExpressionType(struct Expression * exp);
+
+extern void ComputeExpression(struct Expression * exp);
+
+extern unsigned long strtoul(const char *  nptr, char * *  endptr, int base);
+
+extern void __ecereNameSpace__ecere__com__PrintLn(struct __ecereNameSpace__ecere__com__Class * class, void * object, ...);
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_char__PTR_;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DeclaratorType;
+
+static struct Type * ProcessTypeDecls(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Type * parentType)
 {
-struct Declarator * d = funcDecl->declarator;
-struct Type * funcType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-struct TypeName * param;
+struct Type * type = parentType;
+struct Declarator * subDecl = decl ? decl->declarator : (((void *)0));
 
-funcType->kind = 11;
-funcType->refCount = 1;
-if(funcDecl->function.parameters)
+if(!parentType)
+type = ProcessTypeSpecs(specs, decl == (((void *)0)), (decl && decl->type == 7) ? 0x1 : 0x0);
+if(decl)
 {
-for(param = (*funcDecl->function.parameters).first; param; param = param->next)
+switch(decl->type)
 {
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&funcType->params, ProcessType(param->qualifiers, param->declarator));
-}
-}
-if(decl->type == 5)
+case 2:
+break;
+case 6:
+case 7:
 {
-struct Pointer * pointer = decl->pointer.pointer;
-struct Type * ptrType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct ExtDecl * extDecl = decl->extended.extended;
 
-funcType->returnType = ptrType;
-funcType->returnType->refCount = 1;
-while(pointer)
+if(extDecl)
 {
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
-{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
-}
-}
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-*ptrType->type = *specType;
-}
-else
+switch(extDecl->type)
 {
-funcType->returnType = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-*funcType->returnType = *specType;
-}
-while(d && (d->type == 2 || d->type == 6 || d->type == 7))
+case 0:
 {
-if((d->type == 6 || d->type == 7) && d->extended.extended && d->extended.extended->type == 0 && d->extended.extended->s && (!strcmp(d->extended.extended->s, "__declspec(dllexport)") || !strcmp(d->extended.extended->s, "dllexport")))
+char * s = extDecl->s;
+
+if(s)
 {
-dllExport = 0x1;
+if(!strcmp(s, "__declspec(dllexport)") || !strcmp(s, "dllexport"))
+type->dllExport = 0x1;
+else if(!strcmp(s, "__declspec(stdcall)") || !strcmp(s, "stdcall"))
+type->attrStdcall = 0x1;
 }
-d = d->declarator;
+break;
 }
-funcType->dllExport = dllExport;
-if(d && d->type == 5)
+case 1:
 {
-struct Type * ptrType;
-struct Identifier * id;
+struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->attr->attribs;
 
-if(d->declarator && d->declarator->type == 3)
+if(attribs)
 {
-struct Pointer * pointer = d->pointer.pointer;
+struct Attribute * attr;
 
-type->kind = 12;
-type->arraySizeExp = CopyExpression(d->declarator->array.exp);
-type->freeExp = 0x1;
-if(d->declarator->array.enumClass)
-type->enumClass = d->declarator->array.enumClass->symbol;
-if(d->declarator->declarator && d->declarator->declarator->type == 3)
+for(attr = (*attribs).first; attr; attr = attr->next)
 {
-struct Type * tmpType = type;
-struct Type * inType;
+char * s = attr->attr;
 
-type = ProcessType((((void *)0)), d->declarator->declarator);
-inType = type->type;
-type->type = tmpType;
-tmpType->type = inType;
+if(s)
+{
+if(!strcmp(s, "dllexport"))
+type->dllExport = 0x1;
+else if(!strcmp(s, "stdcall"))
+type->attrStdcall = 0x1;
 }
-else
-type->type = ProcessType((((void *)0)), d->declarator->declarator);
-for(ptrType = type->type; ptrType && ptrType->kind && ptrType->type; ptrType = ptrType->type)
-;
-while(pointer)
+}
+}
+type->keepCast = 0x1;
+break;
+}
+}
+}
+break;
+}
+case 0:
 {
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
+struct Expression * exp = decl->structDecl.exp;
+
+if(exp)
 {
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
-}
+ProcessExpressionType(exp);
+ComputeExpression(exp);
+if(exp->type == 2)
+type->bitFieldCount = strtoul(exp->constant, (((void *)0)), 0);
 }
-ptrType->type = ProcessType(specs, (((void *)0)));
+break;
 }
-else
+case 4:
 {
-struct Pointer * pointer = d->pointer.pointer;
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
 
-ptrType = type;
-while(pointer)
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 11, __ecereInstance1->returnType = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
+});
+if(decl->function.parameters)
 {
-ptrType->kind = 13;
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-pointer = pointer->pointer;
-if(pointer)
-ptrType = ptrType->type;
+struct TypeName * param;
+
+for(param = (*decl->function.parameters).first; param; param = param->next)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->params, ProcessType(param->qualifiers, param->declarator));
 }
+break;
 }
-*ptrType->type = *funcType;
-id = GetDeclId(d);
-if(id)
+case 3:
 {
-if(id->_class && !id->_class->name)
-ptrType->type->staticMethod = 0x1;
-else
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 12, __ecereInstance1->arraySizeExp = CopyExpression(decl->array.exp), __ecereInstance1->freeExp = 0x1, __ecereInstance1->type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
+});
+if(decl->array.enumClass)
+type->enumClass = decl->array.enumClass->symbol;
+break;
+}
+case 5:
 {
-if(!id->classSym)
+struct Pointer * pointer = decl->pointer.pointer;
+
+while(pointer)
 {
-if(id->_class && id->_class->name)
+struct __ecereNameSpace__ecere__sys__OldList * qualifiers = pointer->qualifiers;
+
+if(type->classObjectType)
+type->byReference = 0x1;
+else
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
+});
+if(qualifiers)
 {
-id->classSym = id->_class->symbol;
-}
-}
-ptrType->type->thisClass = id->classSym;
-if(ptrType->type->thisClass && strcmp(ptrType->type->thisClass->string, "class"))
-ptrType->type->extraParam = 0x1;
-else if(id->_class && id->_class->name && !strcmp(id->_class->name, "any_object"))
+struct Specifier * spec;
+
+for(spec = (*qualifiers).first; spec; spec = spec->next)
 {
-ptrType->type->extraParam = 0x1;
-ptrType->type->thisClass = FindClass("class");
+if(spec->type == 0 && spec->specifier == CONST)
+type->constant = 0x1;
 }
 }
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+pointer = pointer->pointer;
 }
+break;
 }
-else if(!d || d->type == 1)
+case 1:
 {
-*type = *funcType;
-if(d)
+struct Identifier * id = decl->identifier;
+struct Specifier * _class = id->_class;
+
+(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
+type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+if(_class)
 {
-if(d->identifier->_class && d->identifier->_class->type == 8)
+if(_class->type == 8)
 {
-type->thisClassTemplate = d->identifier->_class->templateParameter;
+type->thisClassTemplate = _class->templateParameter;
 type->extraParam = 0x1;
 }
 else
 {
-if(d->identifier->_class && !d->identifier->_class->name)
+char * name = _class->name;
+
+if(!name)
 type->staticMethod = 0x1;
 else
 {
-if(d->identifier->_class && d->identifier->_class->name && d->identifier->_class->name[strlen(d->identifier->_class->name) - 1] == '&')
+if(!id->classSym)
+id->classSym = _class->symbol;
+if(name[strlen(name) - 1] == '&')
 {
 type->thisClass = FindClass("class");
 type->byReference = 0x1;
 }
 else
-type->thisClass = d->identifier->_class ? d->identifier->_class->symbol : (((void *)0));
+type->thisClass = _class->symbol;
 if(type->thisClass && strcmp(type->thisClass->string, "class"))
-{
 type->extraParam = 0x1;
-}
-else if(d->identifier->_class && d->identifier->_class->name && !strcmp(d->identifier->_class->name, "any_object"))
+else if(!strcmp(name, "any_object"))
 {
 type->extraParam = 0x1;
 type->thisClass = FindClass("class");
 }
-else if(d->identifier->_class && d->identifier->_class->name && !strcmp(d->identifier->_class->name, "class"))
+else if(!strcmp(name, "class"))
 {
 type->thisClass = FindClass("class");
 type->classObjectType = 1;
 }
-}
-}
-type->name = __ecereNameSpace__ecere__sys__CopyString(d->identifier->string);
-}
-}
-((funcType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor(funcType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(funcType)) : 0), funcType = 0);
-}
-else if(decl && decl->type == 5)
-{
-if(decl->declarator && decl->declarator->type == 3)
-{
-struct Identifier * id;
-struct Pointer * pointer = decl->pointer.pointer;
-struct Type * ptrType;
-
-type->kind = 12;
-type->arraySizeExp = CopyExpression(decl->declarator->array.exp);
-type->freeExp = 0x1;
-if(decl->declarator->array.enumClass)
-type->enumClass = decl->declarator->array.enumClass->symbol;
-if(decl->declarator->declarator && decl->declarator->declarator->type == 3)
-{
-struct Type * tmpType = type;
-struct Type * inType;
-
-type = ProcessType((((void *)0)), decl->declarator->declarator);
-inType = type->type;
-type->type = tmpType;
-tmpType->type = inType;
-}
-else
-type->type = ProcessType((((void *)0)), decl->declarator->declarator);
-for(ptrType = type->type; ptrType && ptrType->kind && ptrType->type; ptrType = ptrType->type)
-;
-while(pointer)
-{
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
-{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
-}
-}
-ptrType->type = ProcessType(specs, (((void *)0)));
-id = GetDeclId(decl);
-if(id)
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
-}
-else
+else if(!strcmp(name, "typed_object") || !strcmp(name, "typed_object&"))
 {
-struct Identifier * id;
-struct Pointer * pointer = decl->pointer.pointer;
-struct Type * ptrType = type;
-
-if(type->classObjectType)
-{
-type->byReference = 0x1;
+type->thisClass = FindClass("class");
+type->classObjectType = 2;
 }
-else
-{
-while(pointer)
-{
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
-{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
 }
 }
-ptrType->type = ProcessType(specs, decl->declarator);
-if(type->type->classObjectType)
-{
-struct Type * subType = type->type;
-
-type->classObjectType = subType->classObjectType;
-type->kind = subType->kind;
-type->_class = subType->_class;
-type->byReference = 0x1;
-FreeType(subType);
 }
-id = GetDeclId(decl);
-if(id)
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+break;
 }
+default:
+__ecereNameSpace__ecere__com__PrintLn(__ecereClass_char__PTR_, "Unhandled Declarator Type: ", __ecereClass_DeclaratorType, &decl->type, (void *)0);
 }
 }
-else if(decl && decl->type == 3)
+if(subDecl)
 {
-struct Identifier * id;
+struct Type * curType = type;
 
-type->kind = 12;
-type->arraySizeExp = CopyExpression(decl->array.exp);
-type->freeExp = 0x1;
-if(decl->array.enumClass)
-type->enumClass = decl->array.enumClass->symbol;
-id = GetDeclId(decl);
-if(decl->declarator && decl->declarator->type == 3)
+type = ProcessTypeDecls((((void *)0)), subDecl, type);
+if(curType && type->kind != 11)
 {
-struct Type * tmpType = type;
-struct Type * inType;
-
-type = ProcessType(specs, decl->declarator);
-inType = type->type;
-type->type = tmpType;
-tmpType->type = inType;
+curType->thisClassTemplate = type->thisClassTemplate;
+curType->extraParam = type->extraParam;
+curType->staticMethod = type->staticMethod;
+curType->thisClass = type->thisClass;
+curType->byReference = type->byReference;
+curType->classObjectType = type->classObjectType;
 }
-else
-type->type = ProcessType(specs, decl->declarator);
-if(id)
-{
-(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
 }
+return type;
 }
-else
-{
-if(!decl || decl->type == 1)
+
+struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl)
 {
-*type = *specType;
-(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
-type->name = decl ? __ecereNameSpace__ecere__sys__CopyString(decl->identifier->string) : (((void *)0));
-}
-}
-((specType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor(specType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(specType)) : 0), specType = 0);
-}
-return type;
+return ProcessTypeDecls(specs, decl, (((void *)0)));
 }
 
 extern struct Declarator * SpecDeclFromString(char *  string, struct __ecereNameSpace__ecere__sys__OldList *  specs, struct Declarator * baseDecl);
 
-extern void FreeDeclarator(struct Declarator * decl);
-
 struct Type * ProcessTypeString(char * string, unsigned int staticMethod)
 {
 struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
@@ -4142,142 +4544,182 @@ return (((void *)0));
 
 struct AsmField * MkAsmField(char * command, struct Expression * expression)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct AsmField * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_AsmField);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_AsmField), ((struct AsmField *)__ecereTemp1)->command = command, ((struct AsmField *)__ecereTemp1)->expression = expression, ((struct AsmField *)__ecereTemp1));
+__ecereInstance1->command = command, __ecereInstance1->expression = expression, __ecereInstance1;
+});
 }
 
 struct Statement * MkAsmStmt(struct Specifier * spec, char * statements, struct __ecereNameSpace__ecere__sys__OldList * inputFields, struct __ecereNameSpace__ecere__sys__OldList * outputFields, struct __ecereNameSpace__ecere__sys__OldList * clobberedFields)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 13, ((struct Statement *)__ecereTemp1)->asmStmt.spec = spec, ((struct Statement *)__ecereTemp1)->asmStmt.statements = statements, ((struct Statement *)__ecereTemp1)->asmStmt.inputFields = inputFields, ((struct Statement *)__ecereTemp1)->asmStmt.outputFields = outputFields, ((struct Statement *)__ecereTemp1)->asmStmt.clobberedFields = clobberedFields, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 13, __ecereInstance1->asmStmt.spec = spec, __ecereInstance1->asmStmt.statements = statements, __ecereInstance1->asmStmt.inputFields = inputFields, __ecereInstance1->asmStmt.outputFields = outputFields, __ecereInstance1->asmStmt.clobberedFields = clobberedFields, __ecereInstance1;
+});
 }
 
 struct ClassDef * MkClassDefPropertyWatch(struct PropertyWatch * watcher)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 4, ((struct ClassDef *)__ecereTemp1)->propertyWatch = watcher, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 4, __ecereInstance1->propertyWatch = watcher, __ecereInstance1;
+});
 }
 
 struct Statement * MkFireWatchersStmt(struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 15, ((struct Statement *)__ecereTemp1)->_watch.object = object, ((struct Statement *)__ecereTemp1)->_watch.watches = watches, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 15, __ecereInstance1->_watch.object = object, __ecereInstance1->_watch.watches = watches, __ecereInstance1;
+});
 }
 
 struct Statement * MkStopWatchingStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 16, ((struct Statement *)__ecereTemp1)->_watch.watcher = watcher, ((struct Statement *)__ecereTemp1)->_watch.object = object, ((struct Statement *)__ecereTemp1)->_watch.watches = watches, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 16, __ecereInstance1->_watch.watcher = watcher, __ecereInstance1->_watch.object = object, __ecereInstance1->_watch.watches = watches, __ecereInstance1;
+});
 }
 
 struct Statement * MkWatchStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 17, ((struct Statement *)__ecereTemp1)->_watch.watcher = watcher, ((struct Statement *)__ecereTemp1)->_watch.object = object, ((struct Statement *)__ecereTemp1)->_watch.watches = watches, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 17, __ecereInstance1->_watch.watcher = watcher, __ecereInstance1->_watch.object = object, __ecereInstance1->_watch.watches = watches, __ecereInstance1;
+});
 }
 
 struct PropertyWatch * MkDeleteWatch(struct Statement * compound)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch), ((struct PropertyWatch *)__ecereTemp1)->compound = compound, ((struct PropertyWatch *)__ecereTemp1)->deleteWatch = 0x1, ((struct PropertyWatch *)__ecereTemp1));
+__ecereInstance1->compound = compound, __ecereInstance1->deleteWatch = 0x1, __ecereInstance1;
+});
 }
 
 struct PropertyWatch * MkPropertyWatch(struct __ecereNameSpace__ecere__sys__OldList * properties, struct Statement * compound)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch), ((struct PropertyWatch *)__ecereTemp1)->compound = compound, ((struct PropertyWatch *)__ecereTemp1)->properties = properties, ((struct PropertyWatch *)__ecereTemp1));
+__ecereInstance1->compound = compound, __ecereInstance1->properties = properties, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpClass(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * decl)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 26, ((struct Expression *)__ecereTemp1)->_classExp.specifiers = specifiers, ((struct Expression *)__ecereTemp1)->_classExp.decl = decl, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 26, __ecereInstance1->_classExp.specifiers = specifiers, __ecereInstance1->_classExp.decl = decl, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpClassData(struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 27, ((struct Expression *)__ecereTemp1)->classData.id = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 27, __ecereInstance1->classData.id = id, __ecereInstance1;
+});
 }
 
 struct External * MkExternalDBTable(struct DBTableDef * table)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), ((struct External *)__ecereTemp1)->type = 5, ((struct External *)__ecereTemp1)->table = table, ((struct External *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->table = table, __ecereInstance1;
+});
 }
 
 struct DBTableDef * MkDBTableDef(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * definitions)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct DBTableDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableDef);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableDef), ((struct DBTableDef *)__ecereTemp1)->name = name, ((struct DBTableDef *)__ecereTemp1)->symbol = symbol, ((struct DBTableDef *)__ecereTemp1)->definitions = definitions, ((struct DBTableDef *)__ecereTemp1));
+__ecereInstance1->name = name, __ecereInstance1->symbol = symbol, __ecereInstance1->definitions = definitions, __ecereInstance1;
+});
 }
 
 struct DBTableEntry * MkDBFieldEntry(struct TypeName * type, struct Identifier * id, char * name)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry), ((struct DBTableEntry *)__ecereTemp1)->type = 0, ((struct DBTableEntry *)__ecereTemp1)->dataType = type, ((struct DBTableEntry *)__ecereTemp1)->id = id, ((struct DBTableEntry *)__ecereTemp1)->name = name, ((struct DBTableEntry *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->dataType = type, __ecereInstance1->id = id, __ecereInstance1->name = name, __ecereInstance1;
+});
 }
 
 struct DBIndexItem * MkDBIndexItem(struct Identifier * id, int order)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct DBIndexItem * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBIndexItem);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBIndexItem), ((struct DBIndexItem *)__ecereTemp1)->id = id, ((struct DBIndexItem *)__ecereTemp1)->order = order, ((struct DBIndexItem *)__ecereTemp1));
+__ecereInstance1->id = id, __ecereInstance1->order = order, __ecereInstance1;
+});
 }
 
 struct DBTableEntry * MkDBIndexEntry(struct __ecereNameSpace__ecere__sys__OldList * items, struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry), ((struct DBTableEntry *)__ecereTemp1)->type = 1, ((struct DBTableEntry *)__ecereTemp1)->items = items, ((struct DBTableEntry *)__ecereTemp1)->id = id, ((struct DBTableEntry *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->items = items, __ecereInstance1->id = id, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpDBOpen(struct Expression * ds, struct Expression * dbName)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 30, ((struct Expression *)__ecereTemp1)->dbopen.ds = ds, ((struct Expression *)__ecereTemp1)->dbopen.name = dbName, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 30, __ecereInstance1->dbopen.ds = ds, __ecereInstance1->dbopen.name = dbName, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpDBField(char * table, struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 31, ((struct Expression *)__ecereTemp1)->db.table = table, ((struct Expression *)__ecereTemp1)->db.id = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 31, __ecereInstance1->db.table = table, __ecereInstance1->db.id = id, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpDBIndex(char * table, struct Identifier * id)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 33, ((struct Expression *)__ecereTemp1)->db.table = table, ((struct Expression *)__ecereTemp1)->db.id = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 33, __ecereInstance1->db.table = table, __ecereInstance1->db.id = id, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpDBTable(char * table)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 32, ((struct Expression *)__ecereTemp1)->db.table = table, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 32, __ecereInstance1->db.table = table, __ecereInstance1;
+});
 }
 
 struct Expression * MkExpArray(struct __ecereNameSpace__ecere__sys__OldList * expressions)
 {
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
 
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 37, ((struct Expression *)__ecereTemp1)->list = expressions, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 37, __ecereInstance1->list = expressions, __ecereInstance1;
+});
 }
 
 extern struct External * curExternal;
@@ -4387,7 +4829,7 @@ int __ecereVMethodID___ecereNameSpace__ecere__com__Container_Free;
 
 void OutputIntlStrings()
 {
-if(((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)intlStrings + 12)))->count)
+if(((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)intlStrings + structSize_Instance)))->count)
 {
 char * srcFile = GetSourceFile();
 char * objFile = GetOutputFile();
@@ -4434,6 +4876,8 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgstr \"%s\"\n\n",
 
 extern int yyparse();
 
+extern int yylex();
+
 void SetAST(struct __ecereNameSpace__ecere__sys__OldList * list)
 {
 ast = list;
@@ -4449,13 +4893,23 @@ void ParseEc()
 yyparse();
 }
 
+int LexEc()
+{
+return yylex();
+}
+
+const char * GetYYText()
+{
+return yytext;
+}
+
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__GlobalFunction;
 
 struct __ecereNameSpace__ecere__com__GlobalFunction;
 
 extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_RegisterFunction(char *  name, char *  type, void *  func, struct __ecereNameSpace__ecere__com__Instance * module, int declMode);
 
-extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_RegisterClass(int type, char *  name, char *  baseName, int size, int sizeClass, unsigned int (* )(void * ), void (* )(void * ), struct __ecereNameSpace__ecere__com__Instance * module, int declMode, int inheritanceAccess);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_RegisterClass(int type, char *  name, char *  baseName, int size, int sizeClass, unsigned int (*  Constructor)(void * ), void (*  Destructor)(void * ), struct __ecereNameSpace__ecere__com__Instance * module, int declMode, int inheritanceAccess);
 
 extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_AddMethod(struct __ecereNameSpace__ecere__com__Class * _class, char *  name, char *  type, void *  function, int declMode);
 
@@ -4490,12 +4944,12 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpDummy", "Expression
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpConstant", "Expression MkExpConstant(char * string)", MkExpConstant, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpString", "Expression MkExpString(char * string)", MkExpString, module, 2);
 class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(1, "ContextStringPair", 0, sizeof(struct ContextStringPair), 0, 0, 0, module, 1, 1);
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + 12)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + 12)))->application && class)
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
 __ecereClass_ContextStringPair = class;
 __ecereNameSpace__ecere__com__eClass_AddMethod(class, "OnCompare", 0, __ecereMethod_ContextStringPair_OnCompare, 1);
 __ecereNameSpace__ecere__com__eClass_AddMethod(class, "OnFree", 0, __ecereMethod_ContextStringPair_OnFree, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "string", "String", 4, 4, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "context", "String", 4, 4, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "string", "String", arch_PointerSize, arch_PointerSize, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "context", "String", arch_PointerSize, arch_PointerSize, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpIntlString", "Expression MkExpIntlString(char * string, char * context)", MkExpIntlString, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpOp", "Expression MkExpOp(Expression exp1, int op, Expression exp2)", MkExpOp, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpBrackets", "Expression MkExpBrackets(ecere::sys::OldList expressions)", MkExpBrackets, module, 2);
@@ -4539,6 +4993,7 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkInitializerAssignment"
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkInitializerList", "Initializer MkInitializerList(ecere::sys::OldList list)", MkInitializerList, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkInitDeclarator", "InitDeclarator MkInitDeclarator(Declarator declarator, Initializer initializer)", MkInitDeclarator, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkTypeName", "TypeName MkTypeName(ecere::sys::OldList qualifiers, Declarator declarator)", MkTypeName, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkTypeNameGuessDecl", "TypeName MkTypeNameGuessDecl(ecere::sys::OldList qualifiers, Declarator declarator)", MkTypeNameGuessDecl, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetDeclId", "Identifier GetDeclId(Declarator decl)", GetDeclId, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclarationClassInst", "Declaration MkDeclarationClassInst(Instantiation inst)", MkDeclarationClassInst, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclarationInst", "Declaration MkDeclarationInst(Instantiation inst)", MkDeclarationInst, module, 2);
@@ -4561,6 +5016,7 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkContinueStmt", "Statem
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkBreakStmt", "Statement MkBreakStmt(void)", MkBreakStmt, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkReturnStmt", "Statement MkReturnStmt(ecere::sys::OldList exp)", MkReturnStmt, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkFunction", "FunctionDefinition MkFunction(ecere::sys::OldList specifiers, Declarator declarator, ecere::sys::OldList declarationList)", MkFunction, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_MkFunction", "FunctionDefinition _MkFunction(ecere::sys::OldList specifiers, Declarator declarator, ecere::sys::OldList declarationList, bool errorOnOmit)", _MkFunction, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessFunctionBody", "void ProcessFunctionBody(FunctionDefinition func, Statement body)", ProcessFunctionBody, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExternalFunction", "External MkExternalFunction(FunctionDefinition function)", MkExternalFunction, module, 2);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExternalImport", "External MkExternalImport(char * name, ecere::com::ImportType importType, ecere::com::AccessMode importAccess)", MkExternalImport, module, 2);
@@ -4640,6 +5096,8 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("OutputIntlStrings", "voi
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetAST", "void SetAST(ecere::sys::OldList * list)", SetAST, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetAST", "ecere::sys::OldList * GetAST(void)", GetAST, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ParseEc", "void ParseEc(void)", ParseEc, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("LexEc", "int LexEc(void)", LexEc, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetYYText", "const char * GetYYText(void)", GetYYText, module, 1);
 }
 
 void __ecereUnregisterModule_ast(struct __ecereNameSpace__ecere__com__Instance * module)