+/* Code generated from eC source file: pass2.ec */
#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
#else
#define __ENDIAN_PAD(x) 0
#endif
-#ifdef __MINGW32__
-#ifdef _WIN64
-typedef unsigned long long int uintptr_t;
-typedef long long int intptr_t;
-#else
-typedef unsigned int uintptr_t;
-typedef int intptr_t;
-#endif
-#else
#include <stdint.h>
-#endif
+#include <sys/types.h>
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_Renew0(void * memory, unsigned int size);
+extern void __ecereNameSpace__ecere__com__eSystem_Delete(void * memory);
+
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
struct __ecereNameSpace__ecere__sys__BTNode;
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;
int line;
int charPos;
int pos;
-unsigned int included;
+int included;
} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Location;
} __attribute__ ((gcc_struct));
struct Statement * compound;
struct Instantiation * instance;
+struct
+{
char * string;
+unsigned int intlString;
+} __attribute__ ((gcc_struct));
struct __ecereNameSpace__ecere__sys__OldList * list;
struct
{
} __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;
unsigned int addedThis;
unsigned int needCast;
unsigned int thisPtr;
+unsigned int opDestType;
} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateDatatype;
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;
+unsigned int typedByReference : 1;
} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Class;
char * defaultProperty;
unsigned int comRedefinition;
int count;
-unsigned int isRemote;
+int isRemote;
unsigned int internalDecl;
void * data;
unsigned int computeSize;
struct __ecereNameSpace__ecere__com__Class * templateClass;
struct __ecereNameSpace__ecere__sys__OldList templatized;
int numParams;
+unsigned int isInstanceClass;
+unsigned int byValueSystemClass;
} __attribute__ ((gcc_struct));
+extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, char * name);
+
+extern void __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
+
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
struct __ecereNameSpace__ecere__com__Instance
enum yytokentype
{
-IDENTIFIER = 258, CONSTANT = 259, STRING_LITERAL = 260, SIZEOF = 261, PTR_OP = 262, INC_OP = 263, DEC_OP = 264, LEFT_OP = 265, RIGHT_OP = 266, LE_OP = 267, GE_OP = 268, EQ_OP = 269, NE_OP = 270, AND_OP = 271, OR_OP = 272, MUL_ASSIGN = 273, DIV_ASSIGN = 274, MOD_ASSIGN = 275, ADD_ASSIGN = 276, SUB_ASSIGN = 277, LEFT_ASSIGN = 278, RIGHT_ASSIGN = 279, AND_ASSIGN = 280, XOR_ASSIGN = 281, OR_ASSIGN = 282, TYPE_NAME = 283, TYPEDEF = 284, EXTERN = 285, STATIC = 286, AUTO = 287, REGISTER = 288, CHAR = 289, SHORT = 290, INT = 291, UINT = 292, INT64 = 293, LONG = 294, SIGNED = 295, UNSIGNED = 296, FLOAT = 297, DOUBLE = 298, CONST = 299, VOLATILE = 300, VOID = 301, VALIST = 302, STRUCT = 303, UNION = 304, ENUM = 305, ELLIPSIS = 306, CASE = 307, DEFAULT = 308, IF = 309, SWITCH = 310, WHILE = 311, DO = 312, FOR = 313, GOTO = 314, CONTINUE = 315, BREAK = 316, RETURN = 317, IFX = 318, ELSE = 319, CLASS = 320, THISCLASS = 321, CLASS_NAME = 322, PROPERTY = 323, SETPROP = 324, GETPROP = 325, NEWOP = 326, RENEW = 327, DELETE = 328, EXT_DECL = 329, EXT_STORAGE = 330, IMPORT = 331, DEFINE = 332, VIRTUAL = 333, ATTRIB = 334, PUBLIC = 335, PRIVATE = 336, TYPED_OBJECT = 337, ANY_OBJECT = 338, _INCREF = 339, EXTENSION = 340, ASM = 341, TYPEOF = 342, WATCH = 343, STOPWATCHING = 344, FIREWATCHERS = 345, WATCHABLE = 346, CLASS_DESIGNER = 347, CLASS_NO_EXPANSION = 348, CLASS_FIXED = 349, ISPROPSET = 350, CLASS_DEFAULT_PROPERTY = 351, PROPERTY_CATEGORY = 352, CLASS_DATA = 353, CLASS_PROPERTY = 354, SUBCLASS = 355, NAMESPACE = 356, NEW0OP = 357, RENEW0 = 358, VAARG = 359, DBTABLE = 360, DBFIELD = 361, DBINDEX = 362, DATABASE_OPEN = 363, ALIGNOF = 364, ATTRIB_DEP = 365, __ATTRIB = 366
+IDENTIFIER = 258, CONSTANT = 259, STRING_LITERAL = 260, SIZEOF = 261, PTR_OP = 262, INC_OP = 263, DEC_OP = 264, LEFT_OP = 265, RIGHT_OP = 266, LE_OP = 267, GE_OP = 268, EQ_OP = 269, NE_OP = 270, AND_OP = 271, OR_OP = 272, MUL_ASSIGN = 273, DIV_ASSIGN = 274, MOD_ASSIGN = 275, ADD_ASSIGN = 276, SUB_ASSIGN = 277, LEFT_ASSIGN = 278, RIGHT_ASSIGN = 279, AND_ASSIGN = 280, XOR_ASSIGN = 281, OR_ASSIGN = 282, TYPE_NAME = 283, TYPEDEF = 284, EXTERN = 285, STATIC = 286, AUTO = 287, REGISTER = 288, CHAR = 289, SHORT = 290, INT = 291, UINT = 292, INT64 = 293, LONG = 294, SIGNED = 295, UNSIGNED = 296, FLOAT = 297, DOUBLE = 298, CONST = 299, VOLATILE = 300, VOID = 301, VALIST = 302, STRUCT = 303, UNION = 304, ENUM = 305, ELLIPSIS = 306, CASE = 307, DEFAULT = 308, IF = 309, SWITCH = 310, WHILE = 311, DO = 312, FOR = 313, GOTO = 314, CONTINUE = 315, BREAK = 316, RETURN = 317, IFX = 318, ELSE = 319, CLASS = 320, THISCLASS = 321, CLASS_NAME = 322, PROPERTY = 323, SETPROP = 324, GETPROP = 325, NEWOP = 326, RENEW = 327, DELETE = 328, EXT_DECL = 329, EXT_STORAGE = 330, IMPORT = 331, DEFINE = 332, VIRTUAL = 333, ATTRIB = 334, PUBLIC = 335, PRIVATE = 336, TYPED_OBJECT = 337, ANY_OBJECT = 338, _INCREF = 339, EXTENSION = 340, ASM = 341, TYPEOF = 342, WATCH = 343, STOPWATCHING = 344, FIREWATCHERS = 345, WATCHABLE = 346, CLASS_DESIGNER = 347, CLASS_NO_EXPANSION = 348, CLASS_FIXED = 349, ISPROPSET = 350, CLASS_DEFAULT_PROPERTY = 351, PROPERTY_CATEGORY = 352, CLASS_DATA = 353, CLASS_PROPERTY = 354, SUBCLASS = 355, NAMESPACE = 356, NEW0OP = 357, RENEW0 = 358, VAARG = 359, DBTABLE = 360, DBFIELD = 361, DBINDEX = 362, DATABASE_OPEN = 363, ALIGNOF = 364, ATTRIB_DEP = 365, __ATTRIB = 366, BOOL = 367, _BOOL = 368, _COMPLEX = 369, _IMAGINARY = 370, RESTRICT = 371, THREAD = 372
};
typedef union YYSTYPE
struct Location loc;
char * command;
struct Expression * expression;
+struct Identifier * symbolic;
} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attribute;
struct Statement * setStmt;
struct Statement * issetStmt;
struct Symbol * symbol;
-unsigned int conversion;
-unsigned int isWatchable;
struct Expression * category;
+struct
+{
+unsigned int conversion : 1;
+unsigned int isWatchable : 1;
+unsigned int isDBProp : 1;
+} __attribute__ ((gcc_struct));
} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyWatch;
extern struct Expression * CopyExpression(struct Expression * exp);
+extern void FreeExpContents(struct Expression * exp);
+
extern void FreeExpression(struct Expression * exp);
void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
{
struct Expression * memberExp = *memberExpPtr;
-if(memberExp && memberExp->type == 8 && memberExp->member.exp && (memberExp->member.exp->type == 5 || memberExp->member.exp->type == 34))
+if(memberExp && memberExp->type == 8 && memberExp->member.exp && (memberExp->member.exp->type == 5 || memberExp->member.exp->type == 32))
{
struct Expression * bracketExp = memberExp->member.exp;
struct Expression * idExp = (*bracketExp->list).last;
*memberExpPtr = (((void *)0));
newExp = CopyExpression(exp);
+FreeExpContents(exp);
*(struct Expression **)((unsigned char *)newExp + ((unsigned char *)memberExpPtr - (unsigned char *)exp)) = memberExp;
memberExp->member.exp = idExp;
exp->type = 5;
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->list), idExp);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*exp->list), newExp);
FreeExpression(bracketExp);
-*expPtr = newExp;
+*expPtr = exp;
}
}
-else if(*expPtr && (*expPtr)->type == 4 && (*expPtr)->op.op == '&' && !(*expPtr)->op.exp1 && memberExp && (memberExp->type == 5 || memberExp->type == 34) && memberExp->list && (*memberExp->list).count > 1)
+else if(*expPtr && (*expPtr)->type == 4 && (*expPtr)->op.op == '&' && !(*expPtr)->op.exp1 && memberExp && (memberExp->type == 5 || memberExp->type == 32) && memberExp->list && (*memberExp->list).count > 1)
{
struct Expression * newExp = (((void *)0));
struct Expression * exp = *expPtr;
{
struct __ecereNameSpace__ecere__com__Class * _class = type->_class ? type->_class->registered : (((void *)0));
-if(_class && (_class->type == 1 || _class->type == 5 || (_class->type == 1000 && _class->base && strcmp(_class->fullName, "uintptr") && strcmp(_class->fullName, "intptr") && strcmp(_class->fullName, "ecere::com::Instance") && strcmp(_class->fullName, "ecere::com::Class") && strcmp(_class->dataTypeString, "char *"))))
+if(_class && ((_class->type == 1 && !type->declaredWithStruct) || _class->type == 5 || (_class->type == 1000 && _class->base && strcmp(_class->fullName, "uintptr") && strcmp(_class->fullName, "intptr") && strcmp(_class->fullName, "uintsize") && strcmp(_class->fullName, "intsize"))))
{
if(wantReference != (e->byReference || isPointer))
{
for(; ; )
{
-if(exp->type == 5 || exp->type == 34)
+if(exp->type == 5 || exp->type == 32)
{
if(exp->list)
{
for(; exp; )
{
-if(exp->type == 5 || exp->type == 34)
+if(exp->type == 5 || exp->type == 32)
{
if((*exp->list).count > 1)
byReference = 0x1;
extern void DeclareClass(struct Symbol * classSym, char * className);
+extern void FreeIdentifier(struct Identifier * id);
+
extern struct Expression * MkExpCast(struct TypeName * typeName, struct Expression * expression);
extern struct Expression * MkExpIndex(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * index);
extern struct Identifier * MkIdentifier(char * string);
+extern void FreeSpecifier(struct Specifier * spec);
+
extern char * __ecereNameSpace__ecere__sys__CopyString(char * string);
extern void ListAdd(struct __ecereNameSpace__ecere__sys__OldList * list, void * item);
struct __ecereNameSpace__ecere__com__ClassProperty * left;
struct __ecereNameSpace__ecere__com__ClassProperty * right;
int depth;
-void (* Set)(struct __ecereNameSpace__ecere__com__Class *, int);
-int (* Get)(struct __ecereNameSpace__ecere__com__Class *);
+void (* Set)(struct __ecereNameSpace__ecere__com__Class *, long long);
+long long (* Get)(struct __ecereNameSpace__ecere__com__Class *);
char * dataTypeString;
struct Type * dataType;
unsigned int constant;
extern struct __ecereNameSpace__ecere__com__ClassProperty * __ecereNameSpace__ecere__com__eClass_FindClassProperty(struct __ecereNameSpace__ecere__com__Class * _class, char * name);
-extern void FreeExpContents(struct Expression * exp);
+extern char * QMkString(char * source);
extern struct Expression * MkExpString(char * string);
-extern char * QMkString(char * source);
-
extern struct Specifier * MkSpecifier(int specifier);
-extern void FreeIdentifier(struct Identifier * id);
-
extern struct Context * PushContext(void);
extern struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements);
extern void Compiler_Error(char * format, ...);
-extern char * __ecereNameSpace__ecere__GetTranslatedString(struct __ecereNameSpace__ecere__com__Instance * module, char * string, char * stringAndContext);
-
-extern struct __ecereNameSpace__ecere__com__Instance * __thisModule;
+extern char * __ecereNameSpace__ecere__GetTranslatedString(char * name, char * string, char * stringAndContext);
extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_FindMethod(struct __ecereNameSpace__ecere__com__Class * _class, char * name, struct __ecereNameSpace__ecere__com__Instance * module);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, char * name);
-
extern void ProcessExpressionType(struct Expression * exp);
extern struct Expression * MkExpCondition(struct Expression * cond, struct __ecereNameSpace__ecere__sys__OldList * expressions, struct Expression * elseExp);
-extern struct __ecereNameSpace__ecere__sys__OldList * CopyList(struct __ecereNameSpace__ecere__sys__OldList * source, void * (* )(void * ));
+extern struct __ecereNameSpace__ecere__sys__OldList * CopyList(struct __ecereNameSpace__ecere__sys__OldList * source, void * (* CopyFunction)(void * ));
extern struct Expression * GetTemplateArgExp(struct TemplateParameter * param, struct __ecereNameSpace__ecere__com__Class * curClass, unsigned int pointer);
extern struct Expression * MkExpMember(struct Expression * expression, struct Identifier * member);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, char * name);
+
extern struct Context * globalContext;
extern void FreeSymbol(struct Symbol * symbol);
extern void FinishTemplatesContext(struct Context * context);
+extern void FreeTypeName(struct TypeName * typeName);
+
extern struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions);
-extern void PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
+extern struct Type * ProcessTypeString(char * string, unsigned int staticMethod);
-extern int ComputeTypeSize(struct Type * type);
+extern void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
-extern void FreeTypeName(struct TypeName * typeName);
+extern int ComputeTypeSize(struct Type * type);
extern struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
extern void DeclareStruct(char * name, unsigned int skipNoHead);
-extern void FreeSpecifier(struct Specifier * spec);
-
static void ProcessStatement(struct Statement * stmt);
-extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* )(void * ));
+extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* FreeFunction)(void * ));
extern void FreeDeclarator(struct Declarator * decl);
if(!_class->symbol)
_class->symbol = FindClass(_class->fullName);
DeclareClass(_class->symbol, className);
+if(exp->identifier)
+FreeIdentifier(exp->identifier);
exp->type = 5;
exp->list = MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name))))));
}
strcat(name, "_");
strcat(name, method->name);
(__ecereNameSpace__ecere__com__eSystem_Delete(exp->identifier->string), exp->identifier->string = 0);
+FreeSpecifier(exp->identifier->_class);
exp->identifier->_class = (((void *)0));
exp->identifier->string = __ecereNameSpace__ecere__sys__CopyString(name);
DeclareMethod(method, name);
case 3:
break;
case 13:
-case 28:
+case 26:
case 14:
-case 29:
+case 27:
{
struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
-if(exp->type == 14 || exp->type == 29)
+if(exp->type == 14 || exp->type == 27)
ListAdd(args, exp->_renew.exp);
ListAdd(args, MkExpOp(MkExpTypeSize(exp->_new.typeName), '*', MkExpBrackets(MkListOne(exp->_new.size))));
switch(exp->type)
case 13:
exp->call.exp = QMkExpId("ecere::com::eSystem_New");
break;
-case 28:
+case 26:
exp->call.exp = QMkExpId("ecere::com::eSystem_New0");
break;
case 14:
exp->call.exp = QMkExpId("ecere::com::eSystem_Renew");
break;
-case 29:
+case 27:
exp->call.exp = QMkExpId("ecere::com::eSystem_Renew0");
break;
}
{
if(testExp->type == 11)
testExp = testExp->cast.exp;
-else if(testExp->type == 5 || testExp->type == 34)
+else if(testExp->type == 5 || testExp->type == 32)
testExp = (*testExp->list).last;
else if(testExp->type == 8)
break;
}
}
memberExp = exp->op.exp1;
-while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 34 || memberExp->type == 25))
+while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 32 || memberExp->type == 23))
{
parentExp = memberExp;
-if(memberExp->type == 25)
+if(memberExp->type == 23)
memberExp = (*((struct Statement *)(*memberExp->compound->compound.statements).last)->expressions).last;
else
memberExp = (*memberExp->list).last;
if(memberExp && memberExp->type == 6 && memberExp->index.exp && memberExp->index.exp->expType && memberExp->index.exp->expType->kind == 8 && memberExp->index.exp->expType->_class && memberExp->index.exp->expType->_class->registered && memberExp->index.exp->expType->_class->registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(memberExp->index.exp->expType->_class->registered, containerClass))
{
ProcessExpression(memberExp);
-while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 34 || memberExp->type == 25))
+while(memberExp && ((memberExp->type == 5 && (*memberExp->list).count == 1) || memberExp->type == 32 || memberExp->type == 23))
{
parentExp = memberExp;
-if(memberExp->type == 25)
+if(memberExp->type == 23)
memberExp = (*((struct Statement *)(*memberExp->compound->compound.statements).last)->expressions).last;
else
memberExp = (*memberExp->list).last;
}
-if(memberExp && memberExp->type == 25)
+if(memberExp && memberExp->type == 23)
{
parentExp = memberExp;
-if(memberExp->type == 25)
+if(memberExp->type == 23)
{
struct Statement * stmt = memberExp->compound->compound.statements ? (*memberExp->compound->compound.statements).last : (((void *)0));
exp1 = (((void *)0));
else
{
-if(parentExp->type == 25)
+if(parentExp->type == 23)
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), memberExp);
else
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), memberExp);
exp->call.exp = MkExpIdentifier(MkIdentifier("ecere::com::eClass_SetProperty"));
exp->call.arguments = MkList();
ListAdd(exp->call.arguments, classExp);
-ListAdd(exp->call.arguments, MkExpString(QMkString(id->string)));
-ListAdd(exp->call.arguments, MkExpCast(MkTypeName(MkListOne(MkSpecifier(INT)), (((void *)0))), value));
+{
+char * s = QMkString(id->string);
+
+ListAdd(exp->call.arguments, MkExpString(s));
+(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
+}
+ListAdd(exp->call.arguments, MkExpCast(MkTypeName(MkListOne(MkSpecifier(INT64)), (((void *)0))), value));
FreeIdentifier(id);
ProcessExpression(exp);
return ;
curExternal->function->tempCount = (__simpleStruct0 = curExternal->function->tempCount, __simpleStruct1 = exp->tempCount, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1);
sprintf(ecereTemp, "__ecTemp%d", exp->tempCount);
curContext = context;
-exp->type = 25;
+exp->type = 23;
exp->compound = MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifier(VOID)), MkListOne(MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier(ecereTemp))), MkInitializerAssignment(QBrackets(memberExp->member.exp)))))), list);
args = MkList();
if(convertTo)
{
struct Expression * newExp = exp;
-if(parentExp && parentExp->type == 25)
+if(parentExp && parentExp->type == 23)
{
newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), newExp);
memberExp->member.memberType = 3;
}
else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "no set defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "no set defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
}
}
else
exp->op.exp2 = (((void *)0));
FreeExpContents(exp);
+FreeType(exp->expType);
+FreeType(exp->destType);
exp->expType = (((void *)0));
exp->destType = (((void *)0));
exp->op.op = INC_OP;
object->usage = (object->usage & ~0x80) | (((unsigned int)0x1) << 7);
ProcessExpression(object);
ListAdd(args, object);
-if(exp->expType && exp->expType->kind == 8 && exp->expType->_class && exp->expType->_class->registered && ((exp->expType->_class->registered->type == 0 && !__ecereNameSpace__ecere__com__eClass_IsDerived(exp->expType->_class->registered, __ecereNameSpace__ecere__com__eSystem_FindClass(exp->expType->_class->registered->module, "char *"))) || (exp->expType->_class->registered->type == 1000 && !strcmp(exp->expType->_class->string, "ecere::com::Instance"))))
+if(exp->expType && exp->expType->kind == 8 && exp->expType->_class && exp->expType->_class->registered && exp->expType->_class->registered->type == 0 && strcmp(exp->expType->_class->registered->dataTypeString, "char *"))
{
struct Expression * decRefExp = MkExpCall(QMkExpId("ecere::com::eInstance_DecRef"), args);
break;
}
case 5:
-case 34:
+case 32:
{
if(exp->list)
{
struct Expression * checkedExp = exp->index.exp;
unsigned int isBuiltin = 0x0;
-while(checkedExp->type == 25 || checkedExp->type == 5 || checkedExp->type == 11)
+while(checkedExp->type == 23 || checkedExp->type == 5 || checkedExp->type == 11)
{
-if(checkedExp->type == 25)
+if(checkedExp->type == 23)
{
isBuiltin = 0x1;
break;
case 7:
{
struct Expression * e;
-struct Expression * memberExp;
unsigned int typedObject = 0x0;
struct Type * ellipsisDestType = (((void *)0));
unsigned int usedEllipsis = 0x0;
exp->call.exp->usage = (exp->call.exp->usage & ~0x8) | (((unsigned int)0x1) << 3);
exp->call.exp->tempCount = exp->tempCount;
ProcessExpression(exp->call.exp);
-memberExp = (exp->call.exp->type == 8) ? exp->call.exp : (((void *)0));
if(exp->call.exp->expType && exp->call.exp->expType->kind == 16)
{
+unsigned int nullMemberExp = 0x0;
+struct Expression * memberExp = (exp->call.exp->type == 8) ? exp->call.exp : (((void *)0));
struct __ecereNameSpace__ecere__com__Class * _class = exp->call.exp->expType->methodClass;
struct __ecereNameSpace__ecere__com__Class * argClass = exp->call.exp->expType->methodClass;
struct __ecereNameSpace__ecere__com__Method * method = exp->call.exp->expType->method;
struct Specifier * firstSpec = firstParam ? (*firstParam->qualifiers).first : (((void *)0));
if(firstParam && firstSpec && firstSpec->type == 0 && firstSpec->specifier == VOID && !firstParam->declarator)
+{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*funcDecl->function.parameters), (*funcDecl->function.parameters).first);
+FreeTypeName(firstParam);
+}
}
if(method->dataType->thisClass && !strcmp(method->dataType->thisClass->string, "class"))
{
typeName = MkTypeName(specs, decl);
if(memberExp && memberExp->member.exp->expType)
{
-if(memberExp->member.exp->expType->kind == 8 && memberExp->member.exp->expType->_class && memberExp->member.exp->expType->_class->registered)
+struct Type * type = memberExp->member.exp->expType;
+
+if(type->kind == 8 && type->_class && type->_class->registered)
{
-int type = memberExp->member.exp->expType->_class->registered->type;
+struct __ecereNameSpace__ecere__com__Class * regClass = type->_class->registered;
+int classType = regClass->type;
-if(type != 0 || method->dataType->byReference)
-argClass = memberExp->member.exp->expType->_class->registered;
+if(classType != 0 || !strcmp(regClass->dataTypeString, "char *") || method->dataType->byReference)
+argClass = regClass;
}
-else
-{
-switch(memberExp->member.exp->expType->kind)
+else if(type->kind == 19)
{
-case 3:
+argClass = FindClass("ecere::com::Class")->registered;
+}
+else if((type->kind == 12 || type->kind == 13) && type->type && type->type->kind == 1)
{
-argClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "int");
-break;
+argClass = FindClass("char *")->registered;
}
+else if(type->kind == 13)
+{
+argClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr");
+FreeType(memberExp->member.exp->expType);
+memberExp->member.exp->expType = ProcessTypeString("uintptr", 0x0);
+memberExp->member.exp->byReference = 0x1;
}
+else
+{
+char string[1024] = "";
+struct Symbol * classSym;
+
+PrintTypeNoConst(type, string, 0x0, 0x1);
+classSym = FindClass(string);
+if(classSym)
+argClass = classSym->registered;
}
}
-if(!exp->call.exp->expType->methodClass && (!memberExp || !_class) && memberExp->member.exp->expType && memberExp->member.exp->expType->classObjectType)
-{
-if(memberExp->member.exp->expType->kind == 8 && memberExp->member.exp->expType->_class && memberExp->member.exp->expType->_class->registered && memberExp->member.exp->expType->_class->registered->type == 0)
{
-exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpBrackets(MkListOne(CopyExpression(memberExp->member.exp))), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
-}
+struct Type * type = memberExp ? memberExp->member.exp->expType : (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * regClass = (type && type->kind == 8 && type->_class) ? type->_class->registered : (((void *)0));
+char className[1024];
+unsigned int useInstance = 0x0;
+
+if(!exp->call.exp->expType->methodClass && !_class && type && type->classObjectType)
+strcpy(className, "class");
else
{
-exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpIdentifier(MkIdentifier("class")), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
-}
+struct __ecereNameSpace__ecere__com__Class * cl = _class;
+
+if(!cl && argClass && strcmp(argClass->fullName, "class"))
+cl = argClass;
+if(!cl)
+cl = regClass;
+if(!cl)
+cl = __ecereClass_int;
+if(cl->templateClass && !_class && exp->call.exp->expType->_class && !exp->call.exp->expType->methodClass && (type->kind == 19 || (regClass && regClass->type == 0 && strcmp(regClass->dataTypeString, "char *"))))
+cl = cl->templateClass;
+strcpy(className, "__ecereClass_");
+FullClassNameCat(className, cl->fullName, 0x1);
+MangleClassName(className);
+if(!cl->symbol)
+cl->symbol = FindClass(cl->fullName);
+DeclareClass(cl->symbol, className);
}
-else if(memberExp && !_class && exp->call.exp->expType->_class && (memberExp->member.exp->expType->kind == 19 || (memberExp->member.exp->expType->kind == 8 && memberExp->member.exp->expType->_class && memberExp->member.exp->expType->_class->registered && memberExp->member.exp->expType->_class->registered->type == 0)))
+if(type && type->kind == 19 && !_class && !exp->call.exp->expType->methodClass && memberExp)
{
exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(CopyExpression(memberExp->member.exp), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
}
+else if(_class || exp->call.exp->expType->methodClass || !memberExp || !regClass || regClass->type != 0 || !strcmp(regClass->dataTypeString, "char *"))
+{
+if(!memberExp)
+FreeExpression(exp->call.exp);
+exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
+}
else
{
-char className[1024];
+struct Expression * c;
+struct Context * context = PushContext();
-if(!_class && argClass && strcmp(argClass->fullName, "class"))
-_class = argClass;
-if(!_class)
-{
-_class = __ecereClass_int;
+c = MkExpExtensionCompound(MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifierName("Instance")), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_ClassInst")), MkInitializerAssignment(CopyExpression(memberExp->member.exp)))))), MkListOne(MkExpressionStmt(MkListOne(MkExpCondition(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkListOne(MkExpPointer(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkIdentifier("_vTbl"))), MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl"))))))));
+c->loc = exp->loc;
+c->compound->compound.context = context;
+PopContext(context);
+exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(c, MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
}
-strcpy(className, "__ecereClass_");
-FullClassNameCat(className, _class->fullName, 0x1);
-MangleClassName(className);
-if(!_class->symbol)
-_class->symbol = FindClass(_class->fullName);
-DeclareClass(_class->symbol, className);
-exp->call.exp = MkExpBrackets(MkListOne(MkExpCast(typeName, MkExpIndex(MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl")), MkListOne(MkExpIdentifier(MkIdentifier(name)))))));
}
}
else
FullClassNameCat(name, method->_class->fullName, 0x0);
strcat(name, "_");
strcat(name, method->name);
+if(!memberExp)
+FreeExpression(exp->call.exp);
exp->call.exp = MkExpIdentifier(MkIdentifier(name));
DeclareMethod(method, name);
if(memberExp && memberExp->expType && method->dataType)
exp->call.arguments = MkList();
if(typedObject && memberExp->member.exp && memberExp->member.exp->expType)
{
-if((argClass && (argClass->type == 4 || argClass->type == 3 || argClass->type == 2 || argClass->type == 1000) && strcmp(argClass->fullName, "class") && strcmp(argClass->fullName, "ecere::com::Class")) || (!memberExp->member.exp->expType->classObjectType && ((((memberExp->member.exp->expType->kind != 13 && (memberExp->member.exp->expType->kind != 8 || !memberExp->member.exp->expType->_class || !memberExp->member.exp->expType->_class->registered || memberExp->member.exp->expType->_class->registered->type == 1)))) || method->dataType->byReference)))
+unsigned int changeReference = 0x0;
+struct Expression * memberExpMemberExp = CopyExpression(memberExp->member.exp);
+
+if(argClass && (argClass->type == 4 || argClass->type == 3 || argClass->type == 2 || argClass->type == 1000) && strcmp(argClass->fullName, "class") && strcmp(argClass->fullName, "uintptr") && strcmp(argClass->fullName, "intptr"))
+changeReference = 0x1;
+if(!memberExp->member.exp->expType->classObjectType && ((((memberExp->member.exp->expType->kind != 13 && (memberExp->member.exp->expType->kind != 8 || !memberExp->member.exp->expType->_class || !memberExp->member.exp->expType->_class->registered || memberExp->member.exp->expType->_class->registered->type == 1)))) || method->dataType->byReference))
+changeReference = 0x1;
+if(typedObject && memberExp->member.exp->expType->classObjectType && memberExp->member.exp->expType->byReference != method->dataType->byReference)
+changeReference = 0x1;
+if(changeReference)
+{
+if(memberExp->member.exp->type == 5 && memberExp->member.exp->list && (*memberExp->member.exp->list).count == 1 && ((struct Expression *)(*memberExp->member.exp->list).first)->type == 4 && ((struct Expression *)(*memberExp->member.exp->list).first)->op.op == '*' && !((struct Expression *)(*memberExp->member.exp->list).first)->op.exp1)
{
-if(memberExp->member.exp->type == 4 && memberExp->member.exp->op.op == '*' && !memberExp->member.exp->op.exp1)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), ((struct Expression *)(*memberExp->member.exp->list).first)->op.exp2);
+((struct Expression *)(*memberExp->member.exp->list).first)->op.exp2 = (((void *)0));
+}
+else if(memberExp->member.exp->type == 4 && memberExp->member.exp->op.op == '*' && !memberExp->member.exp->op.exp1)
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp->op.exp2);
memberExp->member.exp->op.exp2 = (((void *)0));
struct Expression * checkedExp = memberExp->member.exp;
struct Expression * parentExp = (((void *)0));
struct Expression * newExp;
+unsigned int disconnected = 0x0;
-while(((checkedExp->type == 5 || checkedExp->type == 34) && checkedExp->list) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32) && checkedExp->list) || checkedExp->type == 11)
{
parentExp = checkedExp;
-if(checkedExp->type == 5 || checkedExp->type == 34)
+if(checkedExp->type == 5 || checkedExp->type == 32)
+{
checkedExp = (*checkedExp->list).last;
+if(checkedExp && !disconnected)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
+disconnected = 0x1;
+}
+}
else if(checkedExp->type == 11)
+{
checkedExp = checkedExp->cast.exp;
+if(checkedExp && !disconnected)
+{
+checkedExp->cast.exp = (((void *)0));
+disconnected = 0x1;
}
-newExp = MkExpOp((((void *)0)), '&', checkedExp);
-if(parentExp && (parentExp->type == 5 || parentExp->type == 34))
+}
+}
+if(!parentExp)
+nullMemberExp = 0x1;
+newExp = (typedObject && !memberExp->member.exp->expType->classObjectType) ? checkedExp : MkExpOp((((void *)0)), '&', checkedExp);
+if(parentExp && (parentExp->type == 5 || parentExp->type == 32))
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
}
else if(parentExp && parentExp->type == 11)
+{
parentExp->cast.exp = newExp;
+parentExp->cast.typeName->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), parentExp->cast.typeName->declarator);
+}
+if(typedObject && !memberExp->member.exp->expType->classObjectType)
+{
+struct Type * destType = (destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), destType->refCount = 1, destType->kind = 8, destType->classObjectType = 3, destType);
+
+FreeType((parentExp ? parentExp : newExp)->expType);
+FreeType((parentExp ? parentExp : newExp)->destType);
+(parentExp ? parentExp : newExp)->expType = checkedExp->expType;
+(parentExp ? parentExp : newExp)->destType = destType;
+if(checkedExp->expType)
+checkedExp->expType->refCount++;
+}
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), parentExp ? parentExp : newExp);
}
else
+{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
+nullMemberExp = 0x1;
}
-else
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
-if(memberExp->member.exp && memberExp->member.exp->expType && memberExp->member.exp->expType->classObjectType == 2)
-{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), MkExpIdentifier(MkIdentifier("class")));
}
else
{
-if(memberExp && !argClass)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), MkExpPointer(CopyExpression(memberExp->member.exp), MkIdentifier("_class")));
-else
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
+nullMemberExp = 0x1;
+}
{
char className[1024];
+struct Type * type = memberExp->member.exp ? memberExp->member.exp->expType : (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * regClass = (type && type->kind == 8 && type->_class) ? type->_class->registered : (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * cl = argClass ? argClass : regClass;
+className[0] = (char)0;
+if(memberExp->member.exp && memberExp->member.exp->expType && memberExp->member.exp->expType->classObjectType == 2)
+strcpy(className, "class");
+else if(cl)
+{
strcpy(className, "__ecereClass_");
-FullClassNameCat(className, argClass->fullName, 0x1);
+FullClassNameCat(className, cl->fullName, 0x1);
MangleClassName(className);
-if(!argClass->symbol)
-argClass->symbol = FindClass(argClass->fullName);
-DeclareClass(argClass->symbol, className);
+if(!cl->symbol)
+cl->symbol = FindClass(cl->fullName);
+DeclareClass(cl->symbol, className);
+}
+if(className[0])
+{
+if(memberExp && cl && cl->type == 0 && (!type || type->byReference == 0x0) && strcmp(cl->dataTypeString, "char *"))
+{
+struct Expression * c;
+struct Context * context = PushContext();
+
+c = MkExpExtensionCompound(MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifierName("Instance")), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_ClassInst")), MkInitializerAssignment(memberExpMemberExp))))), MkListOne(MkExpressionStmt(MkListOne(MkExpCondition(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkListOne(MkExpPointer(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkIdentifier("_class"))), MkExpIdentifier(MkIdentifier(className))))))));
+c->compound->compound.context = context;
+PopContext(context);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), c);
+memberExpMemberExp = (((void *)0));
+}
+else
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), MkExpIdentifier(MkIdentifier(className)));
}
}
+if(memberExpMemberExp)
+FreeExpression(memberExpMemberExp);
}
else
+{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (((void *)0)), memberExp->member.exp);
-memberExp->member.exp = (((void *)0));
+nullMemberExp = 0x1;
}
+}
+}
+if(memberExp)
+{
+if(nullMemberExp)
+memberExp->member.exp = (((void *)0));
FreeExpression(memberExp);
}
}
{
_class = FindClass("char *")->registered;
}
+else if(type->kind == 13)
+{
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr");
+FreeType(e->expType);
+e->expType = ProcessTypeString("uintptr", 0x0);
+e->byReference = 0x1;
+}
else
{
char string[1024] = "";
struct Symbol * classSym;
-PrintType(type, string, 0x0, 0x1);
+PrintTypeNoConst(type, string, 0x0, 0x1);
classSym = FindClass(string);
if(classSym)
_class = classSym->registered;
}
-if((_class && (_class->type == 4 || _class->type == 3 || _class->type == 2 || _class->type == 1000) && strcmp(_class->fullName, "class") && strcmp(_class->fullName, "ecere::com::Class")) || (!e->expType->classObjectType && (((type->kind != 13 && type->kind != 19 && type->kind != 12 && (type->kind != 8 || !type->_class || !type->_class->registered || type->_class->registered->type == 1))) || destType->byReference)))
+if((_class && (_class->type == 4 || _class->type == 3 || _class->type == 2 || _class->type == 1000) && strcmp(_class->fullName, "class") && strcmp(_class->fullName, "uintptr") && strcmp(_class->fullName, "intptr")) || (!e->expType->classObjectType && (((type->kind != 13 && type->kind != 22 && type->kind != 19 && type->kind != 12 && (type->kind != 8 || !type->_class || !type->_class->registered || type->_class->registered->type == 1))) || destType->byReference)))
{
{
struct Expression * checkedExp;
checkedExp = e;
parentExp = exp;
-while(((checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25) && checkedExp->list) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->list) || checkedExp->type == 11)
{
parentExp = checkedExp;
-if(checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25)
+if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
{
-if(checkedExp->type == 25)
+if(checkedExp->type == 23)
{
checkedExp = (*((struct Statement *)(*checkedExp->compound->compound.statements).last)->expressions).last;
}
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->call.arguments), e);
e = newExp;
}
-else if(parentExp->type == 5 || parentExp->type == 34)
+else if(parentExp->type == 5 || parentExp->type == 32)
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
}
parentExp->cast.exp = newExp;
}
-else if(parentExp->type == 25)
+else if(parentExp->type == 23)
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), checkedExp);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), newExp);
newExp->prev = (((void *)0));
newExp->next = (((void *)0));
newExp->expType = (((void *)0));
-PrintType(e->expType, typeString, 0x0, 0x1);
+PrintTypeNoConst(e->expType, typeString, 0x0, 0x1);
decl = SpecDeclFromString(typeString, specs, (((void *)0)));
newExp->destType = ProcessType(specs, decl);
curContext = context;
-e->type = 25;
+e->type = 23;
if(curCompound)
{
char name[100];
}
checkedExp = e;
parentExp = exp;
-while(((checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25) && checkedExp->list) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->list) || checkedExp->type == 11)
{
parentExp = checkedExp;
-if(checkedExp->type == 5 || checkedExp->type == 34 || checkedExp->type == 25)
+if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
{
-if(checkedExp->type == 25)
+if(checkedExp->type == 23)
{
checkedExp = (*((struct Statement *)(*checkedExp->compound->compound.statements).last)->expressions).last;
}
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->call.arguments), e);
e = newExp;
}
-else if(parentExp->type == 5 || parentExp->type == 34)
+else if(parentExp->type == 5 || parentExp->type == 32)
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->list), checkedExp);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*parentExp->list), newExp);
}
else if(parentExp->type == 11)
parentExp->cast.exp = newExp;
-else if(parentExp->type == 5 || parentExp->type == 25)
+else if(parentExp->type == 5 || parentExp->type == 23)
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), checkedExp);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->compound->compound.statements).last)->expressions), newExp);
_class->symbol = FindClass(_class->fullName);
DeclareClass(_class->symbol, className);
}
+if(_class->type == 0 && destType->byReference == 0x0 && strcmp(_class->dataTypeString, "char *"))
+{
+struct Expression * c;
+struct Context * context = PushContext();
+
+if(_class->templateClass && !strcmp(_class->templateClass->name, "Container") && e->list && (*e->list).first && ((struct Expression *)(*e->list).first)->type == 11 && ((struct Expression *)(*e->list).first)->cast.exp && ((struct Expression *)(*e->list).first)->cast.exp->type == 4 && ((struct Expression *)(*e->list).first)->cast.exp->op.op == '&' && ((struct Expression *)(*e->list).first)->cast.exp->op.exp2 && ((struct Expression *)(*e->list).first)->cast.exp->op.exp2->type == 33)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), e->prev, MkExpIdentifier(MkIdentifier(className)));
+}
+else
+{
+c = MkExpExtensionCompound(MkCompoundStmt(MkListOne(MkDeclaration(MkListOne(MkSpecifierName("Instance")), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_ClassInst")), MkInitializerAssignment(CopyExpression(e)))))), MkListOne(MkExpressionStmt(MkListOne(MkExpCondition(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkListOne(MkExpPointer(MkExpIdentifier(MkIdentifier("__internal_ClassInst")), MkIdentifier("_class"))), MkExpIdentifier(MkIdentifier(className))))))));
+c->compound->compound.context = context;
+PopContext(context);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), e->prev, c);
+}
+}
+else
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), e->prev, MkExpIdentifier(MkIdentifier(className)));
}
}
}
{
-FixReference(e, 0x1);
+FixReference(e, !destType || !destType->declaredWithStruct);
}
}
if(ellipsisDestType)
{
if(usedEllipsis || (exp->call.exp->expType && exp->call.exp->expType->kind == 11 && exp->call.exp->expType->params.last && ((struct Type *)exp->call.exp->expType->params.last)->kind == 14))
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (*exp->call.arguments).last, MkExpConstant("0"));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->call.arguments), (*exp->call.arguments).last, MkExpCast(MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpConstant("0")));
}
}
}
{
unsigned int changeToPtr = 0x0;
unsigned int noHead = 0x0;
-struct Type * type = exp->member.exp->expType;
+struct Type * type = exp->member.exp ? exp->member.exp->expType : (((void *)0));
struct Specifier * memberClassSpecifier = exp->member.member ? exp->member.member->_class : (((void *)0));
if(exp->member.member)
struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
unsigned int thisPtr = exp->member.thisPtr;
-if(type->kind == 19 && exp->member.exp->type == 26)
+if(type->kind == 19 && exp->member.exp->type == 24)
_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::com::Class");
if(!_class)
{
char string[2048] = "";
struct Symbol * classSym;
-PrintType(type, string, 0x0, 0x1);
+PrintTypeNoConst(type, string, 0x0, 0x1);
classSym = FindClass(string);
_class = classSym ? classSym->registered : (((void *)0));
}
else
{
if(((unsigned int)((exp->usage & 0x40) >> 6)))
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "cannot obtain address of property\n", (((void *)0))));
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot obtain address of property\n", (((void *)0))));
else if(!prop->Get)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
else if(((unsigned int)((exp->usage & 0x80) >> 7)))
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "no get defined for property %s of class %s\n", (((void *)0))), prop->name, prop->_class->fullName);
}
}
}
exp->call.exp = MkExpIdentifier(MkIdentifier("ecere::com::eClass_GetProperty"));
exp->call.arguments = MkList();
ListAdd(exp->call.arguments, classExp);
-ListAdd(exp->call.arguments, MkExpString(QMkString(id->string)));
+{
+char * s = QMkString(id->string);
+
+ListAdd(exp->call.arguments, MkExpString(s));
+(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
+}
FreeIdentifier(id);
ProcessExpression(exp);
return ;
if(!_class->symbol)
_class->symbol = FindClass(_class->fullName);
DeclareClass(_class->symbol, className);
+FreeExpression(exp->member.exp);
exp->index.exp = MkExpPointer(MkExpIdentifier(MkIdentifier(className)), MkIdentifier("_vTbl"));
}
else
exp->member.exp->usage = (exp->member.exp->usage & ~0x1) | (((unsigned int)0x1) << 0);
}
ProcessExpression(exp->member.exp);
-if(type->kind == 8)
+if(type->kind == 8 && type->_class && type->_class->registered)
DeclareStruct(type->_class->registered->fullName, 0x0);
if(_class->type == 5)
{
}
else
{
-if(thisPtr)
+if(exp->member.exp->type == 0 && thisPtr && type->kind == 8 && (!exp->member.exp->expType || !exp->member.exp->expType->typedByReference))
{
char pointerName[1024];
strcpy(pointerName, "__ecerePointer_");
FullClassNameCat(pointerName, type->_class->registered->fullName, 0x0);
+if(exp->member.exp->identifier)
FreeIdentifier(exp->member.exp->identifier);
exp->member.exp->identifier = MkIdentifier(pointerName);
}
structName[0] = (char)0;
FullClassNameCat(structName, member->_class->fullName, 0x0);
checkedExp = exp->member.exp;
-while(((checkedExp->type == 5 || checkedExp->type == 34) && checkedExp->list && (*checkedExp->list).count == 1) || checkedExp->type == 11)
+while(((checkedExp->type == 5 || checkedExp->type == 32) && checkedExp->list && (*checkedExp->list).count == 1) || checkedExp->type == 11)
{
-if(checkedExp->type == 5 || checkedExp->type == 34)
+if(checkedExp->type == 5 || checkedExp->type == 32)
checkedExp = (*checkedExp->list).last;
else if(checkedExp->type == 11)
checkedExp = checkedExp->cast.exp;
int __simpleStruct0, __simpleStruct1;
char ecereTemp[100];
struct Statement * compound;
-struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
struct Context * context = PushContext();
if(exp->member.exp->tempCount > exp->tempCount)
}
}
FreeSpecifier(memberClassSpecifier);
-if(exp->type == 8 || exp->type == 9)
+if(exp->member.exp && (exp->type == 8 || exp->type == 9))
{
exp->member.exp->usage = (exp->member.exp->usage & ~0x1) | (((unsigned int)0x1) << 0);
exp->member.exp->usage = (exp->member.exp->usage & ~0x10) | (((unsigned int)0x1) << 4);
}
break;
}
-case 25:
+case 23:
{
-((struct Expression *)(*((struct Statement *)(*exp->compound->compound.statements).last)->expressions).last)->usage |= exp->usage & (((unsigned int)(0x1)) | (((unsigned int)(0x1)) << 2) | (((unsigned int)(0x1)) << 4));
+struct Expression * e = (*((struct Statement *)(*exp->compound->compound.statements).last)->expressions).last;
+
+if(e)
+e->usage |= exp->usage & (((unsigned int)(0x1)) | (((unsigned int)(0x1)) << 2) | (((unsigned int)(0x1)) << 4));
ProcessStatement(exp->compound);
break;
}
ProcessExpression(exp->cond.elseExp);
break;
}
-case 26:
+case 24:
{
if(exp->_classExp.specifiers && (*exp->_classExp.specifiers).first && ((struct Specifier *)(*exp->_classExp.specifiers).first)->type == 8)
{
{
char className[1024];
char * string = StringFromSpecDecl(exp->_classExp.specifiers, exp->_classExp.decl);
+struct Symbol * classSym = FindClass(string);
strcpy(className, "__ecereClass_");
FullClassNameCat(className, string, 0x1);
MangleClassName(className);
-DeclareClass(FindClass(string), className);
+DeclareClass(classSym, className);
(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
FreeList(exp->_classExp.specifiers, FreeSpecifier);
if(exp->_classExp.decl)
}
break;
}
-case 36:
+case 34:
{
ProcessExpression(exp->vaArg.exp);
break;
}
-case 35:
+case 33:
{
ProcessInitializer(exp->initializer.initializer);
break;
switch(init->type)
{
case 0:
+if(init->exp)
+{
init->exp->usage = (init->exp->usage & ~0x1) | (((unsigned int)0x1) << 0);
ProcessExpression(init->exp);
if(init->exp->destType && init->exp->destType->kind == 8 && init->exp->destType->_class && init->exp->destType->_class->registered && init->exp->destType->_class->registered->type == 5)
}
else if(init->exp->destType && init->exp->destType->kind == 8)
FixReference(init->exp, 0x0);
+}
break;
case 1:
{
+if(init->list)
+{
struct Initializer * i;
for(i = (*init->list).first; i; i = i->next)
ProcessInitializer(i);
+}
break;
}
}
{
struct Expression * exp;
+if(stmt->switchStmt.exp && (*stmt->switchStmt.exp).last)
+{
((struct Expression *)(*stmt->switchStmt.exp).last)->usage = (((struct Expression *)(*stmt->switchStmt.exp).last)->usage & ~0x1) | (((unsigned int)0x1) << 0);
for(exp = (*stmt->switchStmt.exp).first; exp; exp = exp->next)
{
ProcessExpression(exp);
}
+}
ProcessStatement(stmt->switchStmt.stmt);
break;
}
{
struct Expression * exp;
+if(stmt->whileStmt.exp && (*stmt->whileStmt.exp).last)
+{
((struct Expression *)(*stmt->whileStmt.exp).last)->usage = (((struct Expression *)(*stmt->whileStmt.exp).last)->usage & ~0x1) | (((unsigned int)0x1) << 0);
for(exp = (*stmt->whileStmt.exp).first; exp; exp = exp->next)
{
ProcessExpression(exp);
}
+}
ProcessStatement(stmt->whileStmt.stmt);
break;
}
for(exp = (*stmt->expressions).first; exp; exp = exp->next)
{
ProcessExpression(exp);
+if(!exp->next && exp->destType && exp->destType->byReference)
+FixReference(exp, 0x1);
}
}
break;
}
}
-extern struct Declaration * QMkDeclarationBase(int base, struct InitDeclarator * initDecl);
-
static void ProcessFunction(struct FunctionDefinition * function)
{
if(function->body)
-{
ProcessStatement(function->body);
-if(function->tempCount)
-{
-struct Statement * stmt = function->body;
-int c;
-
-if(!stmt->compound.declarations)
-stmt->compound.declarations = MkList();
-curContext = stmt->compound.context;
-for(c = 1; c <= function->tempCount; c++)
-{
-char ecereTemp[100];
-
-sprintf(ecereTemp, "__ecereTemp%d", c);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*stmt->compound.declarations), (((void *)0)), QMkDeclarationBase(VOID, MkInitDeclarator(QMkPtrDecl(ecereTemp), (((void *)0)))));
-}
-curContext = stmt->compound.context->parent;
-}
-}
}
static void ProcessMemberInitData(struct MemberInit * member)
Ecere Software / sdk / blobdiff