/* Code generated from eC source file: pass15.ec */
+#if defined(_WIN32)
+#define __runtimePlatform 1
+#elif defined(__APPLE__)
+#define __runtimePlatform 3
+#else
+#define __runtimePlatform 2
+#endif
#if defined(__GNUC__)
typedef long long int64;
typedef unsigned long long uint64;
#else
#define __ENDIAN_PAD(x) 0
#endif
+#if defined(_WIN32)
+# if defined(__GNUC__) || defined(__TINYC__)
+# define ecere_stdcall __attribute__((__stdcall__))
+# define ecere_gcc_struct __attribute__((gcc_struct))
+# else
+# define ecere_stdcall __stdcall
+# define ecere_gcc_struct
+# endif
+#else
+# define ecere_stdcall
+# define ecere_gcc_struct
+#endif
#include <stdint.h>
#include <sys/types.h>
+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, BOOL = 367, _BOOL = 368, _COMPLEX = 369, _IMAGINARY = 370, RESTRICT = 371, THREAD = 372, WIDE_STRING_LITERAL = 373, BUILTIN_OFFSETOF = 374
+};
-#if /*defined(_W64) || */(defined(__WORDSIZE) && __WORDSIZE == 8) || defined(__x86_64__)
-#define _64BIT 1
-#else
-#define _64BIT 0
-#endif
+extern int returnCode;
-#define arch_PointerSize sizeof(void *)
-#define structSize_Instance (_64BIT ? 24 : 12)
-#define structSize_Module (_64BIT ? 560 : 300)
-#define structSize_NamedLink (_64BIT ? 32 : 16)
+extern unsigned int yydebug;
-struct __ecereNameSpace__ecere__com__Instance;
+extern unsigned int echoOn;
-extern void * __ecereNameSpace__ecere__com__eSystem_New(unsigned int size);
+void resetScanner();
-extern void * __ecereNameSpace__ecere__com__eSystem_New0(unsigned int size);
+int propWatcherID;
-extern void * __ecereNameSpace__ecere__com__eSystem_Renew(void * memory, unsigned int size);
+int expression_yyparse();
-extern void * __ecereNameSpace__ecere__com__eSystem_Renew0(void * memory, unsigned int size);
+static char * thisNameSpace;
-extern void __ecereNameSpace__ecere__com__eSystem_Delete(void * memory);
+unsigned int thisClassParams = 1;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
+unsigned int internalValueCounter;
-struct __ecereNameSpace__ecere__sys__BTNode;
+extern unsigned int outputLineNumbers;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BinaryTree;
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_float_isInf;
-struct __ecereNameSpace__ecere__sys__BinaryTree
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_float_signBit;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_float_isNan;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_double_isInf;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_double_signBit;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_double_isNan;
+
+extern int targetBits;
+
+extern unsigned int inCompiler;
+
+extern unsigned int inPreCompiler;
+
+extern unsigned int inDebugger;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__sys__BinaryTree_first;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__sys__BTNode_next;
+
+int UnescapeString(char * d, char * s, int len)
{
-struct __ecereNameSpace__ecere__sys__BTNode * root;
-int count;
-int (* CompareKey)(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, uintptr_t a, uintptr_t b);
-void (* FreeKey)(void * key);
-} __attribute__ ((gcc_struct));
+int j = 0, k = 0;
+char ch;
+
+while(j < len && (ch = s[j]))
+{
+switch(ch)
+{
+case '\\':
+switch((ch = s[++j]))
+{
+case 'n':
+d[k] = '\n';
+break;
+case 't':
+d[k] = '\t';
+break;
+case 'a':
+d[k] = '\a';
+break;
+case 'b':
+d[k] = '\b';
+break;
+case 'f':
+d[k] = '\f';
+break;
+case 'r':
+d[k] = '\r';
+break;
+case 'v':
+d[k] = '\v';
+break;
+case '\\':
+d[k] = '\\';
+break;
+case '\"':
+d[k] = '\"';
+break;
+case '\'':
+d[k] = '\'';
+break;
+default:
+d[k] = '\\';
+d[k] = ch;
+}
+break;
+default:
+d[k] = ch;
+}
+j++, k++;
+}
+d[k] = '\0';
+return k;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldList;
+char * OffsetEscapedString(char * s, int len, int offset)
+{
+char ch;
+int j = 0, k = 0;
+
+while(j < len && k < offset && (ch = s[j]))
+{
+if(ch == '\\')
+++j;
+j++, k++;
+}
+return (k == offset) ? s + j : (((void *)0));
+}
+
+extern int __ecereVMethodID_class_OnGetString;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_Type_isPointerType;
+
+extern unsigned int parseError;
+
+static int definedExpStackPos;
+
+static void * definedExpStack[512];
+
+extern const char * sourceFile;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp_Type_specConst;
+
+unsigned int reachedPass15;
+
+extern unsigned int memoryGuard;
struct __ecereNameSpace__ecere__sys__OldList
{
int count;
unsigned int offset;
unsigned int circ;
-} __attribute__ ((gcc_struct));
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Method;
+struct __ecereNameSpace__ecere__com__DataValue
+{
+union
+{
+char c;
+unsigned char uc;
+short s;
+unsigned short us;
+int i;
+unsigned int ui;
+void * p;
+float f;
+double d;
+long long i64;
+uint64 ui64;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
-struct __ecereNameSpace__ecere__com__Method
+struct __ecereNameSpace__ecere__com__SerialBuffer
{
-const char * name;
-struct __ecereNameSpace__ecere__com__Method * parent;
-struct __ecereNameSpace__ecere__com__Method * left;
-struct __ecereNameSpace__ecere__com__Method * right;
-int depth;
-int (* function)();
-int vid;
-int type;
-struct __ecereNameSpace__ecere__com__Class * _class;
-void * symbol;
-const char * dataTypeString;
-struct Type * dataType;
-int memberAccess;
-} __attribute__ ((gcc_struct));
+unsigned char * _buffer;
+unsigned int count;
+unsigned int _size;
+unsigned int pos;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Property;
+extern void * __ecereNameSpace__ecere__com__eSystem_New(unsigned int size);
-struct __ecereNameSpace__ecere__com__Property
-{
-struct __ecereNameSpace__ecere__com__Property * prev;
-struct __ecereNameSpace__ecere__com__Property * next;
-const char * name;
-unsigned int isProperty;
-int memberAccess;
-int id;
-struct __ecereNameSpace__ecere__com__Class * _class;
-const char * dataTypeString;
-struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
-struct Type * dataType;
-void (* Set)(void * , int);
-int (* Get)(void * );
-unsigned int (* IsSet)(void * );
-void * data;
-void * symbol;
-int vid;
-unsigned int conversion;
-unsigned int watcherOffset;
-const char * category;
-unsigned int compiled;
-unsigned int selfWatchable;
-unsigned int isWatchable;
-} __attribute__ ((gcc_struct));
+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 void __ecereNameSpace__ecere__com__eSystem_Delete(void * memory);
+
+struct Pointer;
+
+struct Attrib;
+
+struct Attribute;
+
+struct TemplateArgument;
+
+struct DBTableEntry;
+
+struct DBIndexItem;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_CodePosition;
+struct DBTableDef;
struct CodePosition
{
int charPos;
int pos;
int included;
-} __attribute__ ((gcc_struct));
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Location;
+extern size_t strlen(const char * );
-struct Location
-{
-struct CodePosition start;
-struct CodePosition end;
-} __attribute__ ((gcc_struct));
+extern int strcmp(const char * , const char * );
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attrib;
+extern int sprintf(char * , const char * , ...);
-struct Attrib;
+extern char * strcat(char * , const char * );
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ExtDecl;
+extern char * __ecereNameSpace__ecere__sys__CopyString(const char * string);
-struct ExtDecl
-{
-struct Location loc;
-int type;
-union
-{
-char * s;
-struct Attrib * attr;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+extern int isprint(int c);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDefinition;
+extern char * strcpy(char * , const char * );
-struct ClassDefinition
-{
-struct ClassDefinition * prev;
-struct ClassDefinition * next;
-struct Location loc;
-struct Specifier * _class;
-struct __ecereNameSpace__ecere__sys__OldList * baseSpecs;
-struct __ecereNameSpace__ecere__sys__OldList * definitions;
-struct Symbol * symbol;
-struct Location blockStart;
-struct Location nameLoc;
-int endid;
-int declMode;
-unsigned int deleteWatchable;
-} __attribute__ ((gcc_struct));
+extern void Compiler_Error(const char * format, ...);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Context;
+extern const char * __ecereNameSpace__ecere__GetTranslatedString(const char * name, const char * string, const char * stringAndContext);
-struct Context
+struct __ecereNameSpace__ecere__com__LinkList
{
-struct Context * parent;
-struct __ecereNameSpace__ecere__sys__BinaryTree types;
-struct __ecereNameSpace__ecere__sys__BinaryTree classes;
-struct __ecereNameSpace__ecere__sys__BinaryTree symbols;
-struct __ecereNameSpace__ecere__sys__BinaryTree structSymbols;
-int nextID;
-int simpleID;
-struct __ecereNameSpace__ecere__sys__BinaryTree templateTypes;
-struct ClassDefinition * classDef;
-unsigned int templateTypesOnly;
-unsigned int hasNameSpace;
-} __attribute__ ((gcc_struct));
+void * first;
+void * last;
+int count;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Instantiation;
+extern char * strchr(const char * , int);
-struct Instantiation
-{
-struct Instantiation * prev;
-struct Instantiation * next;
-struct Location loc;
-struct Specifier * _class;
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * members;
-struct Symbol * symbol;
-unsigned int fullSet;
-unsigned int isConstant;
-unsigned char * data;
-struct Location nameLoc;
-struct Location insideLoc;
-unsigned int built;
-} __attribute__ ((gcc_struct));
+extern void FullClassNameCat(char * output, const char * className, unsigned int includeTemplateParams);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declaration;
+extern void * memcpy(void * , const void * , size_t size);
-struct Declaration
-{
-struct Declaration * prev;
-struct Declaration * next;
-struct Location loc;
-int type;
-union
-{
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct __ecereNameSpace__ecere__sys__OldList * declarators;
-} __attribute__ ((gcc_struct)) __anon1;
-struct Instantiation * inst;
-struct
-{
-struct Identifier * id;
-struct Expression * exp;
-} __attribute__ ((gcc_struct)) __anon2;
-} __attribute__ ((gcc_struct)) __anon1;
-struct Specifier * extStorage;
-struct Symbol * symbol;
-int declMode;
-} __attribute__ ((gcc_struct));
+extern void __ecereNameSpace__ecere__sys__ChangeCh(char * string, char ch1, char ch2);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Statement;
+extern void Compiler_Warning(const char * format, ...);
-struct Statement
-{
-struct Statement * prev;
-struct Statement * next;
-struct Location loc;
-int type;
-union
-{
-struct __ecereNameSpace__ecere__sys__OldList * expressions;
-struct
-{
-struct Identifier * id;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) labeled;
-struct
-{
-struct Expression * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) caseStmt;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * declarations;
-struct __ecereNameSpace__ecere__sys__OldList * statements;
-struct Context * context;
-unsigned int isSwitch;
-} __attribute__ ((gcc_struct)) compound;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-struct Statement * elseStmt;
-} __attribute__ ((gcc_struct)) ifStmt;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) switchStmt;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) whileStmt;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) doWhile;
-struct
-{
-struct Statement * init;
-struct Statement * check;
-struct __ecereNameSpace__ecere__sys__OldList * increment;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) forStmt;
-struct
-{
-struct Identifier * id;
-} __attribute__ ((gcc_struct)) gotoStmt;
-struct
-{
-struct Specifier * spec;
-char * statements;
-struct __ecereNameSpace__ecere__sys__OldList * inputFields;
-struct __ecereNameSpace__ecere__sys__OldList * outputFields;
-struct __ecereNameSpace__ecere__sys__OldList * clobberedFields;
-} __attribute__ ((gcc_struct)) asmStmt;
-struct
-{
-struct Expression * watcher;
-struct Expression * object;
-struct __ecereNameSpace__ecere__sys__OldList * watches;
-} __attribute__ ((gcc_struct)) _watch;
-struct
-{
-struct Identifier * id;
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct __ecereNameSpace__ecere__sys__OldList * filter;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) forEachStmt;
-struct Declaration * decl;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+extern unsigned long strtoul(const char * nptr, char * * endptr, int base);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TypeName;
+extern long long strtoll(const char * nptr, char * * endptr, int base);
-struct TypeName
-{
-struct TypeName * prev;
-struct TypeName * next;
-struct Location loc;
-struct __ecereNameSpace__ecere__sys__OldList * qualifiers;
-struct Declarator * declarator;
-int classObjectType;
-struct Expression * bitCount;
-} __attribute__ ((gcc_struct));
+extern uint64 strtoull(const char * nptr, char * * endptr, int base);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Initializer;
+extern int strtol(const char * , char * * , int base);
-struct Initializer
-{
-struct Initializer * prev;
-struct Initializer * next;
-struct Location loc;
-int type;
-union
-{
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * list;
-} __attribute__ ((gcc_struct)) __anon1;
-unsigned int isConstant;
-struct Identifier * id;
-} __attribute__ ((gcc_struct));
+extern long long __ecereNameSpace__ecere__com___strtoi64(const char * string, const char * * endString, int base);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DataValue;
+extern uint64 __ecereNameSpace__ecere__com___strtoui64(const char * string, const char * * endString, int base);
-struct __ecereNameSpace__ecere__com__DataValue
-{
-union
-{
-char c;
-unsigned char uc;
-short s;
-unsigned short us;
-int i;
-unsigned int ui;
-void * p;
-float f;
-double d;
-long long i64;
-uint64 ui64;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+extern double strtod(const char * , char * * );
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Expression;
+extern int strncmp(const char * , const char * , size_t n);
-struct Expression
+extern char * __ecereNameSpace__ecere__sys__RSearchString(const char * buffer, const char * subStr, int maxLen, unsigned int matchCase, unsigned int matchWord);
+
+extern char * QMkString(const char * source);
+
+extern char * strncpy(char * , const char * , size_t n);
+
+extern int printf(const char * , ...);
+
+extern char * strstr(const char * , const char * );
+
+extern unsigned int __ecereNameSpace__ecere__sys__UTF8GetChar(const char * string, int * numBytes);
+
+extern unsigned int (* __ecereProp_float_Get_isInf)(float this);
+
+extern int (* __ecereProp_float_Get_signBit)(float this);
+
+extern unsigned int (* __ecereProp_float_Get_isNan)(float this);
+
+extern unsigned int (* __ecereProp_double_Get_isInf)(double this);
+
+extern int (* __ecereProp_double_Get_signBit)(double this);
+
+extern unsigned int (* __ecereProp_double_Get_isNan)(double this);
+
+extern float (* __ecereMethod_float_inf)(void);
+
+extern float (* __ecereMethod_float_nan)(void);
+
+extern double (* __ecereMethod_double_inf)(void);
+
+extern double (* __ecereMethod_double_nan)(void);
+
+int __ecereVMethodID_class_OnGetString;
+
+void SetYydebug(unsigned int b)
{
-struct Expression * prev;
-struct Expression * next;
-struct Location loc;
-int type;
-union
+yydebug = b;
+}
+
+unsigned int GetParseError()
{
-struct
+return parseError;
+}
+
+extern struct __ecereNameSpace__ecere__sys__OldList * ast;
+
+extern struct __ecereNameSpace__ecere__sys__OldList * MkList(void);
+
+extern struct __ecereNameSpace__ecere__sys__OldList * MkListOne(void * item);
+
+extern void ListAdd(struct __ecereNameSpace__ecere__sys__OldList * list, void * item);
+
+extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* FreeFunction)(void * ));
+
+struct __ecereNameSpace__ecere__com__EnumClassData
{
-char * constant;
-struct Identifier * identifier;
-} __attribute__ ((gcc_struct)) __anon1;
-struct Statement * compound;
-struct Instantiation * instance;
-struct
+struct __ecereNameSpace__ecere__sys__OldList values;
+long long largest;
+} ecere_gcc_struct;
+
+extern struct __ecereNameSpace__ecere__sys__OldList * CopyList(struct __ecereNameSpace__ecere__sys__OldList * source, void * (* CopyFunction)(void * ));
+
+void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
+
+unsigned int __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(struct __ecereNameSpace__ecere__sys__OldList * this, void * prevItem, void * item);
+
+void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
+
+void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(struct __ecereNameSpace__ecere__sys__OldList * this, void (* freeFn)(void * ));
+
+void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(struct __ecereNameSpace__ecere__sys__OldList * this);
+
+extern struct Pointer * MkPointer(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Pointer * pointer);
+
+extern struct Attrib * MkAttrib(int type, struct __ecereNameSpace__ecere__sys__OldList * attribs);
+
+struct Location
{
-char * string;
-unsigned int intlString;
-} __attribute__ ((gcc_struct)) __anon2;
-struct __ecereNameSpace__ecere__sys__OldList * list;
-struct
+struct CodePosition start;
+struct CodePosition end;
+} ecere_gcc_struct;
+
+void ReadString(char * output, char * string)
{
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct Declarator * decl;
-} __attribute__ ((gcc_struct)) _classExp;
-struct
+int len = strlen(string);
+int c, d = 0;
+unsigned int quoted = 0, escaped = 0;
+
+for(c = 0; c < len; c++)
{
-struct Identifier * id;
-} __attribute__ ((gcc_struct)) classData;
-struct
+char ch = string[c];
+
+if(escaped)
{
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * arguments;
-struct Location argLoc;
-} __attribute__ ((gcc_struct)) call;
-struct
+switch(ch)
{
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * index;
-} __attribute__ ((gcc_struct)) index;
-struct
-{
-struct Expression * exp;
-struct Identifier * member;
-int memberType;
-unsigned int thisPtr;
-} __attribute__ ((gcc_struct)) member;
-struct
-{
-int op;
-struct Expression * exp1;
-struct Expression * exp2;
-} __attribute__ ((gcc_struct)) op;
-struct TypeName * typeName;
-struct Specifier * _class;
-struct
-{
-struct TypeName * typeName;
-struct Expression * exp;
-} __attribute__ ((gcc_struct)) cast;
-struct
-{
-struct Expression * cond;
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Expression * elseExp;
-} __attribute__ ((gcc_struct)) cond;
-struct
-{
-struct TypeName * typeName;
-struct Expression * size;
-} __attribute__ ((gcc_struct)) _new;
-struct
-{
-struct TypeName * typeName;
-struct Expression * size;
-struct Expression * exp;
-} __attribute__ ((gcc_struct)) _renew;
-struct
-{
-char * table;
-struct Identifier * id;
-} __attribute__ ((gcc_struct)) db;
-struct
+case 'n':
+output[d] = '\n';
+break;
+case 't':
+output[d] = '\t';
+break;
+case 'a':
+output[d] = '\a';
+break;
+case 'b':
+output[d] = '\b';
+break;
+case 'f':
+output[d] = '\f';
+break;
+case 'r':
+output[d] = '\r';
+break;
+case 'v':
+output[d] = '\v';
+break;
+case '\\':
+output[d] = '\\';
+break;
+case '\"':
+output[d] = '\"';
+break;
+case '\'':
+output[d] = '\'';
+break;
+default:
+output[d] = ch;
+}
+d++;
+escaped = 0;
+}
+else
{
-struct Expression * ds;
-struct Expression * name;
-} __attribute__ ((gcc_struct)) dbopen;
-struct
+if(ch == '\"')
+quoted ^= 1;
+else if(quoted)
{
-struct TypeName * typeName;
-struct Initializer * initializer;
-} __attribute__ ((gcc_struct)) initializer;
-struct
+if(ch == '\\')
+escaped = 1;
+else
+output[d++] = ch;
+}
+}
+}
+output[d] = '\0';
+}
+
+char * PrintInt(long long result)
{
-struct Expression * exp;
-struct TypeName * typeName;
-} __attribute__ ((gcc_struct)) vaArg;
-} __attribute__ ((gcc_struct)) __anon1;
-unsigned int debugValue;
-struct __ecereNameSpace__ecere__com__DataValue val;
-uint64 address;
-unsigned int hasAddress;
-struct Type * expType;
-struct Type * destType;
-unsigned int usage;
-int tempCount;
-unsigned int byReference;
-unsigned int isConstant;
-unsigned int addedThis;
-unsigned int needCast;
-unsigned int thisPtr;
-unsigned int opDestType;
-unsigned int needTemplateCast;
-} __attribute__ ((gcc_struct));
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateDatatype;
+if(result > (((int)0x7fffffff)))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
+else
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
+if(result > (((int)0x7fffffff)) || result < (((int)0x80000000)))
+strcat(temp, "LL");
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct TemplateDatatype
+char * PrintUInt(uint64 result)
{
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct Declarator * decl;
-} __attribute__ ((gcc_struct));
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateArgument;
+if(result > (0xffffffff))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
+else if(result > (((int)0x7fffffff)))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
+else
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct TemplateArgument;
+char * PrintInt64(long long result)
+{
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateParameter;
+if(result > (((int)0x7fffffff)) || result < (((int)0x80000000)))
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64dLL" : "%lldLL"), result);
+else
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct TemplateParameter
-{
-struct TemplateParameter * prev;
-struct TemplateParameter * next;
-struct Location loc;
-int type;
-struct Identifier * identifier;
-union
+char * PrintUInt64(uint64 result)
{
-struct TemplateDatatype * dataType;
-int memberType;
-} __attribute__ ((gcc_struct)) __anon1;
-struct TemplateArgument * defaultArgument;
-const char * dataTypeString;
-struct Type * baseType;
-} __attribute__ ((gcc_struct));
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Specifier;
+if(result > (0xffffffff))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
+else if(result > (((int)0x7fffffff)))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
+else
+sprintf(temp, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct Specifier
+char * PrintHexUInt(uint64 result)
{
-struct Specifier * prev;
-struct Specifier * next;
-struct Location loc;
-int type;
-union
+char temp[100];
+
+if(result > (0xffffffff))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
+else
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
+if(result > (0xffffffff))
+strcat(temp, "LL");
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
+
+char * PrintHexUInt64(uint64 result)
{
-int specifier;
-struct
+char temp[100];
+
+if(result > (0xffffffff))
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
+else
+sprintf(temp, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
+
+char * PrintShort(short result)
{
-struct ExtDecl * extDecl;
-char * name;
-struct Symbol * symbol;
-struct __ecereNameSpace__ecere__sys__OldList * templateArgs;
-} __attribute__ ((gcc_struct)) __anon1;
-struct
+char temp[100];
+
+sprintf(temp, "%d", (unsigned short)result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
+
+char * PrintUShort(unsigned short result)
{
-struct Identifier * id;
-struct __ecereNameSpace__ecere__sys__OldList * list;
-struct __ecereNameSpace__ecere__sys__OldList * baseSpecs;
-struct __ecereNameSpace__ecere__sys__OldList * definitions;
-unsigned int addNameSpace;
-struct Context * ctx;
-struct ExtDecl * extDeclStruct;
-} __attribute__ ((gcc_struct)) __anon2;
-struct Expression * expression;
-struct Specifier * _class;
-struct TemplateParameter * templateParameter;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Identifier;
+if(result > 32767)
+sprintf(temp, "0x%X", (int)result);
+else
+sprintf(temp, "%d", (int)result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct Identifier
+char * PrintUChar(unsigned char result)
{
-struct Identifier * prev;
-struct Identifier * next;
-struct Location loc;
-struct Symbol * classSym;
-struct Specifier * _class;
-char * string;
-struct Identifier * badID;
-} __attribute__ ((gcc_struct));
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Pointer;
+sprintf(temp, "0x%X", result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct Pointer;
+char * PrintChar(char result)
+{
+char temp[100];
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declarator;
+if(result > 0 && isprint(result))
+sprintf(temp, "'%c'", result);
+else if(result < 0)
+sprintf(temp, "%d", (int)result);
+else
+sprintf(temp, "0x%X", (unsigned char)result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-struct Declarator
+char * PrintFloat(float result)
{
-struct Declarator * prev;
-struct Declarator * next;
-struct Location loc;
-int type;
-struct Symbol * symbol;
-struct Declarator * declarator;
-union
+char temp[350];
+
+if(__ecereProp_float_Get_isInf(result))
{
-struct Identifier * identifier;
-struct
+if(__ecereProp_float_Get_signBit(result))
+strcpy(temp, "-inf");
+else
+strcpy(temp, "inf");
+}
+else if(__ecereProp_float_Get_isNan(result))
{
-struct Expression * exp;
-struct Expression * posExp;
-struct Attrib * attrib;
-} __attribute__ ((gcc_struct)) structDecl;
-struct
-{
-struct Expression * exp;
-struct Specifier * enumClass;
-} __attribute__ ((gcc_struct)) array;
-struct
+if(__ecereProp_float_Get_signBit(result))
+strcpy(temp, "-nan");
+else
+strcpy(temp, "nan");
+}
+else
+sprintf(temp, "%.16ff", result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
+
+char * PrintDouble(double result)
{
-struct __ecereNameSpace__ecere__sys__OldList * parameters;
-} __attribute__ ((gcc_struct)) function;
-struct
+char temp[350];
+
+if(__ecereProp_double_Get_isInf(result))
{
-struct Pointer * pointer;
-} __attribute__ ((gcc_struct)) pointer;
-struct
+if(__ecereProp_double_Get_signBit(result))
+strcpy(temp, "-inf");
+else
+strcpy(temp, "inf");
+}
+else if(__ecereProp_double_Get_isNan(result))
{
-struct ExtDecl * extended;
-} __attribute__ ((gcc_struct)) extended;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+if(__ecereProp_double_Get_signBit(result))
+strcpy(temp, "-nan");
+else
+strcpy(temp, "nan");
+}
+else
+sprintf(temp, "%.16f", result);
+return __ecereNameSpace__ecere__sys__CopyString(temp);
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_FunctionDefinition;
+extern struct Location yylloc;
-struct FunctionDefinition
+struct ExtDecl
{
-struct FunctionDefinition * prev;
-struct FunctionDefinition * next;
struct Location loc;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct Declarator * declarator;
-struct __ecereNameSpace__ecere__sys__OldList * declarations;
-struct Statement * body;
+int type;
+union
+{
+char * s;
+struct Attrib * attr;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
+
+extern struct ExtDecl * MkExtDeclAttrib(struct Attrib * attr);
+
+struct Expression;
+
+extern struct Expression * parsedExpression;
+
+extern struct Expression * QMkExpId(const char * id);
+
+extern struct Expression * MkExpOp(struct Expression * exp1, int op, struct Expression * exp2);
+
+void ComputeExpression(struct Expression * exp);
+
+extern struct Expression * MkExpConstant(const char * string);
+
+extern struct Attribute * MkAttribute(char * attr, struct Expression * exp);
+
+extern void FreeExpression(struct Expression * exp);
+
+extern void FreeExpContents(struct Expression * exp);
+
+extern struct Expression * GetNonBracketsExp(struct Expression * exp);
+
+extern struct Expression * CopyExpression(struct Expression * exp);
+
+extern struct Expression * MkExpBrackets(struct __ecereNameSpace__ecere__sys__OldList * expressions);
+
+extern struct Expression * MkExpCall(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * arguments);
+
+extern struct Expression * MkExpCondition(struct Expression * cond, struct __ecereNameSpace__ecere__sys__OldList * expressions, struct Expression * elseExp);
+
+extern struct Expression * MoveExpContents(struct Expression * exp);
+
+extern struct Expression * QBrackets(struct Expression * exp);
+
+extern struct Expression * QMkExpCond(struct Expression * cond, struct Expression * exp, struct Expression * elseExp);
+
+struct Statement;
+
+static struct Statement * curCompound;
+
+extern struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements);
+
+extern struct Statement * MkExpressionStmt(struct __ecereNameSpace__ecere__sys__OldList * expressions);
+
+extern struct Statement * MkIfStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement, struct Statement * elseStmt);
+
+extern struct Statement * MkForStmt(struct Statement * init, struct Statement * check, struct __ecereNameSpace__ecere__sys__OldList * inc, struct Statement * statement);
+
+extern struct Statement * MkWhileStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement);
+
+extern struct Statement * MkFireWatchersStmt(struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches);
+
+struct External;
+
+struct External * curExternal, * afterExternal;
+
+extern void FreeExternal(struct External * external);
+
+struct Type;
+
+static struct Type * curSwitchType;
+
+extern struct Type * ProcessTypeString(const char * string, unsigned int staticMethod);
+
+extern void FreeType(struct Type * type);
+
+extern struct Type * MkClassType(const char * name);
+
+extern void CopyTypeInto(struct Type * type, struct Type * src);
+
+struct __ecereNameSpace__ecere__com__Class;
+
+struct __ecereNameSpace__ecere__com__Instance
+{
+void * * _vTbl;
struct __ecereNameSpace__ecere__com__Class * _class;
-struct __ecereNameSpace__ecere__sys__OldList attached;
-int declMode;
-struct Type * type;
-struct Symbol * propSet;
-int tempCount;
-unsigned int propertyNoThis;
-} __attribute__ ((gcc_struct));
+int _refCount;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableDef;
+extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name);
-struct DBTableDef;
+extern void __ecereNameSpace__ecere__com__eClass_SetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, long long value);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_External;
+static struct __ecereNameSpace__ecere__com__Class * currentClass;
-struct External
+struct __ecereNameSpace__ecere__com__Class * thisClass;
+
+struct __ecereNameSpace__ecere__com__Class * containerClass;
+
+extern unsigned int __ecereNameSpace__ecere__com__eClass_IsDerived(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class * from);
+
+extern struct Expression * GetTemplateArgExpByName(const char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType);
+
+extern void * __ecereNameSpace__ecere__com__eInstance_New(struct __ecereNameSpace__ecere__com__Class * _class);
+
+extern void __ecereNameSpace__ecere__com__eInstance_SetMethod(struct __ecereNameSpace__ecere__com__Instance * instance, const char * name, void * function);
+
+extern void __ecereNameSpace__ecere__com__eInstance_IncRef(struct __ecereNameSpace__ecere__com__Instance * instance);
+
+extern void OutputExpression(struct Expression * exp, struct __ecereNameSpace__ecere__com__Instance * f);
+
+extern struct __ecereNameSpace__ecere__com__Instance * fileInput;
+
+int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek;
+
+int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Read;
+
+extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpace__ecere__com__Instance * instance);
+
+int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Write;
+
+void SetThisClass(struct __ecereNameSpace__ecere__com__Class * c)
{
-struct External * prev;
-struct External * next;
-struct Location loc;
-int type;
-struct Symbol * symbol;
-union
+thisClass = c;
+}
+
+struct __ecereNameSpace__ecere__com__Class * GetThisClass()
{
-struct FunctionDefinition * function;
-struct ClassDefinition * _class;
-struct Declaration * declaration;
-char * importString;
-struct Identifier * id;
-struct DBTableDef * table;
-} __attribute__ ((gcc_struct)) __anon1;
-int importType;
-} __attribute__ ((gcc_struct));
+return thisClass;
+}
+
+struct Context;
+
+extern struct Context * curContext;
+
+extern struct Context * topContext;
+
+extern struct Context * PushContext(void);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ModuleImport;
+extern void PopContext(struct Context * ctx);
+
+extern void FreeContext(struct Context * context);
+
+extern struct Context * globalContext;
+
+struct ModuleImport;
+
+extern struct ModuleImport * mainModule;
struct ModuleImport
{
struct __ecereNameSpace__ecere__sys__OldList functions;
int importType;
int importAccess;
-} __attribute__ ((gcc_struct));
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassImport;
+struct __ecereNameSpace__ecere__com__NameSpace;
-struct ClassImport
-{
-struct ClassImport * prev;
-struct ClassImport * next;
-char * name;
-struct __ecereNameSpace__ecere__sys__OldList methods;
-struct __ecereNameSpace__ecere__sys__OldList properties;
-unsigned int itself;
-int isRemote;
-} __attribute__ ((gcc_struct));
+extern struct __ecereNameSpace__ecere__com__NameSpace * globalData;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Symbol;
+struct FunctionDefinition;
-struct Symbol
+static struct FunctionDefinition * curFunction;
+
+struct __ecereNameSpace__ecere__sys__BTNode;
+
+struct __ecereNameSpace__ecere__sys__BTNode
{
-char * string;
-struct Symbol * parent;
-struct Symbol * left;
-struct Symbol * right;
+uintptr_t key;
+struct __ecereNameSpace__ecere__sys__BTNode * parent;
+struct __ecereNameSpace__ecere__sys__BTNode * left;
+struct __ecereNameSpace__ecere__sys__BTNode * right;
int depth;
-struct Type * type;
-union
+} ecere_gcc_struct;
+
+struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(struct __ecereNameSpace__ecere__sys__BTNode * this);
+
+struct __ecereNameSpace__ecere__com__Property;
+
+struct __ecereNameSpace__ecere__com__Property
{
-struct __ecereNameSpace__ecere__com__Method * method;
-struct __ecereNameSpace__ecere__com__Property * _property;
-struct __ecereNameSpace__ecere__com__Class * registered;
-} __attribute__ ((gcc_struct)) __anon1;
+struct __ecereNameSpace__ecere__com__Property * prev;
+struct __ecereNameSpace__ecere__com__Property * next;
+const char * name;
+unsigned int isProperty;
+int memberAccess;
int id;
-int idCode;
-union
-{
-struct
-{
-struct External * pointerExternal;
-struct External * structExternal;
-} __attribute__ ((gcc_struct)) __anon1;
-struct
-{
-struct External * externalGet;
-struct External * externalSet;
-struct External * externalPtr;
-struct External * externalIsSet;
-} __attribute__ ((gcc_struct)) __anon2;
-struct
-{
-struct External * methodExternal;
-struct External * methodCodeExternal;
-} __attribute__ ((gcc_struct)) __anon3;
-} __attribute__ ((gcc_struct)) __anon2;
-unsigned int imported;
-unsigned int declaredStructSym;
struct __ecereNameSpace__ecere__com__Class * _class;
-unsigned int declaredStruct;
-unsigned int needConstructor;
-unsigned int needDestructor;
-char * constructorName;
-char * structName;
-char * className;
-char * destructorName;
-struct ModuleImport * module;
-struct ClassImport * _import;
-struct Location nameLoc;
-unsigned int isParam;
-unsigned int isRemote;
-unsigned int isStruct;
-unsigned int fireWatchersDone;
-int declaring;
-unsigned int classData;
-unsigned int isStatic;
-char * shortName;
-struct __ecereNameSpace__ecere__sys__OldList * templateParams;
-struct __ecereNameSpace__ecere__sys__OldList templatedClasses;
-struct Context * ctx;
-int isIterator;
-struct Expression * propCategory;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Type;
-
-struct Type
-{
-struct Type * prev;
-struct Type * next;
-int refCount;
-union
-{
-struct Symbol * _class;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList members;
-char * enumName;
-} __attribute__ ((gcc_struct)) __anon1;
-struct
-{
-struct Type * returnType;
-struct __ecereNameSpace__ecere__sys__OldList params;
-struct Symbol * thisClass;
-unsigned int staticMethod;
-struct TemplateParameter * thisClassTemplate;
-} __attribute__ ((gcc_struct)) __anon2;
-struct
-{
-struct __ecereNameSpace__ecere__com__Method * method;
-struct __ecereNameSpace__ecere__com__Class * methodClass;
-struct __ecereNameSpace__ecere__com__Class * usedClass;
-} __attribute__ ((gcc_struct)) __anon3;
-struct
-{
-struct Type * arrayType;
-int arraySize;
-struct Expression * arraySizeExp;
-unsigned int freeExp;
-struct Symbol * enumClass;
-} __attribute__ ((gcc_struct)) __anon4;
-struct Type * type;
-struct TemplateParameter * templateParameter;
-} __attribute__ ((gcc_struct)) __anon1;
-int kind;
-unsigned int size;
-char * name;
-char * typeName;
-int classObjectType;
-int alignment;
-unsigned int offset;
-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;
-unsigned int casted : 1;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Class;
-
-struct __ecereNameSpace__ecere__com__Class
-{
-struct __ecereNameSpace__ecere__com__Class * prev;
-struct __ecereNameSpace__ecere__com__Class * next;
-const char * name;
-int offset;
-int structSize;
-int (* * _vTbl)();
-int vTblSize;
-int (* Constructor)(struct __ecereNameSpace__ecere__com__Instance *);
-void (* Destructor)(struct __ecereNameSpace__ecere__com__Instance *);
-int offsetClass;
-int sizeClass;
-struct __ecereNameSpace__ecere__com__Class * base;
-struct __ecereNameSpace__ecere__sys__BinaryTree methods;
-struct __ecereNameSpace__ecere__sys__BinaryTree members;
-struct __ecereNameSpace__ecere__sys__BinaryTree prop;
-struct __ecereNameSpace__ecere__sys__OldList membersAndProperties;
-struct __ecereNameSpace__ecere__sys__BinaryTree classProperties;
-struct __ecereNameSpace__ecere__sys__OldList derivatives;
-int memberID;
-int startMemberID;
-int type;
-struct __ecereNameSpace__ecere__com__Instance * module;
-struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
const char * dataTypeString;
+struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
struct Type * dataType;
-int typeSize;
-int defaultAlignment;
-void (* Initialize)();
-int memberOffset;
-struct __ecereNameSpace__ecere__sys__OldList selfWatchers;
-const char * designerClass;
-unsigned int noExpansion;
-const char * defaultProperty;
-unsigned int comRedefinition;
-int count;
-int isRemote;
-unsigned int internalDecl;
+void (* Set)(void * , int);
+int (* Get)(void * );
+unsigned int (* IsSet)(void * );
void * data;
-unsigned int computeSize;
-int structAlignment;
-int destructionWatchOffset;
-unsigned int fixed;
-struct __ecereNameSpace__ecere__sys__OldList delayedCPValues;
-int inheritanceAccess;
-const char * fullName;
void * symbol;
-struct __ecereNameSpace__ecere__sys__OldList conversions;
-struct __ecereNameSpace__ecere__sys__OldList templateParams;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument * templateArgs;
-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, const char * name);
-
-extern void __ecereNameSpace__ecere__com__eClass_SetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, long long value);
+int vid;
+unsigned int conversion;
+unsigned int watcherOffset;
+const char * category;
+unsigned int compiled;
+unsigned int selfWatchable;
+unsigned int isWatchable;
+} ecere_gcc_struct;
extern void __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
-extern void __ecereNameSpace__ecere__com__eInstance_SetMethod(struct __ecereNameSpace__ecere__com__Instance * instance, const char * name, void * function);
-
-extern void __ecereNameSpace__ecere__com__eInstance_IncRef(struct __ecereNameSpace__ecere__com__Instance * instance);
-
extern void __ecereNameSpace__ecere__com__eInstance_StopWatching(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property, struct __ecereNameSpace__ecere__com__Instance * object);
extern void __ecereNameSpace__ecere__com__eInstance_Watch(void * instance, struct __ecereNameSpace__ecere__com__Property * _property, void * object, void (* callback)(void * , void * ));
extern void __ecereNameSpace__ecere__com__eInstance_FireWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
+struct Identifier;
-struct __ecereNameSpace__ecere__com__Instance
-{
-int (* * _vTbl)();
-struct __ecereNameSpace__ecere__com__Class * _class;
-int _refCount;
-} __attribute__ ((gcc_struct));
+extern void FreeIdentifier(struct Identifier * id);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DataMember;
+extern struct Identifier * MkIdentifier(const char * string);
-struct __ecereNameSpace__ecere__com__DataMember
-{
-struct __ecereNameSpace__ecere__com__DataMember * prev;
-struct __ecereNameSpace__ecere__com__DataMember * next;
-const char * name;
-unsigned int isProperty;
-int memberAccess;
-int id;
-struct __ecereNameSpace__ecere__com__Class * _class;
-const char * dataTypeString;
-struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
-struct Type * dataType;
-int type;
-int offset;
-int memberID;
-struct __ecereNameSpace__ecere__sys__OldList members;
-struct __ecereNameSpace__ecere__sys__BinaryTree membersAlpha;
-int memberOffset;
-int structAlignment;
-} __attribute__ ((gcc_struct));
+extern struct Expression * MkExpIdentifier(struct Identifier * id);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SerialBuffer;
+extern struct Expression * MkExpMember(struct Expression * expression, struct Identifier * member);
-struct __ecereNameSpace__ecere__com__SerialBuffer
-{
-unsigned char * _buffer;
-unsigned int count;
-unsigned int _size;
-unsigned int pos;
-} __attribute__ ((gcc_struct));
+extern struct Identifier * CopyIdentifier(struct Identifier * id);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassTemplateArgument;
+extern struct Expression * MkExpPointer(struct Expression * expression, struct Identifier * member);
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument
-{
-union
-{
-struct
-{
-const char * dataTypeString;
-struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
-} __attribute__ ((gcc_struct)) __anon1;
-struct __ecereNameSpace__ecere__com__DataValue expression;
-struct
-{
-const char * memberString;
-union
+struct __ecereNameSpace__ecere__sys__OldLink;
+
+struct __ecereNameSpace__ecere__sys__OldLink
{
-struct __ecereNameSpace__ecere__com__DataMember * member;
-struct __ecereNameSpace__ecere__com__Property * prop;
-struct __ecereNameSpace__ecere__com__Method * method;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct)) __anon2;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+struct __ecereNameSpace__ecere__sys__OldLink * prev;
+struct __ecereNameSpace__ecere__sys__OldLink * next;
+void * data;
+} ecere_gcc_struct;
+
+struct Declaration;
+
+extern struct External * MkExternalDeclaration(struct Declaration * declaration);
-void exit(int status);
+extern struct Declaration * MkDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * initDeclarators);
-void * calloc(size_t nmemb, size_t size);
+struct Specifier;
-void free(void * ptr);
+extern struct Declaration * MkStructDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * declarators, struct Specifier * extStorage);
-void * malloc(size_t size);
+extern struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions);
-void * realloc(void * ptr, size_t size);
+extern struct Specifier * MkSpecifier(int specifier);
-long int strtol(const char * nptr, char ** endptr, int base);
+extern struct Specifier * MkSpecifierName(const char * name);
-long long int strtoll(const char * nptr, char ** endptr, int base);
+extern struct Specifier * MkSpecifierExtended(struct ExtDecl * extDecl);
-unsigned long long int strtoull(const char * nptr, char ** endptr, int base);
+extern void FreeSpecifier(struct Specifier * spec);
-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, BOOL = 367, _BOOL = 368, _COMPLEX = 369, _IMAGINARY = 370, RESTRICT = 371, THREAD = 372
-};
+extern struct Specifier * MkEnum(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * list);
-typedef union YYSTYPE
+struct Statement
+{
+struct Statement * prev;
+struct Statement * next;
+struct Location loc;
+int type;
+union
+{
+struct __ecereNameSpace__ecere__sys__OldList * expressions;
+struct
{
-int specifierType;
-int i;
-int declMode;
struct Identifier * id;
+struct Statement * stmt;
+} ecere_gcc_struct labeled;
+struct
+{
struct Expression * exp;
-struct Specifier * specifier;
-struct __ecereNameSpace__ecere__sys__OldList * list;
-struct Enumerator * enumerator;
-struct Declarator * declarator;
-struct Pointer * pointer;
-struct Initializer * initializer;
-struct InitDeclarator * initDeclarator;
-struct TypeName * typeName;
-struct Declaration * declaration;
struct Statement * stmt;
-struct FunctionDefinition * function;
-struct External * external;
+} ecere_gcc_struct caseStmt;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * declarations;
+struct __ecereNameSpace__ecere__sys__OldList * statements;
struct Context * context;
-struct AsmField * asmField;
-struct Attrib * attrib;
-struct ExtDecl * extDecl;
-struct Attribute * attribute;
-struct Instantiation * instance;
-struct MembersInit * membersInit;
-struct MemberInit * memberInit;
-struct ClassFunction * classFunction;
-struct ClassDefinition * _class;
-struct ClassDef * classDef;
-struct PropertyDef * prop;
-char * string;
-struct Symbol * symbol;
-struct PropertyWatch * propertyWatch;
-struct TemplateParameter * templateParameter;
-struct TemplateArgument * templateArgument;
-struct TemplateDatatype * templateDatatype;
-struct DBTableEntry * dbtableEntry;
-struct DBIndexItem * dbindexItem;
-struct DBTableDef * dbtableDef;
-} __attribute__ ((gcc_struct)) YYSTYPE;
+unsigned int isSwitch;
+} ecere_gcc_struct compound;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * exp;
+struct Statement * stmt;
+struct Statement * elseStmt;
+} ecere_gcc_struct ifStmt;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * exp;
+struct Statement * stmt;
+} ecere_gcc_struct switchStmt;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * exp;
+struct Statement * stmt;
+} ecere_gcc_struct whileStmt;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * exp;
+struct Statement * stmt;
+} ecere_gcc_struct doWhile;
+struct
+{
+struct Statement * init;
+struct Statement * check;
+struct __ecereNameSpace__ecere__sys__OldList * increment;
+struct Statement * stmt;
+} ecere_gcc_struct forStmt;
+struct
+{
+struct Identifier * id;
+} ecere_gcc_struct gotoStmt;
+struct
+{
+struct Specifier * spec;
+char * statements;
+struct __ecereNameSpace__ecere__sys__OldList * inputFields;
+struct __ecereNameSpace__ecere__sys__OldList * outputFields;
+struct __ecereNameSpace__ecere__sys__OldList * clobberedFields;
+} ecere_gcc_struct asmStmt;
+struct
+{
+struct Expression * watcher;
+struct Expression * object;
+struct __ecereNameSpace__ecere__sys__OldList * watches;
+} ecere_gcc_struct _watch;
+struct
+{
+struct Identifier * id;
+struct __ecereNameSpace__ecere__sys__OldList * exp;
+struct __ecereNameSpace__ecere__sys__OldList * filter;
+struct Statement * stmt;
+} ecere_gcc_struct forEachStmt;
+struct Declaration * decl;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
+
+extern struct Specifier * CopySpecifier(struct Specifier * spec);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Enumerator;
+extern struct Expression * MkExpClassSize(struct Specifier * _class);
-struct Enumerator
+struct Symbol;
+
+struct Identifier
{
-struct Enumerator * prev;
-struct Enumerator * next;
+struct Identifier * prev;
+struct Identifier * next;
struct Location loc;
-struct Identifier * id;
-struct Expression * exp;
-} __attribute__ ((gcc_struct));
+struct Symbol * classSym;
+struct Specifier * _class;
+char * string;
+struct Identifier * badID;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_InitDeclarator;
+extern struct Symbol * FindStruct(struct Context * ctx, const char * name);
-struct InitDeclarator
+extern struct Symbol * FindClass(const char * name);
+
+extern void DeclareClass(struct External * neededFor, struct Symbol * classSym, const char * className);
+
+extern struct Symbol * FindType(struct Context * ctx, const char * name);
+
+extern void FreeSymbol(struct Symbol * symbol);
+
+struct ClassDef;
+
+extern struct ClassDef * MkClassDefDeclaration(struct Declaration * decl);
+
+extern void FreeClassDef(struct ClassDef * def);
+
+struct Declarator;
+
+extern struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
+
+struct TemplateDatatype
{
-struct InitDeclarator * prev;
-struct InitDeclarator * next;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct Declarator * decl;
+} ecere_gcc_struct;
+
+extern struct Declarator * SpecDeclFromString(const char * string, struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * baseDecl);
+
+extern struct Declarator * MkDeclaratorPointer(struct Pointer * pointer, struct Declarator * declarator);
+
+extern struct Declarator * MkDeclaratorIdentifier(struct Identifier * id);
+
+extern struct Declarator * MkStructDeclarator(struct Declarator * declarator, struct Expression * exp);
+
+extern struct Declarator * MkDeclaratorArray(struct Declarator * declarator, struct Expression * exp);
+
+struct Declarator
+{
+struct Declarator * prev;
+struct Declarator * next;
struct Location loc;
+int type;
+struct Symbol * symbol;
struct Declarator * declarator;
-struct Initializer * initializer;
-} __attribute__ ((gcc_struct));
+union
+{
+struct Identifier * identifier;
+struct
+{
+struct Expression * exp;
+struct Expression * posExp;
+struct Attrib * attrib;
+} ecere_gcc_struct structDecl;
+struct
+{
+struct Expression * exp;
+struct Specifier * enumClass;
+} ecere_gcc_struct array;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * parameters;
+} ecere_gcc_struct function;
+struct
+{
+struct Pointer * pointer;
+} ecere_gcc_struct pointer;
+struct
+{
+struct ExtDecl * extended;
+} ecere_gcc_struct extended;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_AsmField;
+extern struct Identifier * GetDeclId(struct Declarator * decl);
-struct AsmField
+extern struct Declarator * MkDeclaratorBrackets(struct Declarator * declarator);
+
+extern struct Declarator * PlugDeclarator(struct Declarator * decl, struct Declarator * baseDecl);
+
+extern struct Declarator * MkDeclaratorFunction(struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * parameters);
+
+extern void FreeDeclarator(struct Declarator * decl);
+
+extern struct Declarator * GetFuncDecl(struct Declarator * decl);
+
+extern struct Expression * MkExpClass(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * decl);
+
+extern struct Declarator * CopyDeclarator(struct Declarator * declarator);
+
+struct FunctionDefinition
{
-struct AsmField * prev;
-struct AsmField * next;
+struct FunctionDefinition * prev;
+struct FunctionDefinition * next;
struct Location loc;
-char * command;
-struct Expression * expression;
-struct Identifier * symbolic;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attribute;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct Declarator * declarator;
+struct __ecereNameSpace__ecere__sys__OldList * declarations;
+struct Statement * body;
+struct __ecereNameSpace__ecere__com__Class * _class;
+struct __ecereNameSpace__ecere__sys__OldList attached;
+int declMode;
+struct Type * type;
+struct Symbol * propSet;
+int tempCount;
+unsigned int propertyNoThis;
+} ecere_gcc_struct;
-struct Attribute;
+extern struct Declarator * QMkPtrDecl(const char * id);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassFunction;
+struct ClassFunction;
struct ClassFunction
{
unsigned int dontMangle;
int id;
int idCode;
-} __attribute__ ((gcc_struct));
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MembersInit;
+extern struct External * ProcessClassFunction(struct __ecereNameSpace__ecere__com__Class * owningClass, struct ClassFunction * func, struct __ecereNameSpace__ecere__sys__OldList * defs, struct External * after, unsigned int makeStatic);
-struct MembersInit
-{
-struct MembersInit * prev;
-struct MembersInit * next;
-struct Location loc;
-int type;
-union
-{
-struct __ecereNameSpace__ecere__sys__OldList * dataMembers;
-struct ClassFunction * function;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+extern void FreeClassFunction(struct ClassFunction * func);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MemberInit;
+extern struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList);
-struct MemberInit
-{
-struct MemberInit * prev;
-struct MemberInit * next;
-struct Location loc;
-struct Location realLoc;
-struct __ecereNameSpace__ecere__sys__OldList * identifiers;
-struct Initializer * initializer;
-unsigned int used;
-unsigned int variable;
-unsigned int takeOutExp;
-} __attribute__ ((gcc_struct));
+extern void ProcessClassFunctionBody(struct ClassFunction * func, struct Statement * body);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyDef;
+struct TypeName;
-struct PropertyDef
+extern struct Expression * MkExpCast(struct TypeName * typeName, struct Expression * expression);
+
+extern struct TypeName * MkTypeName(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator);
+
+struct TypeName
{
-struct PropertyDef * prev;
-struct PropertyDef * next;
+struct TypeName * prev;
+struct TypeName * next;
struct Location loc;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct __ecereNameSpace__ecere__sys__OldList * qualifiers;
struct Declarator * declarator;
-struct Identifier * id;
-struct Statement * getStmt;
-struct Statement * setStmt;
-struct Statement * issetStmt;
-struct Symbol * symbol;
-struct Expression * category;
-struct
+int classObjectType;
+struct Expression * bitCount;
+} ecere_gcc_struct;
+
+extern void FreeTypeName(struct TypeName * typeName);
+
+extern struct TypeName * QMkClass(const char * spec, struct Declarator * decl);
+
+extern struct Expression * MkExpTypeSize(struct TypeName * typeName);
+
+extern unsigned int IsVoidPtrCast(struct TypeName * typeName);
+
+extern struct TypeName * QMkType(const char * spec, struct Declarator * decl);
+
+struct __ecereNameSpace__ecere__com__BTNamedLink;
+
+struct __ecereNameSpace__ecere__com__BTNamedLink
{
-unsigned int conversion : 1;
-unsigned int isWatchable : 1;
-unsigned int isDBProp : 1;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct));
+const char * name;
+struct __ecereNameSpace__ecere__com__BTNamedLink * parent;
+struct __ecereNameSpace__ecere__com__BTNamedLink * left;
+struct __ecereNameSpace__ecere__com__BTNamedLink * right;
+int depth;
+void * data;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyWatch;
+struct __ecereNameSpace__ecere__sys__NamedLink64;
-struct PropertyWatch
+struct __ecereNameSpace__ecere__sys__NamedLink64
{
-struct PropertyWatch * prev;
-struct PropertyWatch * next;
-struct Location loc;
-struct Statement * compound;
-struct __ecereNameSpace__ecere__sys__OldList * properties;
-unsigned int deleteWatch;
-} __attribute__ ((gcc_struct));
+struct __ecereNameSpace__ecere__sys__NamedLink64 * prev;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * next;
+char * name;
+long long data;
+} ecere_gcc_struct;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDef;
+struct Instantiation;
-struct ClassDef
+struct Declaration
{
-struct ClassDef * prev;
-struct ClassDef * next;
+struct Declaration * prev;
+struct Declaration * next;
struct Location loc;
int type;
union
{
-struct Declaration * decl;
-struct ClassFunction * function;
-struct __ecereNameSpace__ecere__sys__OldList * defProperties;
-struct PropertyDef * propertyDef;
-struct PropertyWatch * propertyWatch;
-char * designer;
-struct Identifier * defaultProperty;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct __ecereNameSpace__ecere__sys__OldList * declarators;
+} ecere_gcc_struct __anon1;
+struct Instantiation * inst;
struct
{
struct Identifier * id;
-struct Initializer * initializer;
-} __attribute__ ((gcc_struct)) __anon1;
-} __attribute__ ((gcc_struct)) __anon1;
-int memberAccess;
-void * object;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableEntry;
-
-struct DBTableEntry;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBIndexItem;
-
-struct DBIndexItem;
-
-extern YYSTYPE yylval;
-
-extern struct Location yylloc;
-
-extern struct __ecereNameSpace__ecere__sys__OldList * ast;
-
-extern int returnCode;
-
-extern struct Expression * parsedExpression;
-
-extern unsigned int yydebug;
+struct Expression * exp;
+} ecere_gcc_struct __anon2;
+} ecere_gcc_struct __anon1;
+struct Specifier * extStorage;
+struct Symbol * symbol;
+int declMode;
+} ecere_gcc_struct;
-void SetYydebug(unsigned int b)
+struct Instantiation
{
-yydebug = b;
-}
-
-extern unsigned int echoOn;
-
-void resetScanner();
-
-int propWatcherID;
-
-int expression_yyparse();
+struct Instantiation * prev;
+struct Instantiation * next;
+struct Location loc;
+struct Specifier * _class;
+struct Expression * exp;
+struct __ecereNameSpace__ecere__sys__OldList * members;
+struct Symbol * symbol;
+unsigned int fullSet;
+unsigned int isConstant;
+unsigned char * data;
+struct Location nameLoc;
+struct Location insideLoc;
+unsigned int built;
+} ecere_gcc_struct;
-static struct Statement * curCompound;
+extern void FreeInstance(struct Instantiation * inst);
-struct External * curExternal, * afterExternal;
+extern struct Declaration * MkDeclarationInst(struct Instantiation * inst);
-static struct Type * curSwitchType;
+extern struct Instantiation * MkInstantiationNamed(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members);
-static struct __ecereNameSpace__ecere__com__Class * currentClass;
+struct InitDeclarator;
-struct __ecereNameSpace__ecere__com__Class * thisClass;
+extern void FreeInitDeclarator(struct InitDeclarator * decl);
-void SetThisClass(struct __ecereNameSpace__ecere__com__Class * c)
-{
-thisClass = c;
-}
+struct PropertyWatch;
-struct __ecereNameSpace__ecere__com__Class * GetThisClass()
+struct PropertyWatch
{
-return thisClass;
-}
-
-static char * thisNameSpace;
-
-struct __ecereNameSpace__ecere__com__Class * containerClass;
-
-unsigned int thisClassParams = 0x1;
-
-unsigned int internalValueCounter;
-
-extern unsigned int outputLineNumbers;
-
-extern void OutputExpression(struct Expression * exp, struct __ecereNameSpace__ecere__com__Instance * f);
-
-extern size_t strlen(const char * );
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__TempFile;
+struct PropertyWatch * prev;
+struct PropertyWatch * next;
+struct Location loc;
+struct Statement * compound;
+struct __ecereNameSpace__ecere__sys__OldList * properties;
+unsigned int deleteWatch;
+} ecere_gcc_struct;
-extern void * __ecereNameSpace__ecere__com__eInstance_New(struct __ecereNameSpace__ecere__com__Class * _class);
+extern void FreePropertyWatch(struct PropertyWatch * watcher);
-int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek;
+struct PropertyImport;
-int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Read;
+struct PropertyImport
+{
+struct PropertyImport * prev;
+struct PropertyImport * next;
+char * name;
+unsigned int isVirtual;
+unsigned int hasSet;
+unsigned int hasGet;
+} ecere_gcc_struct;
-extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpace__ecere__com__Instance * instance);
+struct MethodImport;
-void PrintExpression(struct Expression * exp, char * string)
-{
+struct MethodImport
{
-struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
-int count;
-unsigned int backOutputLineNumbers = outputLineNumbers;
+struct MethodImport * prev;
+struct MethodImport * next;
+char * name;
+unsigned int isVirtual;
+} ecere_gcc_struct;
-outputLineNumbers = 0x0;
-if(exp)
-OutputExpression(exp, f);
-((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f;
+struct FunctionImport;
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__TempFile->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(f, 0, 0);
-count = strlen(string);
-count += ((int (*)(struct __ecereNameSpace__ecere__com__Instance *, void * buffer, unsigned int size, unsigned int count))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f;
+struct FunctionImport
+{
+struct FunctionImport * prev;
+struct FunctionImport * next;
+char * name;
+} ecere_gcc_struct;
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__TempFile->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Read])(f, string + count, 1, 1023);
-string[count] = '\0';
-(__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0);
-outputLineNumbers = backOutputLineNumbers;
-}
-}
+struct ClassImport;
-extern struct Type * ProcessTypeString(const char * string, unsigned int staticMethod);
+struct ClassImport
+{
+struct ClassImport * prev;
+struct ClassImport * next;
+char * name;
+struct __ecereNameSpace__ecere__sys__OldList methods;
+struct __ecereNameSpace__ecere__sys__OldList properties;
+unsigned int itself;
+int isRemote;
+} ecere_gcc_struct;
-extern struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
+struct Initializer;
-struct Type * ProcessTemplateParameterType(struct TemplateParameter * param)
-{
-if(param && param->type == 0 && (param->__anon1.dataType || param->dataTypeString))
+struct Expression
{
-if(!param->baseType)
+struct Expression * prev;
+struct Expression * next;
+struct Location loc;
+int type;
+union
{
-if(param->dataTypeString)
-param->baseType = ProcessTypeString(param->dataTypeString, 0x0);
-else
-param->baseType = ProcessType(param->__anon1.dataType->specifiers, param->__anon1.dataType->decl);
-}
-return param->baseType;
-}
-return (((void *)0));
-}
-
-unsigned int NeedCast(struct Type * type1, struct Type * type2)
+struct
{
-if(!type1 || !type2 || type1->keepCast || type2->keepCast)
-return 0x1;
-if(type1->kind == 20 && type2->kind == 4 && type2->passAsTemplate == 0x0)
+char * constant;
+struct Identifier * identifier;
+} ecere_gcc_struct __anon1;
+struct Statement * compound;
+struct Instantiation * instance;
+struct
{
-return 0x0;
-}
-if(type1->kind == type2->kind)
+char * string;
+unsigned int intlString;
+unsigned int wideString;
+} ecere_gcc_struct __anon2;
+struct __ecereNameSpace__ecere__sys__OldList * list;
+struct
{
-switch(type1->kind)
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct Declarator * decl;
+} ecere_gcc_struct _classExp;
+struct
{
-case 24:
-case 1:
-case 2:
-case 3:
-case 4:
-case 22:
-case 23:
-if(type1->passAsTemplate && !type2->passAsTemplate)
-return 0x1;
-return type1->isSigned != type2->isSigned;
-case 8:
-return type1->__anon1._class != type2->__anon1._class;
-case 13:
-return (type1->__anon1.type && type2->__anon1.type && type1->__anon1.type->constant != type2->__anon1.type->constant) || NeedCast(type1->__anon1.type, type2->__anon1.type);
-default:
-return 0x1;
-}
-}
-return 0x1;
-}
-
-extern int strcmp(const char * , const char * );
-
-extern struct Context * curContext;
-
-extern struct Context * topContext;
-
-extern unsigned int __ecereNameSpace__ecere__com__eClass_IsDerived(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class * from);
-
-extern struct __ecereNameSpace__ecere__com__Property * __ecereNameSpace__ecere__com__eClass_FindProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, struct __ecereNameSpace__ecere__com__Instance * module);
-
-extern struct __ecereNameSpace__ecere__com__Instance * privateModule;
-
-extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_FindMethod(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, struct __ecereNameSpace__ecere__com__Instance * module);
-
-extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere__com__eClass_FindDataMember(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, struct __ecereNameSpace__ecere__com__Instance * module, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassProperty;
-
-struct __ecereNameSpace__ecere__com__ClassProperty
+struct Identifier * id;
+} ecere_gcc_struct classData;
+struct
{
-const char * name;
-struct __ecereNameSpace__ecere__com__ClassProperty * parent;
-struct __ecereNameSpace__ecere__com__ClassProperty * left;
-struct __ecereNameSpace__ecere__com__ClassProperty * right;
-int depth;
-void (* Set)(struct __ecereNameSpace__ecere__com__Class *, long long);
-long long (* Get)(struct __ecereNameSpace__ecere__com__Class *);
-const char * dataTypeString;
-struct Type * dataType;
-unsigned int constant;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__ClassProperty * __ecereNameSpace__ecere__com__eClass_FindClassProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name);
-
-extern struct Expression * QMkExpId(const char * id);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassTemplateParameter;
-
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter
+struct Expression * exp;
+struct __ecereNameSpace__ecere__sys__OldList * arguments;
+struct Location argLoc;
+} ecere_gcc_struct call;
+struct
{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * prev;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * next;
-const char * name;
-int type;
-union
+struct Expression * exp;
+struct __ecereNameSpace__ecere__sys__OldList * index;
+} ecere_gcc_struct index;
+struct
{
-const char * dataTypeString;
+struct Expression * exp;
+struct Identifier * member;
int memberType;
-} __attribute__ ((gcc_struct)) __anon1;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
-void * param;
-} __attribute__ ((gcc_struct));
-
-extern struct Expression * GetTemplateArgExpByName(const char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType);
-
-extern struct __ecereNameSpace__ecere__sys__OldList * MkList(void);
-
-extern void FreeIdentifier(struct Identifier * id);
-
-void ProcessExpressionType(struct Expression * exp);
-
-extern struct Declarator * SpecDeclFromString(const char * string, struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * baseDecl);
-
-extern struct __ecereNameSpace__ecere__sys__OldList * MkListOne(void * item);
-
-extern struct Expression * MkExpOp(struct Expression * exp1, int op, struct Expression * exp2);
-
-extern struct Expression * MkExpCast(struct TypeName * typeName, struct Expression * expression);
-
-extern struct TypeName * MkTypeName(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator);
-
-extern struct Declarator * MkDeclaratorPointer(struct Pointer * pointer, struct Declarator * declarator);
-
-extern struct Pointer * MkPointer(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Pointer * pointer);
-
-struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(struct __ecereNameSpace__ecere__sys__BinaryTree * this, const char * key);
-
-static void ReplaceClassMembers(struct Expression * exp, struct __ecereNameSpace__ecere__com__Class * _class)
-{
-if(exp->type == 0 && exp->__anon1.__anon1.identifier)
+unsigned int thisPtr;
+} ecere_gcc_struct member;
+struct
{
-struct Identifier * id = exp->__anon1.__anon1.identifier;
-struct Context * ctx;
-struct Symbol * symbol = (((void *)0));
-
-if(!id->_class || !id->_class->__anon1.__anon1.name || strcmp(id->_class->__anon1.__anon1.name, "property"))
+int op;
+struct Expression * exp1;
+struct Expression * exp2;
+} ecere_gcc_struct op;
+struct TypeName * typeName;
+struct Specifier * _class;
+struct
{
-for(ctx = curContext; ctx != topContext->parent && !symbol; ctx = ctx->parent)
+struct TypeName * typeName;
+struct Expression * exp;
+} ecere_gcc_struct cast;
+struct
{
-symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->symbols, id->string);
-if(symbol)
-break;
-}
-}
-if(!symbol && ((!id->_class || (id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property"))) || (id->classSym && __ecereNameSpace__ecere__com__eClass_IsDerived(_class, id->classSym->__anon1.registered))))
+struct Expression * cond;
+struct __ecereNameSpace__ecere__sys__OldList * exp;
+struct Expression * elseExp;
+} ecere_gcc_struct cond;
+struct
{
-struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
-struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
-struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0));
-
-if(!prop)
+struct TypeName * typeName;
+struct Expression * size;
+} ecere_gcc_struct _new;
+struct
{
-method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule);
-}
-if(!prop && !method)
-member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)));
-if(!prop && !method && !member)
+struct TypeName * typeName;
+struct Expression * size;
+struct Expression * exp;
+} ecere_gcc_struct _renew;
+struct
{
-classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(_class, id->string);
-}
-if(prop || method || member || classProp)
+char * table;
+struct Identifier * id;
+} ecere_gcc_struct db;
+struct
{
-exp->type = 8;
-exp->__anon1.member.member = id;
-exp->__anon1.member.memberType = 0;
-exp->__anon1.member.exp = QMkExpId("this");
-exp->addedThis = 0x1;
-}
-else if(_class && _class->templateParams.first)
+struct Expression * ds;
+struct Expression * name;
+} ecere_gcc_struct dbopen;
+struct
{
-struct __ecereNameSpace__ecere__com__Class * sClass;
-
-for(sClass = _class; sClass; sClass = sClass->base)
+struct TypeName * typeName;
+struct Initializer * initializer;
+} ecere_gcc_struct initializer;
+struct
{
-if(sClass->templateParams.first)
+struct Expression * exp;
+struct TypeName * typeName;
+} ecere_gcc_struct vaArg;
+struct
{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
+struct TypeName * typeName;
+struct Identifier * id;
+} ecere_gcc_struct offset;
+} ecere_gcc_struct __anon1;
+unsigned int debugValue;
+struct __ecereNameSpace__ecere__com__DataValue val;
+uint64 address;
+unsigned int hasAddress;
+struct Type * expType;
+struct Type * destType;
+unsigned int usage;
+int tempCount;
+unsigned int byReference;
+unsigned int isConstant;
+unsigned int addedThis;
+unsigned int needCast;
+unsigned int thisPtr;
+unsigned int opDestType;
+unsigned int usedInComparison;
+unsigned int ambiguousUnits;
+unsigned int parentOpDestType;
+unsigned int needTemplateCast;
+} ecere_gcc_struct;
-for(param = sClass->templateParams.first; param; param = param->next)
-{
-if(param->type == 2 && !strcmp(param->name, id->string))
-{
-struct Expression * argExp = GetTemplateArgExpByName(param->name, _class, 2);
+extern struct InitDeclarator * MkInitDeclarator(struct Declarator * declarator, struct Initializer * initializer);
-if(argExp)
+struct Initializer
{
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-
-FreeIdentifier(exp->__anon1.member.member);
-ProcessExpressionType(argExp);
-decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
-exp->expType = ProcessType(specs, decl);
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), MkExpOp((((void *)0)), '&', argExp))));
-}
-}
-}
-}
-}
-}
-}
-}
-}
+struct Initializer * prev;
+struct Initializer * next;
+struct Location loc;
+int type;
+union
+{
+struct Expression * exp;
+struct __ecereNameSpace__ecere__sys__OldList * list;
+} ecere_gcc_struct __anon1;
+unsigned int isConstant;
+struct Identifier * id;
+} ecere_gcc_struct;
-extern int sprintf(char * , const char * , ...);
+extern struct Initializer * MkInitializerAssignment(struct Expression * exp);
-extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void);
+extern struct Expression * MkExpExtensionInitializer(struct TypeName * typeName, struct Initializer * initializer);
-extern char * strcat(char * , const char * );
+extern struct Initializer * MkInitializerList(struct __ecereNameSpace__ecere__sys__OldList * list);
-extern char * __ecereNameSpace__ecere__sys__CopyString(const char * string);
+struct InitDeclarator
+{
+struct InitDeclarator * prev;
+struct InitDeclarator * next;
+struct Location loc;
+struct Declarator * declarator;
+struct Initializer * initializer;
+} ecere_gcc_struct;
-char * PrintInt(long long result)
+void ApplyLocation(struct Expression * exp, struct Location * loc)
{
-char temp[100];
+exp->loc = *loc;
+switch(exp->type)
+{
+case 4:
+if(exp->__anon1.op.exp1)
+ApplyLocation(exp->__anon1.op.exp1, loc);
+if(exp->__anon1.op.exp2)
+ApplyLocation(exp->__anon1.op.exp2, loc);
+break;
+case 5:
+if(exp->__anon1.list)
+{
+struct Expression * e;
-if(result > (((int)0x7fffffff)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
-else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result);
-if(result > (((int)0x7fffffff)) || result < (((int)0x80000000)))
-strcat(temp, "LL");
-return __ecereNameSpace__ecere__sys__CopyString(temp);
+for(e = (*exp->__anon1.list).first; e; e = e->next)
+ApplyLocation(e, loc);
}
-
-char * PrintUInt(uint64 result)
+break;
+case 6:
+if(exp->__anon1.index.index)
{
-char temp[100];
+struct Expression * e;
-if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
-else if(result > (((int)0x7fffffff)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
-else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
+for(e = (*exp->__anon1.index.index).first; e; e = e->next)
+ApplyLocation(e, loc);
}
-
-char * PrintInt64(long long result)
+if(exp->__anon1.index.exp)
+ApplyLocation(exp->__anon1.index.exp, loc);
+break;
+case 7:
+if(exp->__anon1.call.arguments)
{
-char temp[100];
+struct Expression * arg;
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64dLL" : "%lldLL"), result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
+for(arg = (*exp->__anon1.call.arguments).first; arg; arg = arg->next)
+ApplyLocation(arg, loc);
}
-
-char * PrintUInt64(uint64 result)
+if(exp->__anon1.call.exp)
+ApplyLocation(exp->__anon1.call.exp, loc);
+break;
+case 8:
+case 9:
+if(exp->__anon1.member.exp)
+ApplyLocation(exp->__anon1.member.exp, loc);
+break;
+case 11:
+if(exp->__anon1.cast.exp)
+ApplyLocation(exp->__anon1.cast.exp, loc);
+break;
+case 12:
+if(exp->__anon1.cond.exp)
{
-char temp[100];
+struct Expression * e;
-if(result > (((long long)0x7fffffffffffffffLL)))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
-else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64dLL" : "%lldLL"), result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
+for(e = (*exp->__anon1.cond.exp).first; e; e = e->next)
+ApplyLocation(e, loc);
+}
+if(exp->__anon1.cond.cond)
+ApplyLocation(exp->__anon1.cond.cond, loc);
+if(exp->__anon1.cond.elseExp)
+ApplyLocation(exp->__anon1.cond.elseExp, loc);
+break;
+case 34:
+if(exp->__anon1.vaArg.exp)
+ApplyLocation(exp->__anon1.vaArg.exp, loc);
+break;
+default:
+break;
+}
}
-char * PrintHexUInt(uint64 result)
-{
-char temp[100];
+void __ecereMethod_Expression_Clear();
-if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
-else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
-if(result > (0xffffffff))
-strcat(temp, "LL");
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
+struct MembersInit;
-char * PrintHexUInt64(uint64 result)
+struct MembersInit
{
-char temp[100];
-
-if(result > (0xffffffff))
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result);
-else
-sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
-
-char * PrintShort(short result)
-{
-char temp[100];
-
-sprintf(temp, "%d", (unsigned short)result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
-
-char * PrintUShort(unsigned short result)
-{
-char temp[100];
-
-if(result > (unsigned short)32767)
-sprintf(temp, "0x%X", (int)result);
-else
-sprintf(temp, "%d", (int)result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
-
-extern int isprint(int c);
-
-char * PrintChar(char result)
-{
-char temp[100];
-
-if(result > (char)0 && isprint(result))
-sprintf(temp, "'%c'", result);
-else if(result < (char)0)
-sprintf(temp, "%d", (int)result);
-else
-sprintf(temp, "0x%X", (unsigned char)result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
-
-char * PrintUChar(unsigned char result)
-{
-char temp[100];
-
-sprintf(temp, "0x%X", result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
-
-extern char * strcpy(char * , const char * );
-
-extern unsigned int (* __ecereProp_float_Get_isInf)(float this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_float_isInf;
-
-extern int (* __ecereProp_float_Get_signBit)(float this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_float_signBit;
-
-extern unsigned int (* __ecereProp_float_Get_isNan)(float this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_float_isNan;
-
-char * PrintFloat(float result)
-{
-char temp[350];
-
-if(__ecereProp_float_Get_isInf(result))
-{
-if(__ecereProp_float_Get_signBit(result))
-strcpy(temp, "-inf");
-else
-strcpy(temp, "inf");
-}
-else if(__ecereProp_float_Get_isNan(result))
-{
-if(__ecereProp_float_Get_signBit(result))
-strcpy(temp, "-nan");
-else
-strcpy(temp, "nan");
-}
-else
-sprintf(temp, "%.16ff", result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
-
-extern unsigned int (* __ecereProp_double_Get_isInf)(double this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_double_isInf;
-
-extern int (* __ecereProp_double_Get_signBit)(double this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_double_signBit;
-
-extern unsigned int (* __ecereProp_double_Get_isNan)(double this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_double_isNan;
-
-char * PrintDouble(double result)
+struct MembersInit * prev;
+struct MembersInit * next;
+struct Location loc;
+int type;
+union
{
-char temp[350];
+struct __ecereNameSpace__ecere__sys__OldList * dataMembers;
+struct ClassFunction * function;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
-if(__ecereProp_double_Get_isInf(result))
-{
-if(__ecereProp_double_Get_signBit(result))
-strcpy(temp, "-inf");
-else
-strcpy(temp, "inf");
-}
-else if(__ecereProp_double_Get_isNan(result))
-{
-if(__ecereProp_double_Get_signBit(result))
-strcpy(temp, "-nan");
-else
-strcpy(temp, "nan");
-}
-else
-sprintf(temp, "%.16f", result);
-return __ecereNameSpace__ecere__sys__CopyString(temp);
-}
+extern struct MembersInit * MkMembersInitList(struct __ecereNameSpace__ecere__sys__OldList * dataMembers);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_OpTable;
+struct Operand;
struct OpTable
{
unsigned int (* GrtEqu)(struct Expression *, struct Operand *, struct Operand *);
unsigned int (* SmaEqu)(struct Expression *, struct Operand *, struct Operand *);
unsigned int (* Cond)(struct Expression *, struct Operand *, struct Operand *, struct Operand *);
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Operand;
+} ecere_gcc_struct;
struct Operand
{
double d;
long long i64;
uint64 ui64;
-} __attribute__ ((gcc_struct)) __anon1;
+} ecere_gcc_struct __anon1;
struct OpTable ops;
-} __attribute__ ((gcc_struct));
+} ecere_gcc_struct;
-unsigned int GetOpInt(struct Operand * op2, int * value2)
+struct External * _DeclareStruct(struct External * neededBy, const char * name, unsigned int skipNoHead, unsigned int needDereference, unsigned int fwdDecl);
+
+struct External * DeclareStruct(struct External * neededBy, const char * name, unsigned int skipNoHead, unsigned int needDereference)
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (int)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (int)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (int)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (int)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (int)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (int)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (int)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (int)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (int)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (int)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (int)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (int)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (int)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (int)op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
+return _DeclareStruct(neededBy, name, skipNoHead, needDereference, 0);
}
-struct Operand GetOperand(struct Expression * exp);
+static void _DeclareType(struct External * neededFor, struct Type * type, unsigned int needDereference, unsigned int forFunctionDef, unsigned int fwdDecl);
-unsigned int GetInt(struct Expression * exp, int * value2)
+void DeclareType(struct External * neededFor, struct Type * type, unsigned int needDereference, unsigned int forFunctionDef)
{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpInt(&op2, value2);
+_DeclareType(neededFor, type, needDereference, forFunctionDef, 0);
}
-unsigned int GetOpUInt(struct Operand * op2, unsigned int * value2)
+void DeclareTypeForwardDeclare(struct External * neededFor, struct Type * type, unsigned int needDereference, unsigned int forFunctionDef)
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (unsigned int)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (unsigned int)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (unsigned int)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (unsigned int)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (unsigned int)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (unsigned int)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (unsigned int)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (unsigned int)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (unsigned int)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (unsigned int)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (unsigned int)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (unsigned int)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (unsigned int)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (unsigned int)op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
+_DeclareType(neededFor, type, needDereference, forFunctionDef, 1);
}
-unsigned int GetUInt(struct Expression * exp, unsigned int * value2)
-{
-struct Operand op2 = GetOperand(exp);
+static void _PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName, unsigned int printConst);
-return GetOpUInt(&op2, value2);
+void PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName)
+{
+_PrintType(type, string, printName, fullName, 1);
}
-unsigned int GetOpInt64(struct Operand * op2, long long * value2)
+void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName)
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (long long)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (long long)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (long long)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (long long)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (long long)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (long long)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (long long)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (long long)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (long long)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (long long)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (long long)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (long long)op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
+_PrintType(type, string, printName, fullName, 0);
}
-unsigned int GetInt64(struct Expression * exp, long long * value2)
-{
-struct Operand op2 = GetOperand(exp);
+struct __ecereNameSpace__ecere__com__Method;
-return GetOpInt64(&op2, value2);
-}
+struct __ecereNameSpace__ecere__com__Method
+{
+const char * name;
+struct __ecereNameSpace__ecere__com__Method * parent;
+struct __ecereNameSpace__ecere__com__Method * left;
+struct __ecereNameSpace__ecere__com__Method * right;
+int depth;
+int (* function)();
+int vid;
+int type;
+struct __ecereNameSpace__ecere__com__Class * _class;
+void * symbol;
+const char * dataTypeString;
+struct Type * dataType;
+int memberAccess;
+} ecere_gcc_struct;
-unsigned int GetOpUInt64(struct Operand * op2, uint64 * value2)
+struct Symbol
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (uint64)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (uint64)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (uint64)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (uint64)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (uint64)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (uint64)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (uint64)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (uint64)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (uint64)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (uint64)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (uint64)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
-}
-
-unsigned int GetUInt64(struct Expression * exp, uint64 * value2)
+char * string;
+struct Symbol * parent;
+struct Symbol * left;
+struct Symbol * right;
+int depth;
+struct Type * type;
+union
{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpUInt64(&op2, value2);
-}
-
-unsigned int GetOpIntPtr(struct Operand * op2, intptr_t * value2)
+struct __ecereNameSpace__ecere__com__Method * method;
+struct __ecereNameSpace__ecere__com__Property * _property;
+struct __ecereNameSpace__ecere__com__Class * registered;
+} ecere_gcc_struct __anon1;
+unsigned int notYetDeclared;
+union
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (intptr_t)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (intptr_t)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (intptr_t)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (intptr_t)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (intptr_t)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (intptr_t)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (intptr_t)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (intptr_t)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (intptr_t)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (intptr_t)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (intptr_t)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (intptr_t)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (intptr_t)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (intptr_t)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (intptr_t)op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
-}
-
-unsigned int GetIntPtr(struct Expression * exp, intptr_t * value2)
+struct
{
-struct Operand op2 = GetOperand(exp);
+struct External * pointerExternal;
+struct External * structExternal;
+} ecere_gcc_struct __anon1;
+struct
+{
+struct External * externalGet;
+struct External * externalSet;
+struct External * externalPtr;
+struct External * externalIsSet;
+} ecere_gcc_struct __anon2;
+struct
+{
+struct External * methodExternal;
+struct External * methodCodeExternal;
+} ecere_gcc_struct __anon3;
+} ecere_gcc_struct __anon2;
+unsigned int imported;
+unsigned int declaredStructSym;
+struct __ecereNameSpace__ecere__com__Class * _class;
+unsigned int declaredStruct;
+unsigned int needConstructor;
+unsigned int needDestructor;
+char * constructorName;
+char * structName;
+char * className;
+char * destructorName;
+struct ModuleImport * module;
+struct ClassImport * _import;
+struct Location nameLoc;
+unsigned int isParam;
+unsigned int isRemote;
+unsigned int isStruct;
+unsigned int fireWatchersDone;
+int declaring;
+unsigned int classData;
+unsigned int isStatic;
+char * shortName;
+struct __ecereNameSpace__ecere__sys__OldList * templateParams;
+struct __ecereNameSpace__ecere__sys__OldList templatedClasses;
+struct Context * ctx;
+int isIterator;
+struct Expression * propCategory;
+unsigned int mustRegister;
+} ecere_gcc_struct;
-return GetOpIntPtr(&op2, value2);
-}
+struct __ecereNameSpace__ecere__com__ClassProperty;
-unsigned int GetOpUIntPtr(struct Operand * op2, uintptr_t * value2)
-{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (uintptr_t)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (uintptr_t)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (uintptr_t)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (uintptr_t)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (uintptr_t)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (uintptr_t)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (uintptr_t)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (uintptr_t)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (uintptr_t)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (uintptr_t)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (uintptr_t)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (uintptr_t)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (uintptr_t)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (uintptr_t)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (uintptr_t)op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__ClassProperty * __ecereNameSpace__ecere__com__eClass_FindClassProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name);
-unsigned int GetUIntPtr(struct Expression * exp, uintptr_t * value2)
+struct __ecereNameSpace__ecere__com__ClassProperty
{
-struct Operand op2 = GetOperand(exp);
+const char * name;
+struct __ecereNameSpace__ecere__com__ClassProperty * parent;
+struct __ecereNameSpace__ecere__com__ClassProperty * left;
+struct __ecereNameSpace__ecere__com__ClassProperty * right;
+int depth;
+void (* Set)(struct __ecereNameSpace__ecere__com__Class *, long long);
+long long (* Get)(struct __ecereNameSpace__ecere__com__Class *);
+const char * dataTypeString;
+struct Type * dataType;
+unsigned int constant;
+} ecere_gcc_struct;
-return GetOpUIntPtr(&op2, value2);
-}
+struct __ecereNameSpace__ecere__com__BitMember;
-unsigned int GetOpIntSize(struct Operand * op2, ssize_t * value2)
+struct __ecereNameSpace__ecere__com__BitMember
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (ssize_t)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (ssize_t)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (ssize_t)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (ssize_t)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (ssize_t)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (ssize_t)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (ssize_t)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (ssize_t)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (ssize_t)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (ssize_t)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (ssize_t)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (ssize_t)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (ssize_t)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (ssize_t)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (ssize_t)op2->__anon1.ui64;
-else
-return 0x0;
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__BitMember * prev;
+struct __ecereNameSpace__ecere__com__BitMember * next;
+const char * name;
+unsigned int isProperty;
+int memberAccess;
+int id;
+struct __ecereNameSpace__ecere__com__Class * _class;
+const char * dataTypeString;
+struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
+struct Type * dataType;
+int type;
+int size;
+int pos;
+uint64 mask;
+} ecere_gcc_struct;
-unsigned int GetIntSize(struct Expression * exp, ssize_t * value2)
+struct __ecereNameSpace__ecere__com__DataMember;
+
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument
{
-struct Operand op2 = GetOperand(exp);
+union
+{
+struct
+{
+const char * dataTypeString;
+struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
+} ecere_gcc_struct __anon1;
+struct __ecereNameSpace__ecere__com__DataValue expression;
+struct
+{
+const char * memberString;
+union
+{
+struct __ecereNameSpace__ecere__com__DataMember * member;
+struct __ecereNameSpace__ecere__com__Property * prop;
+struct __ecereNameSpace__ecere__com__Method * method;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct __anon2;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
-return GetOpIntSize(&op2, value2);
-}
+extern void __ecereNameSpace__ecere__com__eClass_FindNextMember(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos);
-unsigned int GetOpUIntSize(struct Operand * op2, size_t * value2)
+extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere__com__eClass_AddDataMember(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, unsigned int size, unsigned int alignment, int declMode);
+
+struct TemplateParameter;
+
+struct TemplateParameter
{
-if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (size_t)op2->__anon1.i;
-else if(op2->kind == 3)
-*value2 = (size_t)op2->__anon1.ui;
-else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (size_t)op2->__anon1.i64;
-else if(op2->kind == 4)
-*value2 = (size_t)op2->__anon1.ui64;
-else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (size_t)op2->__anon1.i64;
-else if(op2->kind == 23)
-*value2 = (size_t)op2->__anon1.ui64;
-else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (size_t)op2->__anon1.i64;
-else if(op2->kind == 22)
-*value2 = (size_t)op2->__anon1.ui64;
-else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (size_t)op2->__anon1.s;
-else if(op2->kind == 2)
-*value2 = (size_t)op2->__anon1.us;
-else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (size_t)op2->__anon1.c;
-else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (size_t)op2->__anon1.uc;
-else if(op2->kind == 6)
-*value2 = (size_t)op2->__anon1.f;
-else if(op2->kind == 7)
-*value2 = (size_t)op2->__anon1.d;
-else if(op2->kind == 13)
-*value2 = (size_t)op2->__anon1.ui64;
+struct TemplateParameter * prev;
+struct TemplateParameter * next;
+struct Location loc;
+int type;
+struct Identifier * identifier;
+union
+{
+struct TemplateDatatype * dataType;
+int memberType;
+} ecere_gcc_struct __anon1;
+struct TemplateArgument * defaultArgument;
+const char * dataTypeString;
+struct Type * baseType;
+} ecere_gcc_struct;
+
+struct Type
+{
+struct Type * prev;
+struct Type * next;
+int refCount;
+union
+{
+struct Symbol * _class;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList members;
+char * enumName;
+} ecere_gcc_struct __anon1;
+struct
+{
+struct Type * returnType;
+struct __ecereNameSpace__ecere__sys__OldList params;
+struct Symbol * thisClass;
+unsigned int staticMethod;
+struct TemplateParameter * thisClassTemplate;
+} ecere_gcc_struct __anon2;
+struct
+{
+struct __ecereNameSpace__ecere__com__Method * method;
+struct __ecereNameSpace__ecere__com__Class * methodClass;
+struct __ecereNameSpace__ecere__com__Class * usedClass;
+} ecere_gcc_struct __anon3;
+struct
+{
+struct Type * arrayType;
+int arraySize;
+struct Expression * arraySizeExp;
+unsigned int freeExp;
+struct Symbol * enumClass;
+} ecere_gcc_struct __anon4;
+struct Type * type;
+struct TemplateParameter * templateParameter;
+} ecere_gcc_struct __anon1;
+int kind;
+unsigned int size;
+char * name;
+char * typeName;
+struct __ecereNameSpace__ecere__com__Class * thisClassFrom;
+int promotedFrom;
+int classObjectType;
+int alignment;
+unsigned int offset;
+int bitFieldCount;
+int count;
+int bitMemberSize;
+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;
+unsigned int casted : 1;
+unsigned int pointerAlignment : 1;
+unsigned int isLong : 1;
+unsigned int signedBeforePromotion : 1;
+} ecere_gcc_struct;
+
+struct Specifier
+{
+struct Specifier * prev;
+struct Specifier * next;
+struct Location loc;
+int type;
+union
+{
+int specifier;
+struct
+{
+struct ExtDecl * extDecl;
+char * name;
+struct Symbol * symbol;
+struct __ecereNameSpace__ecere__sys__OldList * templateArgs;
+struct Specifier * nsSpec;
+} ecere_gcc_struct __anon1;
+struct
+{
+struct Identifier * id;
+struct __ecereNameSpace__ecere__sys__OldList * list;
+struct __ecereNameSpace__ecere__sys__OldList * baseSpecs;
+struct __ecereNameSpace__ecere__sys__OldList * definitions;
+unsigned int addNameSpace;
+struct Context * ctx;
+struct ExtDecl * extDeclStruct;
+} ecere_gcc_struct __anon2;
+struct Expression * expression;
+struct Specifier * _class;
+struct TemplateParameter * templateParameter;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
+
+extern struct Expression * GetTemplateArgExp(struct TemplateParameter * param, struct __ecereNameSpace__ecere__com__Class * curClass, unsigned int pointer);
+
+struct TemplatedType
+{
+uintptr_t key;
+struct __ecereNameSpace__ecere__sys__BTNode * parent;
+struct __ecereNameSpace__ecere__sys__BTNode * left;
+struct __ecereNameSpace__ecere__sys__BTNode * right;
+int depth;
+struct TemplateParameter * param;
+} ecere_gcc_struct;
+
+struct Type * ProcessTemplateParameterType(struct TemplateParameter * param)
+{
+if(param && param->type == 0 && (param->__anon1.dataType || param->dataTypeString))
+{
+if(!param->baseType)
+{
+if(param->dataTypeString)
+param->baseType = ProcessTypeString(param->dataTypeString, 0);
else
-return 0x0;
-return 0x1;
+param->baseType = ProcessType(param->__anon1.dataType->specifiers, param->__anon1.dataType->decl);
+}
+return param->baseType;
+}
+return (((void *)0));
}
-unsigned int GetUIntSize(struct Expression * exp, size_t * value2)
+unsigned int NeedCast(struct Type * type1, struct Type * type2)
{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpUIntSize(&op2, value2);
+if(!type1 || !type2 || type1->keepCast || type2->keepCast)
+return 1;
+if(type1->kind == 20 && type2->kind == 4 && type2->passAsTemplate == 0)
+{
+return 0;
+}
+if(type1->kind == type2->kind && type1->isLong == type2->isLong)
+{
+switch(type1->kind)
+{
+case 24:
+case 1:
+case 2:
+case 3:
+case 4:
+case 22:
+case 23:
+if(type1->passAsTemplate && !type2->passAsTemplate)
+return 1;
+return type1->isSigned != type2->isSigned;
+case 8:
+return type1->__anon1._class != type2->__anon1._class;
+case 13:
+return (type1->__anon1.type && type2->__anon1.type && type1->__anon1.type->constant != type2->__anon1.type->constant) || NeedCast(type1->__anon1.type, type2->__anon1.type);
+default:
+return 1;
+}
+}
+return 1;
}
-unsigned int GetOpShort(struct Operand * op2, short * value2)
+unsigned int GetOpInt(struct Operand * op2, int * value2)
{
if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (short)op2->__anon1.i;
+*value2 = op2->__anon1.i;
else if(op2->kind == 3)
-*value2 = (short)op2->__anon1.ui;
+*value2 = (int)op2->__anon1.ui;
else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (short)op2->__anon1.i64;
+*value2 = (int)op2->__anon1.i64;
else if(op2->kind == 4)
-*value2 = (short)op2->__anon1.ui64;
+*value2 = (int)op2->__anon1.ui64;
else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (short)op2->__anon1.i64;
+*value2 = (int)op2->__anon1.i64;
else if(op2->kind == 23)
-*value2 = (short)op2->__anon1.ui64;
+*value2 = (int)op2->__anon1.ui64;
else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (short)op2->__anon1.i64;
+*value2 = (int)op2->__anon1.i64;
else if(op2->kind == 22)
-*value2 = (short)op2->__anon1.ui64;
+*value2 = (int)op2->__anon1.ui64;
else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = op2->__anon1.s;
+*value2 = (int)op2->__anon1.s;
else if(op2->kind == 2)
-*value2 = (short)op2->__anon1.us;
+*value2 = (int)op2->__anon1.us;
else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (short)op2->__anon1.c;
+*value2 = (int)op2->__anon1.c;
else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (short)op2->__anon1.uc;
+*value2 = (int)op2->__anon1.uc;
else if(op2->kind == 6)
-*value2 = (short)op2->__anon1.f;
+*value2 = (int)op2->__anon1.f;
else if(op2->kind == 7)
-*value2 = (short)op2->__anon1.d;
+*value2 = (int)op2->__anon1.d;
else if(op2->kind == 13)
-*value2 = (short)op2->__anon1.ui64;
+*value2 = (int)op2->__anon1.ui64;
else
-return 0x0;
-return 0x1;
-}
-
-unsigned int GetShort(struct Expression * exp, short * value2)
-{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpShort(&op2, value2);
+return 0;
+return 1;
}
-unsigned int GetOpUShort(struct Operand * op2, unsigned short * value2)
+unsigned int GetOpUInt(struct Operand * op2, unsigned int * value2)
{
if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (unsigned short)op2->__anon1.i;
+*value2 = (unsigned int)op2->__anon1.i;
else if(op2->kind == 3)
-*value2 = (unsigned short)op2->__anon1.ui;
+*value2 = op2->__anon1.ui;
else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (unsigned short)op2->__anon1.i64;
+*value2 = (unsigned int)op2->__anon1.i64;
else if(op2->kind == 4)
-*value2 = (unsigned short)op2->__anon1.ui64;
+*value2 = (unsigned int)op2->__anon1.ui64;
else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (unsigned short)op2->__anon1.i64;
+*value2 = (unsigned int)op2->__anon1.i64;
else if(op2->kind == 23)
-*value2 = (unsigned short)op2->__anon1.ui64;
+*value2 = (unsigned int)op2->__anon1.ui64;
else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (unsigned short)op2->__anon1.i64;
+*value2 = (unsigned int)op2->__anon1.i64;
else if(op2->kind == 22)
-*value2 = (unsigned short)op2->__anon1.ui64;
+*value2 = (unsigned int)op2->__anon1.ui64;
else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (unsigned short)op2->__anon1.s;
+*value2 = (unsigned int)op2->__anon1.s;
else if(op2->kind == 2)
-*value2 = op2->__anon1.us;
+*value2 = (unsigned int)op2->__anon1.us;
else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (unsigned short)op2->__anon1.c;
+*value2 = (unsigned int)op2->__anon1.c;
else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (unsigned short)op2->__anon1.uc;
+*value2 = (unsigned int)op2->__anon1.uc;
else if(op2->kind == 6)
-*value2 = (unsigned short)op2->__anon1.f;
+*value2 = (unsigned int)op2->__anon1.f;
else if(op2->kind == 7)
-*value2 = (unsigned short)op2->__anon1.d;
+*value2 = (unsigned int)op2->__anon1.d;
else if(op2->kind == 13)
-*value2 = (unsigned short)op2->__anon1.ui64;
+*value2 = (unsigned int)op2->__anon1.ui64;
else
-return 0x0;
-return 0x1;
-}
-
-unsigned int GetUShort(struct Expression * exp, unsigned short * value2)
-{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpUShort(&op2, value2);
+return 0;
+return 1;
}
-unsigned int GetOpChar(struct Operand * op2, char * value2)
+unsigned int GetOpInt64(struct Operand * op2, long long * value2)
{
if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (char)op2->__anon1.i;
+*value2 = (long long)op2->__anon1.i;
else if(op2->kind == 3)
-*value2 = (char)op2->__anon1.ui;
+*value2 = (long long)op2->__anon1.ui;
else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (char)op2->__anon1.i64;
+*value2 = op2->__anon1.i64;
else if(op2->kind == 4)
-*value2 = (char)op2->__anon1.ui64;
+*value2 = (long long)op2->__anon1.ui64;
else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (char)op2->__anon1.i64;
+*value2 = op2->__anon1.i64;
else if(op2->kind == 23)
-*value2 = (char)op2->__anon1.ui64;
+*value2 = (long long)op2->__anon1.ui64;
else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (char)op2->__anon1.i64;
+*value2 = op2->__anon1.i64;
else if(op2->kind == 22)
-*value2 = (char)op2->__anon1.ui64;
+*value2 = (long long)op2->__anon1.ui64;
else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (char)op2->__anon1.s;
+*value2 = (long long)op2->__anon1.s;
else if(op2->kind == 2)
-*value2 = (char)op2->__anon1.us;
+*value2 = (long long)op2->__anon1.us;
else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = op2->__anon1.c;
+*value2 = (long long)op2->__anon1.c;
else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (char)op2->__anon1.uc;
+*value2 = (long long)op2->__anon1.uc;
else if(op2->kind == 6)
-*value2 = (char)op2->__anon1.f;
+*value2 = (long long)op2->__anon1.f;
else if(op2->kind == 7)
-*value2 = (char)op2->__anon1.d;
+*value2 = (long long)op2->__anon1.d;
else if(op2->kind == 13)
-*value2 = (char)op2->__anon1.ui64;
+*value2 = (long long)op2->__anon1.ui64;
else
-return 0x0;
-return 0x1;
-}
-
-unsigned int GetChar(struct Expression * exp, char * value2)
-{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpChar(&op2, value2);
+return 0;
+return 1;
}
-unsigned int GetOpUChar(struct Operand * op2, unsigned char * value2)
+unsigned int GetOpUInt64(struct Operand * op2, uint64 * value2)
{
if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (unsigned char)op2->__anon1.i;
+*value2 = (uint64)op2->__anon1.i;
else if(op2->kind == 3)
-*value2 = (unsigned char)op2->__anon1.ui;
+*value2 = (uint64)op2->__anon1.ui;
else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (unsigned char)op2->__anon1.i64;
+*value2 = (uint64)op2->__anon1.i64;
else if(op2->kind == 4)
-*value2 = (unsigned char)op2->__anon1.ui64;
+*value2 = op2->__anon1.ui64;
else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (unsigned char)op2->__anon1.i64;
+*value2 = (uint64)op2->__anon1.i64;
else if(op2->kind == 23)
-*value2 = (unsigned char)op2->__anon1.ui64;
+*value2 = op2->__anon1.ui64;
else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (unsigned char)op2->__anon1.i64;
+*value2 = (uint64)op2->__anon1.i64;
else if(op2->kind == 22)
-*value2 = (unsigned char)op2->__anon1.ui64;
+*value2 = op2->__anon1.ui64;
else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (unsigned char)op2->__anon1.s;
+*value2 = (uint64)op2->__anon1.s;
else if(op2->kind == 2)
-*value2 = (unsigned char)op2->__anon1.us;
+*value2 = (uint64)op2->__anon1.us;
else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (unsigned char)op2->__anon1.c;
+*value2 = (uint64)op2->__anon1.c;
else if(op2->kind == 24 || op2->kind == 1)
-*value2 = op2->__anon1.uc;
+*value2 = (uint64)op2->__anon1.uc;
else if(op2->kind == 6)
-*value2 = (unsigned char)op2->__anon1.f;
+*value2 = (uint64)op2->__anon1.f;
else if(op2->kind == 7)
-*value2 = (unsigned char)op2->__anon1.d;
+*value2 = (uint64)op2->__anon1.d;
else if(op2->kind == 13)
-*value2 = (unsigned char)op2->__anon1.ui64;
+*value2 = op2->__anon1.ui64;
else
-return 0x0;
-return 0x1;
+return 0;
+return 1;
}
-unsigned int GetUChar(struct Expression * exp, unsigned char * value2)
+unsigned int GetOpIntPtr(struct Operand * op2, intptr_t * value2)
{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpUChar(&op2, value2);
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (intptr_t)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (intptr_t)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (intptr_t)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (intptr_t)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (intptr_t)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (intptr_t)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (intptr_t)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (intptr_t)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (intptr_t)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (intptr_t)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (intptr_t)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (intptr_t)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (intptr_t)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (intptr_t)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (intptr_t)op2->__anon1.ui64;
+else
+return 0;
+return 1;
}
-unsigned int GetOpFloat(struct Operand * op2, float * value2)
+unsigned int GetOpUIntPtr(struct Operand * op2, uintptr_t * value2)
{
if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (float)(float)op2->__anon1.i;
+*value2 = (uintptr_t)op2->__anon1.i;
else if(op2->kind == 3)
-*value2 = (float)(float)op2->__anon1.ui;
+*value2 = (uintptr_t)op2->__anon1.ui;
else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (float)(float)op2->__anon1.i64;
+*value2 = (uintptr_t)op2->__anon1.i64;
else if(op2->kind == 4)
-*value2 = (float)(float)op2->__anon1.ui64;
+*value2 = (uintptr_t)op2->__anon1.ui64;
else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (float)(float)op2->__anon1.i64;
+*value2 = (uintptr_t)op2->__anon1.i64;
else if(op2->kind == 23)
-*value2 = (float)(float)op2->__anon1.ui64;
+*value2 = (uintptr_t)op2->__anon1.ui64;
else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (float)(float)op2->__anon1.i64;
+*value2 = (uintptr_t)op2->__anon1.i64;
else if(op2->kind == 22)
-*value2 = (float)(float)op2->__anon1.ui64;
+*value2 = (uintptr_t)op2->__anon1.ui64;
else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (float)(float)op2->__anon1.s;
+*value2 = (uintptr_t)op2->__anon1.s;
else if(op2->kind == 2)
-*value2 = (float)(float)op2->__anon1.us;
+*value2 = (uintptr_t)op2->__anon1.us;
else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (float)(float)op2->__anon1.c;
+*value2 = (uintptr_t)op2->__anon1.c;
else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (float)(float)op2->__anon1.uc;
+*value2 = (uintptr_t)op2->__anon1.uc;
else if(op2->kind == 6)
-*value2 = (float)op2->__anon1.f;
+*value2 = (uintptr_t)op2->__anon1.f;
else if(op2->kind == 7)
-*value2 = (float)op2->__anon1.d;
+*value2 = (uintptr_t)op2->__anon1.d;
else if(op2->kind == 13)
-*value2 = (float)(float)op2->__anon1.ui64;
+*value2 = (uintptr_t)op2->__anon1.ui64;
else
-return 0x0;
-return 0x1;
+return 0;
+return 1;
}
-unsigned int GetFloat(struct Expression * exp, float * value2)
+unsigned int GetOpIntSize(struct Operand * op2, ssize_t * value2)
{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpFloat(&op2, value2);
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (ssize_t)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (ssize_t)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (ssize_t)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (ssize_t)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (ssize_t)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (ssize_t)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (ssize_t)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (ssize_t)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (ssize_t)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (ssize_t)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (ssize_t)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (ssize_t)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (ssize_t)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (ssize_t)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (ssize_t)op2->__anon1.ui64;
+else
+return 0;
+return 1;
}
-unsigned int GetOpDouble(struct Operand * op2, double * value2)
+unsigned int GetOpUIntSize(struct Operand * op2, size_t * value2)
{
if(op2->kind == 3 && op2->type->isSigned)
-*value2 = (double)(double)op2->__anon1.i;
+*value2 = (size_t)op2->__anon1.i;
else if(op2->kind == 3)
-*value2 = (double)(double)op2->__anon1.ui;
+*value2 = (size_t)op2->__anon1.ui;
else if(op2->kind == 4 && op2->type->isSigned)
-*value2 = (double)(double)op2->__anon1.i64;
+*value2 = (size_t)op2->__anon1.i64;
else if(op2->kind == 4)
-*value2 = (double)(double)op2->__anon1.ui64;
+*value2 = (size_t)op2->__anon1.ui64;
else if(op2->kind == 23 && op2->type->isSigned)
-*value2 = (double)(double)op2->__anon1.i64;
+*value2 = (size_t)op2->__anon1.i64;
else if(op2->kind == 23)
-*value2 = (double)(double)op2->__anon1.ui64;
+*value2 = (size_t)op2->__anon1.ui64;
else if(op2->kind == 22 && op2->type->isSigned)
-*value2 = (double)(double)op2->__anon1.i64;
+*value2 = (size_t)op2->__anon1.i64;
else if(op2->kind == 22)
-*value2 = (double)(double)op2->__anon1.ui64;
+*value2 = (size_t)op2->__anon1.ui64;
else if(op2->kind == 2 && op2->type->isSigned)
-*value2 = (double)(double)op2->__anon1.s;
+*value2 = (size_t)op2->__anon1.s;
else if(op2->kind == 2)
-*value2 = (double)(double)op2->__anon1.us;
+*value2 = (size_t)op2->__anon1.us;
else if(op2->kind == 1 && op2->type->isSigned)
-*value2 = (double)(double)op2->__anon1.c;
+*value2 = (size_t)op2->__anon1.c;
else if(op2->kind == 24 || op2->kind == 1)
-*value2 = (double)(double)op2->__anon1.uc;
+*value2 = (size_t)op2->__anon1.uc;
else if(op2->kind == 6)
-*value2 = (double)op2->__anon1.f;
+*value2 = (size_t)op2->__anon1.f;
else if(op2->kind == 7)
-*value2 = (double)op2->__anon1.d;
+*value2 = (size_t)op2->__anon1.d;
else if(op2->kind == 13)
-*value2 = (double)(double)op2->__anon1.ui64;
+*value2 = (size_t)op2->__anon1.ui64;
else
-return 0x0;
-return 0x1;
+return 0;
+return 1;
}
-unsigned int GetDouble(struct Expression * exp, double * value2)
+unsigned int GetOpShort(struct Operand * op2, short * value2)
{
-struct Operand op2 = GetOperand(exp);
-
-return GetOpDouble(&op2, value2);
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (short)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (short)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (short)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (short)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (short)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (short)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (short)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (short)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (short)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (short)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (short)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (short)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (short)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (short)op2->__anon1.ui64;
+else
+return 0;
+return 1;
}
-void ComputeExpression(struct Expression * exp);
-
-struct Context * SetupTemplatesContext(struct __ecereNameSpace__ecere__com__Class * _class);
-
-extern int targetBits;
-
-int ComputeTypeSize(struct Type * type);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__BitMember;
-
-struct __ecereNameSpace__ecere__com__BitMember
+unsigned int GetOpUShort(struct Operand * op2, unsigned short * value2)
{
-struct __ecereNameSpace__ecere__com__BitMember * prev;
-struct __ecereNameSpace__ecere__com__BitMember * next;
-const char * name;
-unsigned int isProperty;
-int memberAccess;
-int id;
-struct __ecereNameSpace__ecere__com__Class * _class;
-const char * dataTypeString;
-struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
-struct Type * dataType;
-int type;
-int size;
-int pos;
-uint64 mask;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldLink;
-
-struct __ecereNameSpace__ecere__sys__OldLink
-{
-struct __ecereNameSpace__ecere__sys__OldLink * prev;
-struct __ecereNameSpace__ecere__sys__OldLink * next;
-void * data;
-} __attribute__ ((gcc_struct));
-
-void FinishTemplatesContext(struct Context * context);
-
-void ComputeClassMembers(struct __ecereNameSpace__ecere__com__Class * _class, unsigned int isMember)
-{
-struct __ecereNameSpace__ecere__com__DataMember * member = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
-struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
-
-if(member || ((_class->type == 2 || _class->type == 0 || _class->type == 1 || _class->type == 5) && (_class->type == 2 || (!_class->structSize || _class->structSize == _class->offset)) && _class->computeSize))
-{
-int unionMemberOffset = 0;
-int bitFields = 0;
-
-if(member)
-{
-member->memberOffset = 0;
-if(targetBits < sizeof(void *) * 8)
-member->structAlignment = 0;
-}
-else if(targetBits < sizeof(void *) * 8)
-_class->structAlignment = 0;
-if(!member && ((_class->type == 0 || _class->type == 5) || (_class->type == 1 && _class->memberOffset && _class->memberOffset > _class->base->structSize)))
-_class->memberOffset = (_class->base && _class->type == 1) ? _class->base->structSize : 0;
-if(!member && _class->destructionWatchOffset)
-_class->memberOffset += sizeof(struct __ecereNameSpace__ecere__sys__OldList);
-{
-struct __ecereNameSpace__ecere__com__DataMember * dataMember;
-
-for(dataMember = member ? member->members.first : _class->membersAndProperties.first; dataMember; dataMember = dataMember->next)
-{
-if(!dataMember->isProperty)
-{
-if(dataMember->type == 0 && dataMember->dataTypeString && !dataMember->dataType)
-{
-dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0);
-}
-}
-}
-}
-{
-struct __ecereNameSpace__ecere__com__DataMember * dataMember;
-
-for(dataMember = member ? member->members.first : _class->membersAndProperties.first; dataMember; dataMember = dataMember->next)
-{
-if(!dataMember->isProperty && (dataMember->type != 0 || dataMember->dataTypeString))
-{
-if(!isMember && _class->type == 2 && dataMember->dataType)
-{
-struct __ecereNameSpace__ecere__com__BitMember * bitMember = (struct __ecereNameSpace__ecere__com__BitMember *)dataMember;
-uint64 mask = 0;
-int d;
-
-ComputeTypeSize(dataMember->dataType);
-if(bitMember->pos == -1)
-bitMember->pos = _class->memberOffset;
-if(!bitMember->size)
-bitMember->size = dataMember->dataType->size * 8;
-_class->memberOffset = bitMember->pos + bitMember->size;
-for(d = 0; d < bitMember->size; d++)
-{
-if(d)
-mask <<= 1;
-mask |= 1;
-}
-bitMember->mask = mask << bitMember->pos;
-}
-else if(dataMember->type == 0 && dataMember->dataType)
-{
-int size;
-int alignment = 0;
-
-if(dataMember->dataType->kind != 8 || ((!dataMember->dataType->__anon1._class || !dataMember->dataType->__anon1._class->__anon1.registered || dataMember->dataType->__anon1._class->__anon1.registered != _class || _class->type != 1)))
-ComputeTypeSize(dataMember->dataType);
-if(dataMember->dataType->bitFieldCount)
-{
-bitFields += dataMember->dataType->bitFieldCount;
-size = 0;
-}
-else
-{
-if(bitFields)
-{
-int size = (bitFields + 7) / 8;
-
-if(isMember)
-{
-int __simpleStruct0;
-
-if(alignment)
-{
-int __simpleStruct0;
-
-member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-if(member->memberOffset % alignment)
-member->memberOffset += alignment - (member->memberOffset % alignment);
-}
-dataMember->offset = member->memberOffset;
-if(member->type == 1)
-unionMemberOffset = (__simpleStruct0 = dataMember->dataType->size, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
-else
-{
-member->memberOffset += size;
-}
-}
-else
-{
-if(alignment)
-{
-int __simpleStruct0;
-
-_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-if(_class->memberOffset % alignment)
-_class->memberOffset += alignment - (_class->memberOffset % alignment);
-}
-dataMember->offset = _class->memberOffset;
-_class->memberOffset += size;
-}
-bitFields = 0;
-}
-size = dataMember->dataType->size;
-alignment = dataMember->dataType->alignment;
-}
-if(isMember)
-{
-int __simpleStruct0;
-
-if(alignment)
-{
-int __simpleStruct0;
-
-member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-if(member->memberOffset % alignment)
-member->memberOffset += alignment - (member->memberOffset % alignment);
-}
-dataMember->offset = member->memberOffset;
-if(member->type == 1)
-unionMemberOffset = (__simpleStruct0 = dataMember->dataType->size, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (unsigned short)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (unsigned short)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (unsigned short)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (unsigned short)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (unsigned short)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (unsigned short)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (unsigned short)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (unsigned short)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (unsigned short)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (unsigned short)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (unsigned short)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (unsigned short)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (unsigned short)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (unsigned short)op2->__anon1.ui64;
else
-{
-member->memberOffset += size;
+return 0;
+return 1;
}
-}
-else
-{
-if(alignment)
-{
-int __simpleStruct0;
-_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-if(_class->memberOffset % alignment)
-_class->memberOffset += alignment - (_class->memberOffset % alignment);
-}
-dataMember->offset = _class->memberOffset;
-_class->memberOffset += size;
-}
-}
-else
-{
-int alignment;
-
-ComputeClassMembers((struct __ecereNameSpace__ecere__com__Class *)dataMember, 0x1);
-alignment = dataMember->structAlignment;
-if(isMember)
-{
-int __simpleStruct0;
-
-if(alignment)
+unsigned int GetOpChar(struct Operand * op2, char * value2)
{
-int __simpleStruct0;
-
-if(member->memberOffset % alignment)
-member->memberOffset += alignment - (member->memberOffset % alignment);
-member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-}
-dataMember->offset = member->memberOffset;
-if(member->type == 1)
-unionMemberOffset = (__simpleStruct0 = dataMember->memberOffset, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
-else
-member->memberOffset += dataMember->memberOffset;
-}
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (char)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (char)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (char)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (char)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (char)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (char)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (char)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (char)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (char)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (char)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (char)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (char)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (char)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (char)op2->__anon1.ui64;
else
-{
-if(alignment)
-{
-int __simpleStruct0;
-
-if(_class->memberOffset % alignment)
-_class->memberOffset += alignment - (_class->memberOffset % alignment);
-_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-}
-dataMember->offset = _class->memberOffset;
-_class->memberOffset += dataMember->memberOffset;
+return 0;
+return 1;
}
-}
-}
-}
-if(bitFields)
-{
-int alignment = 0;
-int size = (bitFields + 7) / 8;
-
-if(isMember)
-{
-int __simpleStruct0;
-if(alignment)
-{
-int __simpleStruct0;
-
-member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-if(member->memberOffset % alignment)
-member->memberOffset += alignment - (member->memberOffset % alignment);
-}
-if(member->type == 1)
-unionMemberOffset = (__simpleStruct0 = dataMember->dataType->size, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
-else
+unsigned int GetOpUChar(struct Operand * op2, unsigned char * value2)
{
-member->memberOffset += size;
-}
-}
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (unsigned char)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (unsigned char)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (unsigned char)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (unsigned char)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (unsigned char)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (unsigned char)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (unsigned char)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (unsigned char)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (unsigned char)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (unsigned char)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (unsigned char)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (unsigned char)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (unsigned char)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (unsigned char)op2->__anon1.ui64;
else
-{
-if(alignment)
-{
-int __simpleStruct0;
-
-_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
-if(_class->memberOffset % alignment)
-_class->memberOffset += alignment - (_class->memberOffset % alignment);
-}
-_class->memberOffset += size;
-}
-bitFields = 0;
-}
-}
-if(member && member->type == 1)
-{
-member->memberOffset = unionMemberOffset;
-}
-if(!isMember)
-{
-if(_class->type != 2)
-{
-int extra = 0;
-
-if(_class->structAlignment)
-{
-if(_class->memberOffset % _class->structAlignment)
-extra += _class->structAlignment - (_class->memberOffset % _class->structAlignment);
-}
-_class->structSize = (_class->base ? (_class->base->templateClass ? _class->base->templateClass->structSize : _class->base->structSize) : 0) + _class->memberOffset + extra;
-if(!member)
-{
-struct __ecereNameSpace__ecere__com__Property * prop;
-
-for(prop = _class->membersAndProperties.first; prop; prop = prop->next)
-{
-if(prop->isProperty && prop->isWatchable)
-{
-prop->watcherOffset = _class->structSize;
-_class->structSize += sizeof(struct __ecereNameSpace__ecere__sys__OldList);
-}
-}
-}
-{
-struct __ecereNameSpace__ecere__sys__OldLink * derivative;
-
-for(derivative = _class->derivatives.first; derivative; derivative = derivative->next)
-{
-struct __ecereNameSpace__ecere__com__Class * deriv = derivative->data;
-
-if(deriv->computeSize)
-{
-deriv->offset = _class->structSize;
-deriv->memberOffset = 0;
-deriv->structSize = deriv->offset;
-ComputeClassMembers(deriv, 0x0);
-}
-}
-}
-}
-}
-}
-if(context)
-FinishTemplatesContext(context);
-}
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__NameSpace;
-
-struct __ecereNameSpace__ecere__com__NameSpace
-{
-const char * name;
-struct __ecereNameSpace__ecere__com__NameSpace * btParent;
-struct __ecereNameSpace__ecere__com__NameSpace * left;
-struct __ecereNameSpace__ecere__com__NameSpace * right;
-int depth;
-struct __ecereNameSpace__ecere__com__NameSpace * parent;
-struct __ecereNameSpace__ecere__sys__BinaryTree nameSpaces;
-struct __ecereNameSpace__ecere__sys__BinaryTree classes;
-struct __ecereNameSpace__ecere__sys__BinaryTree defines;
-struct __ecereNameSpace__ecere__sys__BinaryTree functions;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Module;
-
-struct __ecereNameSpace__ecere__com__Module
-{
-struct __ecereNameSpace__ecere__com__Instance * application;
-struct __ecereNameSpace__ecere__sys__OldList classes;
-struct __ecereNameSpace__ecere__sys__OldList defines;
-struct __ecereNameSpace__ecere__sys__OldList functions;
-struct __ecereNameSpace__ecere__sys__OldList modules;
-struct __ecereNameSpace__ecere__com__Instance * prev;
-struct __ecereNameSpace__ecere__com__Instance * next;
-const char * name;
-void * library;
-void * Unload;
-int importType;
-int origImportType;
-struct __ecereNameSpace__ecere__com__NameSpace privateNameSpace;
-struct __ecereNameSpace__ecere__com__NameSpace publicNameSpace;
-} __attribute__ ((gcc_struct));
-
-void ComputeModuleClasses(struct __ecereNameSpace__ecere__com__Instance * module)
-{
-struct __ecereNameSpace__ecere__com__Class * _class;
-struct __ecereNameSpace__ecere__sys__OldLink * subModule;
-
-for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->modules.first; subModule; subModule = subModule->next)
-ComputeModuleClasses(subModule->data);
-for(_class = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->classes.first; _class; _class = _class->next)
-ComputeClassMembers(_class, 0x0);
+return 0;
+return 1;
}
-extern unsigned int inCompiler;
-
-extern void Compiler_Error(const char * format, ...);
-
-extern const char * __ecereNameSpace__ecere__GetTranslatedString(const char * name, const char * string, const char * stringAndContext);
-
-int ComputeTypeSize(struct Type * type)
-{
-unsigned int size = type ? type->size : 0;
-
-if(!size && type && !type->computing)
-{
-type->computing = 0x1;
-switch(type->kind)
-{
-case 24:
-type->alignment = size = sizeof(char);
-break;
-case 1:
-type->alignment = size = sizeof(char);
-break;
-case 3:
-type->alignment = size = sizeof(int);
-break;
-case 4:
-type->alignment = size = sizeof(long long);
-break;
-case 22:
-type->alignment = size = targetBits / 8;
-break;
-case 23:
-type->alignment = size = targetBits / 8;
-break;
-case 5:
-type->alignment = size = sizeof(long);
-break;
-case 2:
-type->alignment = size = sizeof(short);
-break;
-case 6:
-type->alignment = size = sizeof(float);
-break;
-case 7:
-type->alignment = size = sizeof(double);
-break;
-case 8:
-{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class ? type->__anon1._class->__anon1.registered : (((void *)0));
-
-if(_class && _class->type == 1)
+unsigned int GetOpFloat(struct Operand * op2, float * value2)
{
-ComputeClassMembers(_class, 0x0);
-type->alignment = _class->structAlignment;
-size = _class->structSize;
-if(type->alignment && size % type->alignment)
-size += type->alignment - (size % type->alignment);
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (float)(float)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (float)(float)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (float)(float)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (float)(float)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (float)(float)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (float)(float)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (float)(float)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (float)(float)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (float)(float)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (float)(float)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (float)(float)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (float)(float)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (float)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (float)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (float)(float)op2->__anon1.ui64;
+else
+return 0;
+return 1;
}
-else if(_class && (_class->type == 3 || _class->type == 4 || _class->type == 2))
+
+unsigned int GetOpDouble(struct Operand * op2, double * value2)
{
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-size = type->alignment = ComputeTypeSize(_class->dataType);
-}
+if(op2->kind == 3 && op2->type->isSigned)
+*value2 = (double)(double)op2->__anon1.i;
+else if(op2->kind == 3)
+*value2 = (double)(double)op2->__anon1.ui;
+else if(op2->kind == 4 && op2->type->isSigned)
+*value2 = (double)(double)op2->__anon1.i64;
+else if(op2->kind == 4)
+*value2 = (double)(double)op2->__anon1.ui64;
+else if(op2->kind == 23 && op2->type->isSigned)
+*value2 = (double)(double)op2->__anon1.i64;
+else if(op2->kind == 23)
+*value2 = (double)(double)op2->__anon1.ui64;
+else if(op2->kind == 22 && op2->type->isSigned)
+*value2 = (double)(double)op2->__anon1.i64;
+else if(op2->kind == 22)
+*value2 = (double)(double)op2->__anon1.ui64;
+else if(op2->kind == 2 && op2->type->isSigned)
+*value2 = (double)(double)op2->__anon1.s;
+else if(op2->kind == 2)
+*value2 = (double)(double)op2->__anon1.us;
+else if(op2->kind == 1 && op2->type->isSigned)
+*value2 = (double)(double)op2->__anon1.c;
+else if(op2->kind == 24 || op2->kind == 1)
+*value2 = (double)(double)op2->__anon1.uc;
+else if(op2->kind == 6)
+*value2 = (double)op2->__anon1.f;
+else if(op2->kind == 7)
+*value2 = (double)op2->__anon1.d;
+else if(op2->kind == 13)
+*value2 = (double)(double)op2->__anon1.ui64;
else
-size = type->alignment = targetBits / 8;
-break;
+return 0;
+return 1;
}
-case 13:
-case 19:
-size = type->alignment = targetBits / 8;
-break;
-case 12:
-if(type->__anon1.__anon4.arraySizeExp)
-{
-ProcessExpressionType(type->__anon1.__anon4.arraySizeExp);
-ComputeExpression(type->__anon1.__anon4.arraySizeExp);
-if(!type->__anon1.__anon4.arraySizeExp->isConstant || (type->__anon1.__anon4.arraySizeExp->expType->kind != 3 && type->__anon1.__anon4.arraySizeExp->expType->kind != 2 && type->__anon1.__anon4.arraySizeExp->expType->kind != 1 && type->__anon1.__anon4.arraySizeExp->expType->kind != 5 && type->__anon1.__anon4.arraySizeExp->expType->kind != 4 && type->__anon1.__anon4.arraySizeExp->expType->kind != 23 && type->__anon1.__anon4.arraySizeExp->expType->kind != 22 && type->__anon1.__anon4.arraySizeExp->expType->kind != 15 && (type->__anon1.__anon4.arraySizeExp->expType->kind != 8 || !type->__anon1.__anon4.arraySizeExp->expType->__anon1._class->__anon1.registered || type->__anon1.__anon4.arraySizeExp->expType->__anon1._class->__anon1.registered->type != 4)))
+
+static unsigned int IntAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Location oldLoc = yylloc;
-char expression[10240];
+int value2 = op2->__anon1.i;
-expression[0] = '\0';
-type->__anon1.__anon4.arraySizeExp->expType = (((void *)0));
-yylloc = type->__anon1.__anon4.arraySizeExp->loc;
-if(inCompiler)
-PrintExpression(type->__anon1.__anon4.arraySizeExp, expression);
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Array size not constant int (%s)\n", (((void *)0))), expression);
-yylloc = oldLoc;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-GetInt(type->__anon1.__anon4.arraySizeExp, &type->__anon1.__anon4.arraySize);
+return 1;
}
-else if(type->__anon1.__anon4.enumClass)
+
+static unsigned int UIntAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(type->__anon1.__anon4.enumClass && type->__anon1.__anon4.enumClass->__anon1.registered && type->__anon1.__anon4.enumClass->__anon1.registered->type == 4)
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui + value2));
+if(!exp->expType)
{
-type->__anon1.__anon4.arraySize = (int)__ecereNameSpace__ecere__com__eClass_GetProperty(type->__anon1.__anon4.enumClass->__anon1.registered, "enumSize");
-}
-else
-type->__anon1.__anon4.arraySize = 0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
-{
-type->__anon1.__anon4.arraySize = 0;
+return 1;
}
-size = ComputeTypeSize(type->__anon1.type) * type->__anon1.__anon4.arraySize;
-if(type->__anon1.type)
-type->alignment = type->__anon1.type->alignment;
-break;
-case 9:
-{
-struct Type * member;
-for(member = type->__anon1.__anon1.members.first; member; member = member->next)
+static unsigned int Int64Add(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int __simpleStruct0, __simpleStruct1;
-unsigned int addSize = ComputeTypeSize(member);
+long long value2 = op2->__anon1.i64;
-member->offset = size;
-if(member->alignment && size % member->alignment)
-member->offset += member->alignment - (size % member->alignment);
-size = member->offset;
-type->alignment = (__simpleStruct0 = type->alignment, __simpleStruct1 = member->alignment, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1);
-size += addSize;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(type->alignment && size % type->alignment)
-size += type->alignment - (size % type->alignment);
-break;
+return 1;
}
-case 10:
-{
-struct Type * member;
-for(member = type->__anon1.__anon1.members.first; member; member = member->next)
+static unsigned int UInt64Add(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int __simpleStruct0, __simpleStruct1;
-unsigned int addSize = ComputeTypeSize(member);
+uint64 value2 = op2->__anon1.ui64;
-member->offset = size;
-if(member->alignment && size % member->alignment)
-member->offset += member->alignment - (size % member->alignment);
-size = member->offset;
-type->alignment = (__simpleStruct0 = type->alignment, __simpleStruct1 = member->alignment, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1);
-size = ((size > addSize) ? size : addSize);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(type->alignment && size % type->alignment)
-size += type->alignment - (size % type->alignment);
-break;
+return 1;
}
-case 20:
+
+static unsigned int ShortAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct TemplateParameter * param = type->__anon1.templateParameter;
-struct Type * baseType = ProcessTemplateParameterType(param);
+short value2 = op2->__anon1.s;
-if(baseType)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s + value2));
+if(!exp->expType)
{
-size = ComputeTypeSize(baseType);
-type->alignment = baseType->alignment;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
-type->alignment = size = sizeof(uint64);
-break;
+return 1;
}
-case 15:
-{
-type->alignment = size = sizeof(enum
+
+static unsigned int UShortAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-test
-});
-break;
-}
-case 21:
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us + value2));
+if(!exp->expType)
{
-type->alignment = size = targetBits / 8;
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-type->size = size;
-type->computing = 0x0;
+
+static unsigned int CharAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return size;
+return 1;
}
-extern struct Declarator * MkDeclaratorIdentifier(struct Identifier * id);
+static unsigned int UCharAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned char value2 = op2->__anon1.uc;
-extern struct Identifier * MkIdentifier(const char * string);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern void ListAdd(struct __ecereNameSpace__ecere__sys__OldList * list, void * item);
+static unsigned int FloatAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+float value2 = op2->__anon1.f;
-extern struct Declarator * MkStructDeclarator(struct Declarator * declarator, struct Expression * exp);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern struct ClassDef * MkClassDefDeclaration(struct Declaration * decl);
+static unsigned int DoubleAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+double value2 = op2->__anon1.d;
-extern struct Declaration * MkStructDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * declarators, struct Specifier * extStorage);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d + value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-void ReplaceThisClassSpecifiers(struct __ecereNameSpace__ecere__sys__OldList * specs, struct __ecereNameSpace__ecere__com__Class * _class);
+static unsigned int IntSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+int value2 = op2->__anon1.i;
-static void DeclareType(struct Type * type, unsigned int declarePointers, unsigned int declareParams);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i - value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern void FreeType(struct Type * type);
+static unsigned int UIntSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned int value2 = op2->__anon1.ui;
-extern struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui - value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern struct Specifier * MkSpecifier(int specifier);
+static unsigned int Int64Sub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+long long value2 = op2->__anon1.i64;
-extern struct Declarator * MkDeclaratorArray(struct Declarator * declarator, struct Expression * exp);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 - value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern struct Expression * MkExpConstant(const char * string);
+static unsigned int UInt64Sub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+uint64 value2 = op2->__anon1.ui64;
-int AddMembers(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__com__Class * _class, unsigned int isMember, unsigned int * retSize, struct __ecereNameSpace__ecere__com__Class * topClass, unsigned int * addedPadding)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 - value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__DataMember * topMember = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
-unsigned int totalSize = 0;
-unsigned int maxSize = 0;
-int alignment;
-unsigned int size;
-struct __ecereNameSpace__ecere__com__DataMember * member;
-int anonID = 1;
-struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(addedPadding)
-*addedPadding = 0x0;
-if(!isMember && _class->base)
+static unsigned int ShortSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-maxSize = _class->structSize;
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s - value2));
+if(!exp->expType)
{
-if(_class->type == 1 || _class->type == 5)
-AddMembers(declarations, _class->base, 0x0, &totalSize, topClass, (((void *)0)));
-else
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UShortSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int baseSize = _class->base->templateClass ? _class->base->templateClass->structSize : _class->base->structSize;
+unsigned short value2 = op2->__anon1.us;
-if(maxSize > baseSize)
-maxSize -= baseSize;
-else
-maxSize = 0;
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us - value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-for(member = isMember ? topMember->members.first : _class->membersAndProperties.first; member; member = member->next)
-{
-if(!member->isProperty)
+
+static unsigned int CharSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-switch(member->type)
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c - value2));
+if(!exp->expType)
{
-case 0:
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UCharSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(member->dataTypeString)
+unsigned char value2 = op2->__anon1.uc;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc - value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(), * decls = MkList();
-struct Declarator * decl;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-decl = SpecDeclFromString(member->dataTypeString, specs, MkDeclaratorIdentifier(MkIdentifier(member->name)));
-ListAdd(decls, MkStructDeclarator(decl, (((void *)0))));
-ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, decls, (((void *)0)))));
-if(!member->dataType)
-member->dataType = ProcessType(specs, decl);
-ReplaceThisClassSpecifiers(specs, topClass);
+static unsigned int FloatSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * type = ProcessType(specs, decl);
+float value2 = op2->__anon1.f;
-DeclareType(member->dataType, 0x0, 0x0);
-FreeType(type);
-}
-ComputeTypeSize(member->dataType);
-size = member->dataType->size;
-alignment = member->dataType->alignment;
-if(alignment)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f - value2));
+if(!exp->expType)
{
-if(totalSize % alignment)
-totalSize += alignment - (totalSize % alignment);
-}
-totalSize += size;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-break;
+return 1;
}
-case 1:
-case 2:
+
+static unsigned int DoubleSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(), * list = MkList();
-char id[100];
+double value2 = op2->__anon1.d;
-sprintf(id, "__anon%d", anonID++);
-size = 0;
-AddMembers(list, (struct __ecereNameSpace__ecere__com__Class *)member, 0x1, &size, topClass, (((void *)0)));
-ListAdd(specs, MkStructOrUnion((member->type == 1) ? 4 : 3, (((void *)0)), list));
-ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, MkListOne(MkDeclaratorIdentifier(MkIdentifier(id))), (((void *)0)))));
-alignment = member->structAlignment;
-if(alignment)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d - value2));
+if(!exp->expType)
{
-if(totalSize % alignment)
-totalSize += alignment - (totalSize % alignment);
-}
-totalSize += size;
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int IntMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i * value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(retSize)
+
+static unsigned int UIntMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int __simpleStruct0;
+unsigned int value2 = op2->__anon1.ui;
-if(topMember && topMember->type == 1)
-*retSize = (__simpleStruct0 = *retSize, (__simpleStruct0 > totalSize) ? __simpleStruct0 : totalSize);
-else
-*retSize += totalSize;
-}
-else if(totalSize < maxSize && _class->type != 1000)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui * value2));
+if(!exp->expType)
{
-int autoPadding = 0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!isMember && _class->structAlignment && totalSize % _class->structAlignment)
-autoPadding = _class->structAlignment - (totalSize % _class->structAlignment);
-if(totalSize + autoPadding < maxSize)
+static unsigned int Int64Mul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char sizeString[50];
+long long value2 = op2->__anon1.i64;
-sprintf(sizeString, "%d", maxSize - totalSize);
-ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(CHAR)), MkListOne(MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__ecere_padding")), MkExpConstant(sizeString))), (((void *)0)))));
-if(addedPadding)
-*addedPadding = 0x1;
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 * value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(context)
-FinishTemplatesContext(context);
-return topMember ? topMember->memberID : _class->memberID;
+return 1;
}
-static int DeclareMembers(struct __ecereNameSpace__ecere__com__Class * _class, unsigned int isMember)
+static unsigned int UInt64Mul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__DataMember * topMember = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * member;
-struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
+uint64 value2 = op2->__anon1.ui64;
-if(!isMember && (_class->type == 1 || _class->type == 5) && _class->base->type != 1000)
-DeclareMembers(_class->base, 0x0);
-for(member = isMember ? topMember->members.first : _class->membersAndProperties.first; member; member = member->next)
-{
-if(!member->isProperty)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 * value2));
+if(!exp->expType)
{
-switch(member->type)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int ShortMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-case 0:
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s * value2));
+if(!exp->expType)
{
-if(!member->dataType && member->dataTypeString)
-member->dataType = ProcessTypeString(member->dataTypeString, 0x0);
-if(member->dataType)
-DeclareType(member->dataType, 0x0, 0x0);
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-case 1:
-case 2:
-{
-DeclareMembers((struct __ecereNameSpace__ecere__com__Class *)member, 0x1);
-break;
+return 1;
}
+
+static unsigned int UShortMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us * value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int CharMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c * value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(context)
-FinishTemplatesContext(context);
-return topMember ? topMember->memberID : _class->memberID;
+return 1;
}
-extern struct Identifier * GetDeclId(struct Declarator * decl);
-
-static void IdentifyAnonStructs(struct __ecereNameSpace__ecere__sys__OldList * definitions)
+static unsigned int UCharMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct ClassDef * def;
-int anonID = 1;
+unsigned char value2 = op2->__anon1.uc;
-for(def = (*definitions).first; def; def = def->next)
-{
-if(def->type == 2)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc * value2));
+if(!exp->expType)
{
-struct Declaration * decl = def->__anon1.decl;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(decl && decl->__anon1.__anon1.specifiers)
+static unsigned int FloatMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Specifier * spec;
-unsigned int isStruct = 0x0;
+float value2 = op2->__anon1.f;
-for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
-{
-if(spec->type == 3 || spec->type == 4)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f * value2));
+if(!exp->expType)
{
-if(spec->__anon1.__anon2.definitions)
-IdentifyAnonStructs(spec->__anon1.__anon2.definitions);
-isStruct = 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(isStruct)
-{
-struct Declarator * d = (((void *)0));
-if(decl->__anon1.__anon1.declarators)
-{
-for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
+static unsigned int DoubleMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Identifier * idDecl = GetDeclId(d);
+double value2 = op2->__anon1.d;
-if(idDecl)
-break;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d * value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!d)
+
+static unsigned int IntDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char id[100];
+int value2 = op2->__anon1.i;
-sprintf(id, "__anon%d", anonID++);
-if(!decl->__anon1.__anon1.declarators)
-decl->__anon1.__anon1.declarators = MkList();
-ListAdd(decl->__anon1.__anon1.declarators, MkDeclaratorIdentifier(MkIdentifier(id)));
-}
-}
-}
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt(value2 ? ((op1->__anon1.i / value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-extern struct Symbol * FindClass(const char * name);
-
-extern char * strchr(const char * , int);
-
-extern void FullClassNameCat(char * output, const char * className, unsigned int includeTemplateParams);
-
-extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* FreeFunction)(void * ));
-
-extern void FreeClassDef(struct ClassDef * def);
-
-extern struct External * MkExternalDeclaration(struct Declaration * declaration);
-
-extern struct Declaration * MkDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * initDeclarators);
-
-extern void DeclareClass(struct Symbol * classSym, const char * className);
-
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Move(struct __ecereNameSpace__ecere__sys__OldList * this, void * item, void * prevItem);
-
-unsigned int __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(struct __ecereNameSpace__ecere__sys__OldList * this, void * prevItem, void * item);
-
-void DeclareStruct(const char * name, unsigned int skipNoHead)
+static unsigned int UIntDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct External * external = (((void *)0));
-struct Symbol * classSym = FindClass(name);
+unsigned int value2 = op2->__anon1.ui;
-if(!inCompiler || !classSym)
-return ;
-if(classSym->__anon1.registered && (classSym->__anon1.registered->type == 2 || classSym->__anon1.registered->type == 3 || classSym->__anon1.registered->type == 4))
-return ;
-if(classSym->__anon1.registered && classSym->imported && !classSym->declaredStructSym)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt(value2 ? ((op1->__anon1.ui / value2)) : 0);
+if(!exp->expType)
{
-struct Declaration * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-struct __ecereNameSpace__ecere__sys__OldList * declarations = (((void *)0));
-char structName[1024];
-struct Specifier * spec = (((void *)0));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-external = (classSym->__anon1.registered && classSym->__anon1.registered->type == 1) ? classSym->__anon2.__anon1.pointerExternal : classSym->__anon2.__anon1.structExternal;
-classSym->declaring++;
-if(strchr(classSym->string, '<'))
+static unsigned int Int64Div(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(classSym->__anon1.registered->templateClass)
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64(value2 ? ((op1->__anon1.i64 / value2)) : 0);
+if(!exp->expType)
{
-DeclareStruct(classSym->__anon1.registered->templateClass->fullName, skipNoHead);
-classSym->declaring--;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return ;
+return 1;
}
-DeclareMembers(classSym->__anon1.registered, 0x0);
-structName[0] = (char)0;
-FullClassNameCat(structName, name, 0x0);
-if(external && external->__anon1.declaration && external->__anon1.declaration->__anon1.__anon1.specifiers)
+
+static unsigned int UInt64Div(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-for(spec = (*external->__anon1.declaration->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64(value2 ? ((op1->__anon1.ui64 / value2)) : 0);
+if(!exp->expType)
{
-if(spec->type == 3 || spec->type == 4)
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!skipNoHead && (!spec || !spec->__anon1.__anon2.definitions))
+
+static unsigned int ShortDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int addedPadding = 0x0;
+short value2 = op2->__anon1.s;
-classSym->declaredStructSym = 0x1;
-declarations = MkList();
-AddMembers(declarations, classSym->__anon1.registered, 0x0, (((void *)0)), classSym->__anon1.registered, &addedPadding);
-if(!(*declarations).count || ((*declarations).count == 1 && addedPadding))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort(value2 ? ((short)(op1->__anon1.s / value2)) : 0);
+if(!exp->expType)
{
-FreeList(declarations, FreeClassDef);
-declarations = (((void *)0));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(skipNoHead || declarations)
-{
-if(spec)
+
+static unsigned int UShortDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(declarations)
-spec->__anon1.__anon2.definitions = declarations;
-if(curExternal && curExternal->symbol && curExternal->symbol->idCode < classSym->id)
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort(value2 ? ((unsigned short)(op1->__anon1.us / value2)) : 0);
+if(!exp->expType)
{
-if(classSym->__anon2.__anon1.structExternal)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), classSym->__anon2.__anon1.structExternal, curExternal->prev);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), classSym->__anon2.__anon1.pointerExternal, curExternal->prev);
-classSym->id = curExternal->symbol->idCode;
-classSym->idCode = curExternal->symbol->idCode;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else
-{
-if(!external)
-external = MkExternalDeclaration((((void *)0)));
-specifiers = MkList();
-declarators = MkList();
-ListAdd(specifiers, MkStructOrUnion(3, MkIdentifier(structName), declarations));
-external->__anon1.declaration = decl = MkDeclaration(specifiers, declarators);
-if(decl->symbol && !decl->symbol->__anon2.__anon1.pointerExternal)
-decl->symbol->__anon2.__anon1.pointerExternal = external;
-if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1)
-{
-char className[1024];
-strcpy(className, "__ecereClass_");
-FullClassNameCat(className, classSym->string, 0x1);
-DeclareClass(classSym, className);
-external->symbol = classSym;
-classSym->__anon2.__anon1.pointerExternal = external;
-classSym->id = (curExternal && curExternal->symbol) ? curExternal->symbol->idCode : 0;
-classSym->idCode = (curExternal && curExternal->symbol) ? curExternal->symbol->idCode : 0;
-}
-else
+static unsigned int CharDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char className[1024];
+char value2 = op2->__anon1.c;
-strcpy(className, "__ecereClass_");
-FullClassNameCat(className, classSym->string, 0x1);
-classSym->__anon2.__anon1.structExternal = external;
-DeclareClass(classSym, className);
-external->symbol = classSym;
-}
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal ? curExternal->prev : (((void *)0)), external);
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar(value2 ? ((char)(op1->__anon1.c / value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-classSym->declaring--;
+return 1;
}
-else
-{
-if(classSym->__anon2.__anon1.structExternal && classSym->__anon2.__anon1.structExternal->__anon1.declaration && classSym->__anon2.__anon1.structExternal->__anon1.declaration->__anon1.__anon1.specifiers)
+
+static unsigned int UCharDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Specifier * spec;
+unsigned char value2 = op2->__anon1.uc;
-for(spec = (*classSym->__anon2.__anon1.structExternal->__anon1.declaration->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar(value2 ? ((unsigned char)(op1->__anon1.uc / value2)) : 0);
+if(!exp->expType)
{
-IdentifyAnonStructs(spec->__anon1.__anon2.definitions);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(curExternal && curExternal->symbol && curExternal->symbol->idCode < classSym->id)
-{
-classSym->declaring++;
+
+static unsigned int FloatDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(classSym->__anon1.registered)
-DeclareMembers(classSym->__anon1.registered, 0x0);
-}
-if(classSym->__anon1.registered && (classSym->__anon1.registered->type == 1 || classSym->__anon1.registered->type == 5))
+float value2 = op2->__anon1.f;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f / value2));
+if(!exp->expType)
{
-if(classSym->__anon2.__anon1.structExternal)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), classSym->__anon2.__anon1.structExternal, curExternal->prev);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), classSym->__anon2.__anon1.pointerExternal, curExternal->prev);
-classSym->id = curExternal->symbol->idCode;
-classSym->idCode = curExternal->symbol->idCode;
-}
-classSym->declaring--;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-extern struct ModuleImport * FindModule(struct __ecereNameSpace__ecere__com__Instance * moduleToFind);
-
-extern struct ModuleImport * mainModule;
-
-extern struct Specifier * MkSpecifierName(const char * name);
-
-extern struct Declarator * MkDeclaratorBrackets(struct Declarator * declarator);
-
-extern struct Declarator * PlugDeclarator(struct Declarator * decl, struct Declarator * baseDecl);
-
-extern struct Declarator * MkDeclaratorFunction(struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * parameters);
-
-extern struct InitDeclarator * MkInitDeclarator(struct Declarator * declarator, struct Initializer * initializer);
-
-extern void FreeDeclarator(struct Declarator * decl);
+static unsigned int DoubleDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+double value2 = op2->__anon1.d;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyImport;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d / value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-struct PropertyImport
+static unsigned int IntMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct PropertyImport * prev;
-struct PropertyImport * next;
-char * name;
-unsigned int isVirtual;
-unsigned int hasSet;
-unsigned int hasGet;
-} __attribute__ ((gcc_struct));
+int value2 = op2->__anon1.i;
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt(value2 ? ((op1->__anon1.i % value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-void DeclareProperty(struct __ecereNameSpace__ecere__com__Property * prop, char * setName, char * getName)
+static unsigned int UIntMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Symbol * symbol = prop->symbol;
+unsigned int value2 = op2->__anon1.ui;
-strcpy(setName, "__ecereProp_");
-FullClassNameCat(setName, prop->_class->fullName, 0x0);
-strcat(setName, "_Set_");
-FullClassNameCat(setName, prop->name, 0x1);
-strcpy(getName, "__ecereProp_");
-FullClassNameCat(getName, prop->_class->fullName, 0x0);
-strcat(getName, "_Get_");
-FullClassNameCat(getName, prop->name, 0x1);
-if(prop->_class->type == 1)
-DeclareStruct(prop->_class->fullName, 0x0);
-if(!symbol || curExternal->symbol->idCode < symbol->id)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt(value2 ? ((op1->__anon1.ui % value2)) : 0);
+if(!exp->expType)
{
-unsigned int imported = 0x0;
-unsigned int dllImport = 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!symbol || symbol->_import)
-{
-if(!symbol)
+static unsigned int Int64Mod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Symbol * classSym;
+long long value2 = op2->__anon1.i64;
-if(!prop->_class->symbol)
-prop->_class->symbol = FindClass(prop->_class->fullName);
-classSym = prop->_class->symbol;
-if(classSym && !classSym->_import)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64(value2 ? ((op1->__anon1.i64 % value2)) : 0);
+if(!exp->expType)
{
-struct ModuleImport * module;
-
-if(prop->_class->module)
-module = FindModule(prop->_class->module);
-else
-module = mainModule;
-classSym->_import = __extension__ ({
-struct ClassImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassImport);
-
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->_class->fullName), __ecereInstance1->isRemote = prop->_class->isRemote, __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->classes, classSym->_import);
-}
-symbol = prop->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-symbol->_import = (struct ClassImport *)__extension__ ({
-struct PropertyImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyImport);
-
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->isVirtual = 0x0, __ecereInstance1->hasSet = prop->Set ? 0x1 : 0x0, __ecereInstance1->hasGet = prop->Get ? 0x1 : 0x0, __ecereInstance1;
-});
-if(classSym)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classSym->_import->properties, symbol->_import);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-imported = 0x1;
-if((prop->_class->module != privateModule || !strcmp(prop->_class->name, "float") || !strcmp(prop->_class->name, "double")) && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)prop->_class->module + structSize_Instance)))->importType != 1)
-dllImport = 0x1;
+return 1;
}
-if(!symbol->type)
+
+static unsigned int UInt64Mod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Context * context = SetupTemplatesContext(prop->_class);
+uint64 value2 = op2->__anon1.ui64;
-symbol->type = ProcessTypeString(prop->dataTypeString, 0x0);
-FinishTemplatesContext(context);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64(value2 ? ((op1->__anon1.ui64 % value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-if(prop->Get)
+
+static unsigned int ShortMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!symbol->__anon2.__anon2.externalGet || symbol->__anon2.__anon2.externalGet->type == 0)
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort(value2 ? ((short)(op1->__anon1.s % value2)) : 0);
+if(!exp->expType)
{
-struct Declaration * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-struct Declarator * d;
-struct __ecereNameSpace__ecere__sys__OldList * params;
-struct Specifier * spec;
-struct External * external;
-struct Declarator * typeDecl;
-unsigned int simple = 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-specifiers = MkList();
-declarators = MkList();
-params = MkList();
-ListAdd(params, MkTypeName(MkListOne(MkSpecifierName(prop->_class->fullName)), MkDeclaratorIdentifier(MkIdentifier("this"))));
-d = MkDeclaratorIdentifier(MkIdentifier(getName));
-if(dllImport)
-d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
+static unsigned int UShortMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Context * context = SetupTemplatesContext(prop->_class);
+unsigned short value2 = op2->__anon1.us;
-typeDecl = SpecDeclFromString(prop->dataTypeString, specifiers, (((void *)0)));
-FinishTemplatesContext(context);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort(value2 ? ((unsigned short)(op1->__anon1.us % value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-for(spec = (*specifiers).first; spec; spec = spec->next)
+return 1;
+}
+
+static unsigned int CharMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(spec->type == 1)
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar(value2 ? ((char)(op1->__anon1.c % value2)) : 0);
+if(!exp->expType)
{
-if((!typeDecl || typeDecl->type == 1))
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UCharMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Symbol * classSym = spec->__anon1.__anon1.symbol;
+unsigned char value2 = op2->__anon1.uc;
-symbol->_class = classSym->__anon1.registered;
-if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar(value2 ? ((unsigned char)(op1->__anon1.uc % value2)) : 0);
+if(!exp->expType)
{
-DeclareStruct(spec->__anon1.__anon1.name, 0x0);
-simple = 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int IntNeg(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((-op1->__anon1.i));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!simple)
-d = PlugDeclarator(typeDecl, d);
-else
+
+static unsigned int UIntNeg(struct Expression * exp, struct Operand * op1)
{
-ListAdd(params, MkTypeName(specifiers, PlugDeclarator(typeDecl, MkDeclaratorIdentifier(MkIdentifier("value")))));
-specifiers = MkList();
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(-op1->__anon1.ui));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-d = MkDeclaratorFunction(d, params);
-if(dllImport)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(EXTERN));
-else if(prop->_class->symbol && ((struct Symbol *)prop->_class->symbol)->isStatic)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC));
-if(simple)
-ListAdd(specifiers, MkSpecifier(VOID));
-ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
-decl = MkDeclaration(specifiers, declarators);
-external = MkExternalDeclaration(decl);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
-external->symbol = symbol;
-symbol->__anon2.__anon2.externalGet = external;
-ReplaceThisClassSpecifiers(specifiers, prop->_class);
-if(typeDecl)
-FreeDeclarator(typeDecl);
+return 1;
}
-else
+
+static unsigned int Int64Neg(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((-op1->__anon1.i64));
+if(!exp->expType)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon2.externalGet, curExternal->prev);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(prop->Set)
+
+static unsigned int UInt64Neg(struct Expression * exp, struct Operand * op1)
{
-if(!symbol->__anon2.__anon2.externalSet || symbol->__anon2.__anon2.externalSet->type == 0)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(-op1->__anon1.ui64));
+if(!exp->expType)
{
-struct Declaration * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-struct Declarator * d;
-struct __ecereNameSpace__ecere__sys__OldList * params;
-struct Specifier * spec;
-struct External * external;
-struct Declarator * typeDecl;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-declarators = MkList();
-params = MkList();
-if(!prop->conversion || prop->_class->type == 1)
+static unsigned int ShortNeg(struct Expression * exp, struct Operand * op1)
{
-ListAdd(params, MkTypeName(MkListOne(MkSpecifierName(prop->_class->fullName)), MkDeclaratorIdentifier(MkIdentifier("this"))));
-}
-specifiers = MkList();
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((-op1->__anon1.s));
+if(!exp->expType)
{
-struct Context * context = SetupTemplatesContext(prop->_class);
-
-typeDecl = d = SpecDeclFromString(prop->dataTypeString, specifiers, MkDeclaratorIdentifier(MkIdentifier("value")));
-FinishTemplatesContext(context);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(!strcmp(prop->_class->base->fullName, "eda::Row") || !strcmp(prop->_class->base->fullName, "eda::Id"))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(CONST));
-ListAdd(params, MkTypeName(specifiers, d));
-d = MkDeclaratorIdentifier(MkIdentifier(setName));
-if(dllImport)
-d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
-d = MkDeclaratorFunction(d, params);
-for(spec = (*specifiers).first; spec; spec = spec->next)
-{
-if(spec->type == 1)
+return 1;
+}
+
+static unsigned int UShortNeg(struct Expression * exp, struct Operand * op1)
{
-if((!typeDecl || typeDecl->type == 1))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(-op1->__anon1.us));
+if(!exp->expType)
{
-struct Symbol * classSym = spec->__anon1.__anon1.symbol;
-
-symbol->_class = classSym->__anon1.registered;
-if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1)
-DeclareStruct(spec->__anon1.__anon1.name, 0x0);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int CharNeg(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((-op1->__anon1.c));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
-specifiers = MkList();
-if(dllImport)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(EXTERN));
-else if(prop->_class->symbol && ((struct Symbol *)prop->_class->symbol)->isStatic)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC));
-if(!prop->conversion || prop->_class->type == 1)
-ListAdd(specifiers, MkSpecifier(VOID));
-else
-ListAdd(specifiers, MkSpecifierName(prop->_class->fullName));
-decl = MkDeclaration(specifiers, declarators);
-external = MkExternalDeclaration(decl);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
-external->symbol = symbol;
-symbol->__anon2.__anon2.externalSet = external;
-ReplaceThisClassSpecifiers(specifiers, prop->_class);
+return 1;
}
-else
+
+static unsigned int UCharNeg(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(-op1->__anon1.uc));
+if(!exp->expType)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon2.externalSet, curExternal->prev);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!symbol->__anon2.__anon2.externalPtr)
-{
-struct Declaration * decl;
-struct External * external;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers = MkList();
-char propName[1024];
-if(imported)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(EXTERN));
-else
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC));
-ListAdd(specifiers, MkSpecifierName("Property"));
-strcpy(propName, "__ecereProp_");
-FullClassNameCat(propName, prop->_class->fullName, 0x0);
-strcat(propName, "_");
-FullClassNameCat(propName, prop->name, 0x1);
+static unsigned int FloatNeg(struct Expression * exp, struct Operand * op1)
{
-struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
-
-ListAdd(list, MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier(propName))), (((void *)0))));
-if(!imported)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(-op1->__anon1.f));
+if(!exp->expType)
{
-strcpy(propName, "__ecerePropM_");
-FullClassNameCat(propName, prop->_class->fullName, 0x0);
-strcat(propName, "_");
-FullClassNameCat(propName, prop->name, 0x1);
-ListAdd(list, MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier(propName))), (((void *)0))));
-}
-decl = MkDeclaration(specifiers, list);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-external = MkExternalDeclaration(decl);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
-external->symbol = symbol;
-symbol->__anon2.__anon2.externalPtr = external;
+return 1;
}
-else
+
+static unsigned int DoubleNeg(struct Expression * exp, struct Operand * op1)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon2.externalPtr, curExternal->prev);
-}
-symbol->id = curExternal->symbol->idCode;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(-op1->__anon1.d));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-struct Type * Dereference(struct Type * source)
+static unsigned int IntInc(struct Expression * exp, struct Operand * op1)
{
-struct Type * type = (((void *)0));
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((++op1->__anon1.i));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(source)
+static unsigned int UIntInc(struct Expression * exp, struct Operand * op1)
{
-if(source->kind == 13 || source->kind == 12)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((++op1->__anon1.ui));
+if(!exp->expType)
{
-type = source->__anon1.type;
-source->__anon1.type->refCount++;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(source->kind == 8 && !strcmp(source->__anon1._class->string, "String"))
-{
-type = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->kind = 1, __ecereInstance1->refCount = 1, __ecereInstance1;
-});
+return 1;
}
-else if(source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 5)
+
+static unsigned int Int64Inc(struct Expression * exp, struct Operand * op1)
{
-type = source;
-source->refCount++;
-}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot dereference type\n", (((void *)0))));
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((++op1->__anon1.i64));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return type;
+return 1;
}
-static struct Type * Reference(struct Type * source)
+static unsigned int UInt64Inc(struct Expression * exp, struct Operand * op1)
{
-struct Type * type = (((void *)0));
-
-if(source)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((++op1->__anon1.ui64));
+if(!exp->expType)
{
-type = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = source, __ecereInstance1->refCount = 1, __ecereInstance1;
-});
-source->refCount++;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return type;
+return 1;
}
-extern void __ecereNameSpace__ecere__com__eClass_FindNextMember(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos);
-
-extern void * memcpy(void * , const void * , size_t size);
-
-void ProcessMethodType(struct __ecereNameSpace__ecere__com__Method * method);
-
-extern void FreeExpression(struct Expression * exp);
-
-extern void __ecereNameSpace__ecere__sys__ChangeCh(char * string, char ch1, char ch2);
-
-unsigned int MatchTypes(struct Type * source, struct Type * dest, struct __ecereNameSpace__ecere__sys__OldList * conversions, struct __ecereNameSpace__ecere__com__Class * owningClassSource, struct __ecereNameSpace__ecere__com__Class * owningClassDest, unsigned int doConversion, unsigned int enumBaseType, unsigned int acceptReversedParams, unsigned int isConversionExploration, unsigned int warnConst);
-
-static void ProcessInitializer(struct Initializer * init, struct Type * type);
-
-extern struct Type * MkClassType(const char * name);
-
-extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere__com__eClass_AddDataMember(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, unsigned int size, unsigned int alignment, int declMode);
-
-void ProcessMemberInitData(struct MemberInit * member, struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos)
+static unsigned int ShortInc(struct Expression * exp, struct Operand * op1)
{
-struct Identifier * ident = member->identifiers ? (*member->identifiers).first : (((void *)0));
-unsigned int found = 0x0;
-struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0));
-struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
-unsigned int freeType = 0x0;
-
-yylloc = member->loc;
-if(!ident)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((++op1->__anon1.s));
+if(!exp->expType)
{
-if(curMember)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UShortInc(struct Expression * exp, struct Operand * op1)
{
-__ecereNameSpace__ecere__com__eClass_FindNextMember(_class, curClass, curMember, subMemberStack, subMemberStackPos);
-if(*curMember)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((++op1->__anon1.us));
+if(!exp->expType)
{
-found = 0x1;
-dataMember = *curMember;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else
-{
-struct __ecereNameSpace__ecere__com__DataMember * thisMember = (struct __ecereNameSpace__ecere__com__DataMember *)__ecereNameSpace__ecere__com__eClass_FindProperty(_class, ident->string, privateModule);
-struct __ecereNameSpace__ecere__com__DataMember * _subMemberStack[256];
-int _subMemberStackPos = 0;
-if(!thisMember)
-thisMember = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, ident->string, privateModule, _subMemberStack, &_subMemberStackPos);
-if(thisMember)
+static unsigned int CharInc(struct Expression * exp, struct Operand * op1)
{
-dataMember = thisMember;
-if(curMember && thisMember->memberAccess == 1)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((++op1->__anon1.c));
+if(!exp->expType)
{
-*curMember = thisMember;
-*curClass = thisMember->_class;
-memcpy(subMemberStack, _subMemberStack, sizeof(struct __ecereNameSpace__ecere__com__DataMember *) * _subMemberStackPos);
-*subMemberStackPos = _subMemberStackPos;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-found = 0x1;
+return 1;
}
-else
+
+static unsigned int UCharInc(struct Expression * exp, struct Operand * op1)
{
-method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, ident->string, privateModule);
-if(method && method->type == 1)
-found = 0x1;
-else
-method = (((void *)0));
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((++op1->__anon1.uc));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(found)
-{
-struct Type * type = (((void *)0));
-if(dataMember)
+static unsigned int FloatInc(struct Expression * exp, struct Operand * op1)
{
-if(!dataMember->dataType && dataMember->dataTypeString)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(++op1->__anon1.f));
+if(!exp->expType)
{
-struct Context * context = SetupTemplatesContext(_class);
-
-dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0);
-FinishTemplatesContext(context);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-type = dataMember->dataType;
+return 1;
}
-else if(method)
+
+static unsigned int DoubleInc(struct Expression * exp, struct Operand * op1)
{
-if(!method->dataType)
-ProcessMethodType(method);
-type = method->dataType;
-}
-if(ident && ident->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(++op1->__anon1.d));
+if(!exp->expType)
{
-for(ident = ident->next; ident && type; ident = ident->next)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int IntDec(struct Expression * exp, struct Operand * op1)
{
-if(type->kind == 8)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((--op1->__anon1.i));
+if(!exp->expType)
{
-dataMember = (struct __ecereNameSpace__ecere__com__DataMember *)__ecereNameSpace__ecere__com__eClass_FindProperty(type->__anon1._class->__anon1.registered, ident->string, privateModule);
-if(!dataMember)
-dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMember(type->__anon1._class->__anon1.registered, ident->string, privateModule, (((void *)0)), (((void *)0)));
-if(dataMember)
-type = dataMember->dataType;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(type->kind == 9 || type->kind == 10)
+return 1;
+}
+
+static unsigned int UIntDec(struct Expression * exp, struct Operand * op1)
{
-struct Type * memberType;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((--op1->__anon1.ui));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
+static unsigned int Int64Dec(struct Expression * exp, struct Operand * op1)
{
-if(!strcmp(memberType->name, ident->string))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((--op1->__anon1.i64));
+if(!exp->expType)
{
-type = memberType;
-break;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UInt64Dec(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((--op1->__anon1.ui64));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(type && type->kind == 20 && type->__anon1.templateParameter->type == 0 && _class->templateArgs)
-{
-int id = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * sClass;
-for(sClass = _class; sClass; sClass = sClass->base)
+static unsigned int ShortDec(struct Expression * exp, struct Operand * op1)
{
-id = 0;
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((--op1->__anon1.s));
+if(!exp->expType)
{
-if(curParam->type == 0 && !strcmp(type->__anon1.templateParameter->identifier->string, curParam->name))
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UShortDec(struct Expression * exp, struct Operand * op1)
{
-for(sClass = sClass->base; sClass; sClass = sClass->base)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((--op1->__anon1.us));
+if(!exp->expType)
{
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-id += sClass->templateParams.count;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-break;
+return 1;
}
-id++;
+
+static unsigned int CharDec(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((--op1->__anon1.c));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(curParam)
-break;
+return 1;
}
-if(curParam)
-{
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = _class->templateArgs[id];
-if(arg.__anon1.__anon1.dataTypeString)
+static unsigned int UCharDec(struct Expression * exp, struct Operand * op1)
{
-unsigned int constant = type->constant;
-
-type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0);
-if(type->kind == 8 && constant)
-type->constant = 0x1;
-else if(type->kind == 13)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((--op1->__anon1.uc));
+if(!exp->expType)
{
-struct Type * t = type->__anon1.type;
-
-while(t->kind == 13)
-t = t->__anon1.type;
-if(constant)
-t->constant = constant;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-freeType = 0x1;
-if(type && _class->templateClass)
-type->passAsTemplate = 0x1;
-if(type)
+return 1;
+}
+
+static unsigned int FloatDec(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(--op1->__anon1.f));
+if(!exp->expType)
{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int DoubleDec(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(--op1->__anon1.d));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(type && type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered && strchr(type->__anon1._class->__anon1.registered->fullName, '<'))
+
+static unsigned int IntAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Class * expClass = type->__anon1._class->__anon1.registered;
-struct __ecereNameSpace__ecere__com__Class * cClass = (((void *)0));
-int paramCount = 0;
-int lastParam = -1;
-char templateString[1024];
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
+int value2 = op2->__anon1.i;
-sprintf(templateString, "%s<", expClass->templateClass->fullName);
-for(cClass = expClass; cClass; cClass = cClass->base)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i = value2));
+if(!exp->expType)
{
-int p = 0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(cClass->templateClass)
-cClass = cClass->templateClass;
-for(param = cClass->templateParams.first; param; param = param->next)
+static unsigned int UIntAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int id = p;
-struct __ecereNameSpace__ecere__com__Class * sClass;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg;
+unsigned int value2 = op2->__anon1.ui;
-for(sClass = cClass->base; sClass; sClass = sClass->base)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui = value2));
+if(!exp->expType)
{
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-id += sClass->templateParams.count;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-arg = expClass->templateArgs[id];
-for(sClass = _class; sClass; sClass = sClass->base)
+return 1;
+}
+
+static unsigned int Int64Asign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * cParam;
-int p = 0;
-struct __ecereNameSpace__ecere__com__Class * nextClass;
+long long value2 = op2->__anon1.i64;
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-for(nextClass = sClass->base; nextClass; nextClass = nextClass->base)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 = value2));
+if(!exp->expType)
{
-if(nextClass->templateClass)
-nextClass = nextClass->templateClass;
-p += nextClass->templateParams.count;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-for(cParam = sClass->templateParams.first; cParam; cParam = cParam->next, p++)
-{
-if(cParam->type == 0 && arg.__anon1.__anon1.dataTypeString && !strcmp(cParam->name, arg.__anon1.__anon1.dataTypeString))
+return 1;
+}
+
+static unsigned int UInt64Asign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(_class->templateArgs && arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 = value2));
+if(!exp->expType)
{
-arg.__anon1.__anon1.dataTypeString = _class->templateArgs[p].__anon1.__anon1.dataTypeString;
-arg.__anon1.__anon1.dataTypeClass = _class->templateArgs[p].__anon1.__anon1.dataTypeClass;
-break;
-}
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-{
-char argument[256];
-argument[0] = '\0';
-switch(param->type)
-{
-case 2:
+static unsigned int ShortAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char expString[1024];
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
-struct Expression * exp;
-char * string = PrintHexUInt64(arg.__anon1.expression.__anon1.ui64);
+short value2 = op2->__anon1.s;
-exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
-(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
-ProcessExpressionType(exp);
-ComputeExpression(exp);
-expString[0] = '\0';
-PrintExpression(exp, expString);
-strcat(argument, expString);
-FreeExpression(exp);
-break;
-}
-case 1:
-{
-strcat(argument, arg.__anon1.__anon2.__anon1.member->name);
-break;
-}
-case 0:
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s = value2));
+if(!exp->expType)
{
-if(arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
-strcat(argument, arg.__anon1.__anon1.dataTypeString);
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(argument[0])
+
+static unsigned int UShortAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(paramCount)
-strcat(templateString, ", ");
-if(lastParam != p - 1)
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us = value2));
+if(!exp->expType)
{
-strcat(templateString, param->name);
-strcat(templateString, " = ");
-}
-strcat(templateString, argument);
-paramCount++;
-lastParam = p;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-p++;
+return 1;
}
+
+static unsigned int CharAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c = value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UCharAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int len = strlen(templateString);
+unsigned char value2 = op2->__anon1.uc;
-if(templateString[len - 1] == '<')
-len--;
-else
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc = value2));
+if(!exp->expType)
{
-if(templateString[len - 1] == '>')
-templateString[len++] = ' ';
-templateString[len++] = '>';
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-templateString[len++] = '\0';
+return 1;
}
+
+static unsigned int FloatAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Context * context = SetupTemplatesContext(_class);
+float value2 = op2->__anon1.f;
-if(freeType)
-FreeType(type);
-type = ProcessTypeString(templateString, 0x0);
-freeType = 0x1;
-FinishTemplatesContext(context);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f = value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(method && member->initializer && member->initializer->type == 0 && member->initializer->__anon1.exp)
-{
-ProcessExpressionType(member->initializer->__anon1.exp);
-if(!member->initializer->__anon1.exp->expType)
-{
-if(inCompiler)
+
+static unsigned int DoubleAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char expString[10240];
+double value2 = op2->__anon1.d;
-expString[0] = '\0';
-PrintExpression(member->initializer->__anon1.exp, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved symbol used as an instance method %s\n", (((void *)0))), expString);
-}
-}
-else if(!MatchTypes(member->initializer->__anon1.exp->expType, type, (((void *)0)), (((void *)0)), _class, 0x1, 0x1, 0x0, 0x0, 0x1))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d = value2));
+if(!exp->expType)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible instance method %s\n", (((void *)0))), ident->string);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else if(member->initializer)
+
+static unsigned int IntAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-ProcessInitializer(member->initializer, type);
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i += value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(freeType)
-FreeType(type);
+return 1;
}
-else
-{
-if(_class && _class->type == 3)
-{
-if(member->initializer)
+
+static unsigned int UIntAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * type = MkClassType(_class->fullName);
+unsigned int value2 = op2->__anon1.ui;
-ProcessInitializer(member->initializer, type);
-FreeType(type);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui += value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else
+
+static unsigned int Int64AddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(member->initializer)
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 += value2));
+if(!exp->expType)
{
-ProcessInitializer(member->initializer, (((void *)0)));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(ident)
-{
-if(method)
-{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find virtual method %s in class %s\n", (((void *)0))), ident->string, _class->fullName);
+return 1;
}
-else if(_class)
+
+static unsigned int UInt64AddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find member %s in class %s\n", (((void *)0))), ident->string, _class->fullName);
-if(inCompiler)
-__ecereNameSpace__ecere__com__eClass_AddDataMember(_class, ident->string, "int", 0, 0, 1);
-}
-}
-else if(_class)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many initializers for instantiation of class %s\n", (((void *)0))), _class->fullName);
-}
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 += value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-extern struct External * ProcessClassFunction(struct __ecereNameSpace__ecere__com__Class * owningClass, struct ClassFunction * func, struct __ecereNameSpace__ecere__sys__OldList * defs, struct External * after, unsigned int makeStatic);
-
-extern void FreeSpecifier(struct Specifier * spec);
-
-static void ProcessFunction(struct FunctionDefinition * function);
-
-extern struct __ecereNameSpace__ecere__sys__OldList * CopyList(struct __ecereNameSpace__ecere__sys__OldList * source, void * (* CopyFunction)(void * ));
-
-extern struct Specifier * CopySpecifier(struct Specifier * spec);
-
-extern struct Declarator * CopyDeclarator(struct Declarator * declarator);
-
-extern void FreeClassFunction(struct ClassFunction * func);
-
-extern struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer);
-
-extern struct Initializer * MkInitializerAssignment(struct Expression * exp);
-
-void ProcessInstantiationType(struct Instantiation * inst)
-{
-yylloc = inst->loc;
-if(inst->_class)
+static unsigned int ShortAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct MembersInit * members;
-struct Symbol * classSym;
-struct __ecereNameSpace__ecere__com__Class * _class;
+short value2 = op2->__anon1.s;
-classSym = inst->_class->__anon1.__anon1.symbol;
-_class = classSym ? classSym->__anon1.registered : (((void *)0));
-if(!_class || _class->type != 5)
-DeclareStruct(inst->_class->__anon1.__anon1.name, 0x0);
-afterExternal = afterExternal ? afterExternal : curExternal;
-if(inst->exp)
-ProcessExpressionType(inst->exp);
-inst->isConstant = 0x1;
-if(inst->members)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s += value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256];
-int subMemberStackPos = 0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(members = (*inst->members).first; members; members = members->next)
-{
-switch(members->type)
-{
-case 1:
+static unsigned int UShortAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char name[1024];
-static unsigned int instMethodID = 0;
-struct External * external = curExternal;
-struct Context * context = curContext;
-struct Declarator * declarator = members->__anon1.function->declarator;
-struct Identifier * nameID = GetDeclId(declarator);
-char * unmangled = nameID ? nameID->string : (((void *)0));
-struct Expression * exp;
-struct External * createdExternal = (((void *)0));
+unsigned short value2 = op2->__anon1.us;
-if(inCompiler)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us += value2));
+if(!exp->expType)
{
-char number[16];
-
-strcpy(name, "__ecereInstMeth_");
-FullClassNameCat(name, _class ? _class->fullName : "_UNKNOWNCLASS", 0x0);
-strcat(name, "_");
-strcat(name, nameID->string);
-strcat(name, "_");
-sprintf(number, "_%08d", instMethodID++);
-strcat(name, number);
-nameID->string = __ecereNameSpace__ecere__sys__CopyString(name);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-if(declarator)
-{
-struct Symbol * symbol = declarator->symbol;
-struct __ecereNameSpace__ecere__com__Method * method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, unmangled, privateModule);
-if(method && method->type == 1)
-{
-symbol->__anon1.method = method;
-ProcessMethodType(method);
-if(!symbol->type->__anon1.__anon2.thisClass)
-{
-if(method->dataType->__anon1.__anon2.thisClass && currentClass && __ecereNameSpace__ecere__com__eClass_IsDerived(currentClass, method->dataType->__anon1.__anon2.thisClass->__anon1.registered))
+static unsigned int CharAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!currentClass->symbol)
-currentClass->symbol = FindClass(currentClass->fullName);
-symbol->type->__anon1.__anon2.thisClass = currentClass->symbol;
-}
-else
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c += value2));
+if(!exp->expType)
{
-if(!_class->symbol)
-_class->symbol = FindClass(_class->fullName);
-symbol->type->__anon1.__anon2.thisClass = _class->symbol;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-DeclareType(symbol->type, 0x1, 0x1);
+return 1;
}
-else if(classSym)
+
+static unsigned int UCharAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find virtual method %s in class %s\n", (((void *)0))), unmangled, classSym->string);
-}
-}
-createdExternal = ProcessClassFunction(classSym ? classSym->__anon1.registered : (((void *)0)), members->__anon1.function, ast, afterExternal, 0x1);
-if(nameID)
+unsigned char value2 = op2->__anon1.uc;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc += value2));
+if(!exp->expType)
{
-FreeSpecifier(nameID->_class);
-nameID->_class = (((void *)0));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-if(inCompiler)
-{
-struct External * oldExternal = curExternal;
-declarator->symbol->id = declarator->symbol->idCode = curExternal->symbol->idCode;
+static unsigned int FloatAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct External * externalDecl;
+float value2 = op2->__anon1.f;
-externalDecl = MkExternalDeclaration((((void *)0)));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), oldExternal->prev, externalDecl);
-if(createdExternal->__anon1.function)
-{
-ProcessFunction(createdExternal->__anon1.function);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f += value2));
+if(!exp->expType)
{
-struct Declaration * decl = MkDeclaration(CopyList(createdExternal->__anon1.function->specifiers, CopySpecifier), MkListOne(MkInitDeclarator(CopyDeclarator(declarator), (((void *)0)))));
-
-externalDecl->__anon1.declaration = decl;
-if(decl->symbol && !decl->symbol->__anon2.__anon1.pointerExternal)
-decl->symbol->__anon2.__anon1.pointerExternal = externalDecl;
-declarator->symbol->__anon2.__anon1.pointerExternal = externalDecl;
-}
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else if(declarator)
+
+static unsigned int DoubleAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-curExternal = declarator->symbol->__anon2.__anon1.pointerExternal;
-ProcessFunction((struct FunctionDefinition *)members->__anon1.function);
-}
-curExternal = external;
-curContext = context;
-if(inCompiler)
+double value2 = op2->__anon1.d;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d += value2));
+if(!exp->expType)
{
-FreeClassFunction(members->__anon1.function);
-exp = QMkExpId(name);
-members->type = 0;
-members->__anon1.dataMembers = MkListOne(MkMemberInit(MkListOne(MkIdentifier(unmangled)), MkInitializerAssignment(exp)));
-(__ecereNameSpace__ecere__com__eSystem_Delete(unmangled), unmangled = 0);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-break;
+return 1;
}
-case 0:
-{
-if(members->__anon1.dataMembers && classSym)
+
+static unsigned int IntSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct MemberInit * member;
-struct Location oldyyloc = yylloc;
+int value2 = op2->__anon1.i;
-for(member = (*members->__anon1.dataMembers).first; member; member = member->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i -= value2));
+if(!exp->expType)
{
-ProcessMemberInitData(member, classSym->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos);
-if(member->initializer && !member->initializer->isConstant)
-inst->isConstant = 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-yylloc = oldyyloc;
+return 1;
}
-break;
+
+static unsigned int UIntSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui -= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int Int64SubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 -= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UInt64SubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 -= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-static void DeclareType(struct Type * type, unsigned int declarePointers, unsigned int declareParams)
+static unsigned int ShortSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(inCompiler)
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s -= value2));
+if(!exp->expType)
{
-if(type->kind == 11)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UShortSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * param;
+unsigned short value2 = op2->__anon1.us;
-if(declareParams)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us -= value2));
+if(!exp->expType)
{
-for(param = type->__anon1.__anon2.params.first; param; param = param->next)
-DeclareType(param, declarePointers, 0x1);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-DeclareType(type->__anon1.__anon2.returnType, declarePointers, 0x1);
+return 1;
}
-else if(type->kind == 13 && declarePointers)
-DeclareType(type->__anon1.type, declarePointers, 0x0);
-else if(type->kind == 8)
+
+static unsigned int CharSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c -= value2));
+if(!exp->expType)
{
-if(type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 1 || type->__anon1._class->__anon1.registered->type == 5) && !type->__anon1._class->declaring)
-DeclareStruct(type->__anon1._class->__anon1.registered->fullName, type->__anon1._class->__anon1.registered->type == 5);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(type->kind == 9 || type->kind == 10)
+return 1;
+}
+
+static unsigned int UCharSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * member;
+unsigned char value2 = op2->__anon1.uc;
-for(member = type->__anon1.__anon1.members.first; member; member = member->next)
-DeclareType(member, 0x0, 0x0);
-}
-else if(type->kind == 12)
-DeclareType(type->__anon1.__anon4.arrayType, declarePointers, 0x0);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc -= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
+static unsigned int FloatSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+float value2 = op2->__anon1.f;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument * FindTemplateArg(struct __ecereNameSpace__ecere__com__Class * _class, struct TemplateParameter * param)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f -= value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument * arg = (((void *)0));
-int id = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * sClass;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(sClass = _class; sClass; sClass = sClass->base)
+static unsigned int DoubleSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-id = 0;
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+double value2 = op2->__anon1.d;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d -= value2));
+if(!exp->expType)
{
-if(curParam->type == 0 && !strcmp(param->identifier->string, curParam->name))
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int IntMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-for(sClass = sClass->base; sClass; sClass = sClass->base)
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i *= value2));
+if(!exp->expType)
{
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-id += sClass->templateParams.count;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-break;
+return 1;
}
-id++;
+
+static unsigned int UIntMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui *= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(curParam)
-break;
+return 1;
}
-if(curParam)
+
+static unsigned int Int64MulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-arg = &_class->templateArgs[id];
-if(arg && param->type == 0)
-(*arg).__anon1.__anon1.dataTypeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, (*arg).__anon1.__anon1.dataTypeString);
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 *= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return arg;
+return 1;
}
-extern struct Context * PushContext(void);
+static unsigned int UInt64MulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+uint64 value2 = op2->__anon1.ui64;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplatedType;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 *= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-struct TemplatedType
+static unsigned int ShortMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-uintptr_t key;
-struct __ecereNameSpace__ecere__sys__BTNode * parent;
-struct __ecereNameSpace__ecere__sys__BTNode * left;
-struct __ecereNameSpace__ecere__sys__BTNode * right;
-int depth;
-struct TemplateParameter * param;
-} __attribute__ ((gcc_struct));
+short value2 = op2->__anon1.s;
-unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(struct __ecereNameSpace__ecere__sys__BinaryTree * this, struct __ecereNameSpace__ecere__sys__BTNode * node);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s *= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-struct Context * SetupTemplatesContext(struct __ecereNameSpace__ecere__com__Class * _class)
+static unsigned int UShortMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Context * context = PushContext();
+unsigned short value2 = op2->__anon1.us;
-context->templateTypesOnly = 0x1;
-if(_class->symbol && ((struct Symbol *)_class->symbol)->templateParams)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us *= value2));
+if(!exp->expType)
{
-struct TemplateParameter * param = (*((struct Symbol *)_class->symbol)->templateParams).first;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(; param; param = param->next)
-{
-if(param->type == 0 && param->identifier)
+static unsigned int CharMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (uintptr_t)param->identifier->string, type->param = param, type);
+char value2 = op2->__anon1.c;
-__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type);
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c *= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else if(_class)
-{
-struct __ecereNameSpace__ecere__com__Class * sClass;
-for(sClass = _class; sClass; sClass = sClass->base)
+static unsigned int UCharMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * p;
+unsigned char value2 = op2->__anon1.uc;
-for(p = sClass->templateParams.first; p; p = p->next)
-{
-if(p->type == 0)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc *= value2));
+if(!exp->expType)
{
-struct TemplateParameter * param = p->param;
-struct TemplatedType * type;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!param)
+static unsigned int FloatMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-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->__anon1.dataTypeString, __ecereInstance1;
-});
-}
-type = __extension__ ({
-struct TemplatedType * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType);
+float value2 = op2->__anon1.f;
-__ecereInstance1->key = (uintptr_t)p->name, __ecereInstance1->param = param, __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type);
-}
-}
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f *= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return context;
+return 1;
}
-extern void PopContext(struct Context * ctx);
-
-extern void FreeContext(struct Context * context);
+static unsigned int DoubleMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+double value2 = op2->__anon1.d;
-void FinishTemplatesContext(struct Context * context)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d *= value2));
+if(!exp->expType)
{
-PopContext(context);
-FreeContext(context);
-((context ? (__ecereClass_Context->Destructor ? __ecereClass_Context->Destructor((void *)context) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(context)) : 0), context = 0);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-void ProcessMethodType(struct __ecereNameSpace__ecere__com__Method * method)
+static unsigned int IntDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!method->dataType)
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt(value2 ? ((op1->__anon1.i /= value2)) : 0);
+if(!exp->expType)
{
-struct Context * context = SetupTemplatesContext(method->_class);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-method->dataType = ProcessTypeString(method->dataTypeString, 0x0);
-FinishTemplatesContext(context);
-if(method->type != 1 && method->dataType)
+static unsigned int UIntDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!method->dataType->__anon1.__anon2.thisClass && !method->dataType->__anon1.__anon2.staticMethod)
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt(value2 ? ((op1->__anon1.ui /= value2)) : 0);
+if(!exp->expType)
{
-if(!method->_class->symbol)
-method->_class->symbol = FindClass(method->_class->fullName);
-method->dataType->__anon1.__anon2.thisClass = method->_class->symbol;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int Int64DivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64(value2 ? ((op1->__anon1.i64 /= value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-void ProcessPropertyType(struct __ecereNameSpace__ecere__com__Property * prop)
-{
-if(!prop->dataType)
+static unsigned int UInt64DivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Context * context = SetupTemplatesContext(prop->_class);
+uint64 value2 = op2->__anon1.ui64;
-prop->dataType = ProcessTypeString(prop->dataTypeString, 0x0);
-FinishTemplatesContext(context);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64(value2 ? ((op1->__anon1.ui64 /= value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-extern struct Declarator * GetFuncDecl(struct Declarator * decl);
+static unsigned int ShortDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+short value2 = op2->__anon1.s;
-extern void FreeTypeName(struct TypeName * typeName);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort(value2 ? ((op1->__anon1.s /= value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-static void ProcessDeclarator(struct Declarator * decl);
+static unsigned int UShortDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned short value2 = op2->__anon1.us;
-extern struct __ecereNameSpace__ecere__sys__OldList * excludedSymbols;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort(value2 ? ((op1->__anon1.us /= value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MethodImport;
+static unsigned int CharDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
-struct MethodImport
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar(value2 ? ((op1->__anon1.c /= value2)) : 0);
+if(!exp->expType)
{
-struct MethodImport * prev;
-struct MethodImport * next;
-char * name;
-unsigned int isVirtual;
-} __attribute__ ((gcc_struct));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
+static unsigned int UCharDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned char value2 = op2->__anon1.uc;
-void DeclareMethod(struct __ecereNameSpace__ecere__com__Method * method, const char * name)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar(value2 ? ((op1->__anon1.uc /= value2)) : 0);
+if(!exp->expType)
{
-struct Symbol * symbol = method->symbol;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!symbol || (!symbol->__anon2.__anon1.pointerExternal && method->type == 1) || symbol->id > (curExternal ? curExternal->symbol->idCode : -1))
+static unsigned int FloatDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int dllImport = 0x0;
+float value2 = op2->__anon1.f;
-if(!method->dataType)
-method->dataType = ProcessTypeString(method->dataTypeString, 0x0);
-if(!symbol || symbol->_import || method->type == 1)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f /= value2));
+if(!exp->expType)
{
-if(!symbol || method->type == 1)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int DoubleDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Symbol * classSym;
+double value2 = op2->__anon1.d;
-if(!method->_class->symbol)
-method->_class->symbol = FindClass(method->_class->fullName);
-classSym = method->_class->symbol;
-if(!classSym->_import)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d /= value2));
+if(!exp->expType)
{
-struct ModuleImport * module;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(method->_class->module && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)method->_class->module + structSize_Instance)))->name)
-module = FindModule(method->_class->module);
-else
-module = mainModule;
-classSym->_import = __extension__ ({
-struct ClassImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassImport);
+static unsigned int IntModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+int value2 = op2->__anon1.i;
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(method->_class->fullName), __ecereInstance1->isRemote = method->_class->isRemote, __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->classes, classSym->_import);
-}
-if(!symbol)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt(value2 ? ((op1->__anon1.i %= value2)) : 0);
+if(!exp->expType)
{
-symbol = method->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(!symbol->_import)
+return 1;
+}
+
+static unsigned int UIntModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-symbol->_import = (struct ClassImport *)__extension__ ({
-struct MethodImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MethodImport);
+unsigned int value2 = op2->__anon1.ui;
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(method->name), __ecereInstance1->isVirtual = method->type == 1, __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classSym->_import->methods, symbol->_import);
-}
-if(!symbol)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt(value2 ? ((op1->__anon1.ui %= value2)) : 0);
+if(!exp->expType)
{
-symbol->type = method->dataType;
-if(symbol->type)
-symbol->type->refCount++;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!method->dataType->dllExport)
+
+static unsigned int Int64ModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64(value2 ? ((op1->__anon1.i64 %= value2)) : 0);
+if(!exp->expType)
{
-if((method->_class->module != privateModule || !strcmp(method->_class->name, "float") || !strcmp(method->_class->name, "double")) && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)method->_class->module + structSize_Instance)))->importType != 1)
-dllImport = 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(method->type != 1 && method->dataType)
-DeclareType(method->dataType, 0x1, 0x1);
-if(!symbol->__anon2.__anon1.pointerExternal || symbol->__anon2.__anon1.pointerExternal->type == 0)
+
+static unsigned int UInt64ModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Declaration * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-struct Declarator * d;
-struct Declarator * funcDecl;
-struct External * external;
+uint64 value2 = op2->__anon1.ui64;
-specifiers = MkList();
-declarators = MkList();
-if(dllImport)
-ListAdd(specifiers, MkSpecifier(EXTERN));
-else if(method->_class->symbol && ((struct Symbol *)method->_class->symbol)->isStatic)
-ListAdd(specifiers, MkSpecifier(STATIC));
-if(method->type == 1)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64(value2 ? ((op1->__anon1.ui64 %= value2)) : 0);
+if(!exp->expType)
{
-ListAdd(specifiers, MkSpecifier(INT));
-d = MkDeclaratorIdentifier(MkIdentifier(name));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
-{
-d = MkDeclaratorIdentifier(MkIdentifier(name));
-if(dllImport)
-d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
-{
-struct Context * context = SetupTemplatesContext(method->_class);
-
-d = SpecDeclFromString(method->dataTypeString, specifiers, d);
-FinishTemplatesContext(context);
+return 1;
}
-funcDecl = GetFuncDecl(d);
-if(dllImport)
-{
-struct Specifier * spec, * next;
-for(spec = (*specifiers).first; spec; spec = next)
+static unsigned int ShortModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-next = spec->next;
-if(spec->type == 5)
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort(value2 ? ((op1->__anon1.s %= value2)) : 0);
+if(!exp->expType)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*specifiers), spec);
-FreeSpecifier(spec);
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(method->dataType && !method->dataType->__anon1.__anon2.staticMethod)
-{
-if(funcDecl && funcDecl->__anon1.function.parameters && (*funcDecl->__anon1.function.parameters).count)
-{
-struct __ecereNameSpace__ecere__com__Class * _class = method->dataType->__anon1.__anon2.thisClass ? method->dataType->__anon1.__anon2.thisClass->__anon1.registered : method->_class;
-struct TypeName * thisParam = MkTypeName(MkListOne(MkSpecifierName(method->dataType->__anon1.__anon2.thisClass ? method->dataType->__anon1.__anon2.thisClass->string : method->_class->fullName)), (_class && _class->type == 1000) ? MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier("this"))) : MkDeclaratorIdentifier(MkIdentifier("this")));
-struct TypeName * firstParam = ((struct TypeName *)(*funcDecl->__anon1.function.parameters).first);
-struct Specifier * firstSpec = firstParam->qualifiers ? (*firstParam->qualifiers).first : (((void *)0));
-if(firstSpec && firstSpec->type == 0 && firstSpec->__anon1.specifier == VOID && !firstParam->declarator)
+static unsigned int UShortModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct TypeName * param = (*funcDecl->__anon1.function.parameters).first;
+unsigned short value2 = op2->__anon1.us;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*funcDecl->__anon1.function.parameters), param);
-FreeTypeName(param);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort(value2 ? ((op1->__anon1.us %= value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(!funcDecl->__anon1.function.parameters)
-funcDecl->__anon1.function.parameters = MkList();
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*funcDecl->__anon1.function.parameters), (((void *)0)), thisParam);
+return 1;
}
+
+static unsigned int CharModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar(value2 ? ((op1->__anon1.c %= value2)) : 0);
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-ProcessDeclarator(d);
-ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
-decl = MkDeclaration(specifiers, declarators);
-ReplaceThisClassSpecifiers(specifiers, method->_class);
-if(symbol->__anon2.__anon1.pointerExternal)
+
+static unsigned int UCharModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Symbol * functionSymbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+unsigned char value2 = op2->__anon1.uc;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar(value2 ? ((op1->__anon1.uc %= value2)) : 0);
+if(!exp->expType)
{
-*functionSymbol = *symbol;
-functionSymbol->string = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
-if(functionSymbol->type)
-functionSymbol->type->refCount++;
-}
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), functionSymbol);
-symbol->__anon2.__anon1.pointerExternal->symbol = functionSymbol;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-external = MkExternalDeclaration(decl);
-if(curExternal)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal ? curExternal->prev : (((void *)0)), external);
-external->symbol = symbol;
-symbol->__anon2.__anon1.pointerExternal = external;
+return 1;
}
-else if(ast)
+
+static unsigned int IntBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon1.pointerExternal, curExternal->prev);
-}
-symbol->id = curExternal ? curExternal->symbol->idCode : (((int)0x7fffffff));
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i & value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-char * ReplaceThisClass(struct __ecereNameSpace__ecere__com__Class * _class)
-{
-if(thisClassParams && _class->templateParams.count && !_class->templateClass)
+static unsigned int UIntBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int first = 0x1;
-int p = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-int lastParam = -1;
-char className[1024];
+unsigned int value2 = op2->__anon1.ui;
-strcpy(className, _class->fullName);
-for(param = _class->templateParams.first; param; param = param->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui & value2));
+if(!exp->expType)
{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int Int64BitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(first)
-strcat(className, "<");
-if(!first)
-strcat(className, ", ");
-if(lastParam + 1 != p)
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 & value2));
+if(!exp->expType)
{
-strcat(className, param->name);
-strcat(className, " = ");
-}
-strcat(className, param->name);
-first = 0x0;
-lastParam = p;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-p++;
+return 1;
}
-if(!first)
+
+static unsigned int UInt64BitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int len = strlen(className);
+uint64 value2 = op2->__anon1.ui64;
-if(className[len - 1] == '>')
-className[len++] = ' ';
-className[len++] = '>';
-className[len++] = '\0';
-}
-return __ecereNameSpace__ecere__sys__CopyString(className);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 & value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
-return __ecereNameSpace__ecere__sys__CopyString(_class->fullName);
+return 1;
}
-struct Type * ReplaceThisClassType(struct __ecereNameSpace__ecere__com__Class * _class)
+static unsigned int ShortBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * type;
+short value2 = op2->__anon1.s;
-if(thisClassParams && _class->templateParams.count && !_class->templateClass)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s & value2));
+if(!exp->expType)
{
-unsigned int first = 0x1;
-int p = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-int lastParam = -1;
-char className[1024];
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-strcpy(className, _class->fullName);
-for(param = _class->templateParams.first; param; param = param->next)
-{
+static unsigned int UShortBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(first)
-strcat(className, "<");
-if(!first)
-strcat(className, ", ");
-if(lastParam + 1 != p)
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us & value2));
+if(!exp->expType)
{
-strcat(className, param->name);
-strcat(className, " = ");
-}
-strcat(className, param->name);
-first = 0x0;
-lastParam = p;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-p++;
+return 1;
}
-if(!first)
+
+static unsigned int CharBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int len = strlen(className);
+char value2 = op2->__anon1.c;
-if(className[len - 1] == '>')
-className[len++] = ' ';
-className[len++] = '>';
-className[len++] = '\0';
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c & value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-type = MkClassType(className);
+return 1;
}
-else
+
+static unsigned int UCharBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-type = MkClassType(_class->fullName);
+unsigned char value2 = op2->__anon1.uc;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc & value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return type;
+return 1;
}
-void ReplaceThisClassSpecifiers(struct __ecereNameSpace__ecere__sys__OldList * specs, struct __ecereNameSpace__ecere__com__Class * _class)
-{
-if(specs != (((void *)0)) && _class)
+static unsigned int IntBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Specifier * spec;
+int value2 = op2->__anon1.i;
-for(spec = specs->first; spec; spec = spec->next)
-{
-if(spec->type == 0 && spec->__anon1.specifier == THISCLASS)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i | value2));
+if(!exp->expType)
{
-spec->type = 1;
-spec->__anon1.__anon1.name = ReplaceThisClass(_class);
-spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name);
-}
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__GlobalFunction;
-
-struct __ecereNameSpace__ecere__com__GlobalFunction
+static unsigned int UIntBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__GlobalFunction * prev;
-struct __ecereNameSpace__ecere__com__GlobalFunction * next;
-const char * name;
-int (* function)();
-struct __ecereNameSpace__ecere__com__Instance * module;
-struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
-const char * dataTypeString;
-struct Type * dataType;
-void * symbol;
-} __attribute__ ((gcc_struct));
-
-extern struct Context * globalContext;
+unsigned int value2 = op2->__anon1.ui;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_FunctionImport;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui | value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-struct FunctionImport
+static unsigned int Int64BitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct FunctionImport * prev;
-struct FunctionImport * next;
-char * name;
-} __attribute__ ((gcc_struct));
+long long value2 = op2->__anon1.i64;
-unsigned int DeclareFunction(struct __ecereNameSpace__ecere__com__GlobalFunction * function, char * name)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 | value2));
+if(!exp->expType)
{
-struct Symbol * symbol = function->symbol;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(curExternal && (!symbol || symbol->id > curExternal->symbol->idCode))
+static unsigned int UInt64BitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int imported = 0x0;
-unsigned int dllImport = 0x0;
+uint64 value2 = op2->__anon1.ui64;
-if(!function->dataType)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 | value2));
+if(!exp->expType)
{
-function->dataType = ProcessTypeString(function->dataTypeString, 0x0);
-if(!function->dataType->__anon1.__anon2.thisClass)
-function->dataType->__anon1.__anon2.staticMethod = 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-if(inCompiler)
-{
-if(!symbol)
-{
-struct ModuleImport * module = FindModule(function->module);
-symbol = function->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-if(module->name)
-{
-if(!function->dataType->dllExport)
+static unsigned int ShortBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-symbol->_import = (struct ClassImport *)__extension__ ({
-struct FunctionImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionImport);
+short value2 = op2->__anon1.s;
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(function->name), __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->functions, symbol->_import);
-}
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s | value2));
+if(!exp->expType)
{
-symbol->type = ProcessTypeString(function->dataTypeString, 0x0);
-if(!symbol->type->__anon1.__anon2.thisClass)
-symbol->type->__anon1.__anon2.staticMethod = 0x1;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-imported = symbol->_import ? 0x1 : 0x0;
-if(imported && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1)
-dllImport = 0x1;
+return 1;
}
-DeclareType(function->dataType, 0x1, 0x1);
-if(inCompiler)
-{
-if(!symbol->__anon2.__anon1.pointerExternal || symbol->__anon2.__anon1.pointerExternal->type == 0)
-{
-struct Declaration * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-struct Declarator * d;
-struct Declarator * funcDecl;
-struct External * external;
-specifiers = MkList();
-declarators = MkList();
-ListAdd(specifiers, MkSpecifier(EXTERN));
-d = MkDeclaratorIdentifier(MkIdentifier(imported ? name : function->name));
-if(dllImport)
-d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
-d = SpecDeclFromString(function->dataTypeString, specifiers, d);
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType == 1)
+static unsigned int UShortBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Specifier * spec;
+unsigned short value2 = op2->__anon1.us;
-for(spec = (*specifiers).first; spec; spec = spec->next)
-if(spec->type == 5 && spec->__anon1.__anon1.extDecl && spec->__anon1.__anon1.extDecl->type == 0 && !strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "dllexport"))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us | value2));
+if(!exp->expType)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*specifiers), spec);
-FreeSpecifier(spec);
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-funcDecl = GetFuncDecl(d);
-if(funcDecl && !funcDecl->__anon1.function.parameters)
+
+static unsigned int CharBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-funcDecl->__anon1.function.parameters = MkList();
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*funcDecl->__anon1.function.parameters), (((void *)0)), MkTypeName(MkListOne(MkSpecifier(VOID)), (((void *)0))));
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c | value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
+return 1;
+}
+
+static unsigned int UCharBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Context * oldCtx = curContext;
+unsigned char value2 = op2->__anon1.uc;
-curContext = globalContext;
-decl = MkDeclaration(specifiers, declarators);
-curContext = oldCtx;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc | value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(symbol->__anon2.__anon1.pointerExternal)
+return 1;
+}
+
+static unsigned int IntBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Symbol * functionSymbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+int value2 = op2->__anon1.i;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i ^ value2));
+if(!exp->expType)
{
-*functionSymbol = *symbol;
-functionSymbol->string = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
-if(functionSymbol->type)
-functionSymbol->type->refCount++;
-}
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), functionSymbol);
-symbol->__anon2.__anon1.pointerExternal->symbol = functionSymbol;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-external = MkExternalDeclaration(decl);
-if(curExternal)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
-external->symbol = symbol;
-symbol->__anon2.__anon1.pointerExternal = external;
+return 1;
}
-else
+
+static unsigned int UIntBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui ^ value2));
+if(!exp->expType)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon1.pointerExternal, curExternal->prev);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(curExternal)
-symbol->id = curExternal->symbol->idCode;
+return 1;
}
+
+static unsigned int Int64BitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 ^ value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return (symbol && symbol->_import && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1) ? 0x1 : 0x0;
+return 1;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_GlobalData;
-
-struct GlobalData
+static unsigned int UInt64BitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-uintptr_t key;
-struct __ecereNameSpace__ecere__sys__BTNode * parent;
-struct __ecereNameSpace__ecere__sys__BTNode * left;
-struct __ecereNameSpace__ecere__sys__BTNode * right;
-int depth;
-struct __ecereNameSpace__ecere__com__Instance * module;
-char * dataTypeString;
-struct Type * dataType;
-void * symbol;
-char * fullName;
-} __attribute__ ((gcc_struct));
+uint64 value2 = op2->__anon1.ui64;
-void DeclareGlobalData(struct GlobalData * data)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 ^ value2));
+if(!exp->expType)
{
-struct Symbol * symbol = data->symbol;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(curExternal && (!symbol || symbol->id > curExternal->symbol->idCode))
+static unsigned int ShortBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(inCompiler)
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s ^ value2));
+if(!exp->expType)
{
-if(!symbol)
-symbol = data->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(!data->dataType)
-data->dataType = ProcessTypeString(data->dataTypeString, 0x0);
-DeclareType(data->dataType, 0x1, 0x1);
-if(inCompiler)
-{
-if(!symbol->__anon2.__anon1.pointerExternal)
+return 1;
+}
+
+static unsigned int UShortBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Declaration * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-struct Declarator * d;
-struct External * external;
+unsigned short value2 = op2->__anon1.us;
-specifiers = MkList();
-declarators = MkList();
-ListAdd(specifiers, MkSpecifier(EXTERN));
-d = MkDeclaratorIdentifier(MkIdentifier(data->fullName));
-d = SpecDeclFromString(data->dataTypeString, specifiers, d);
-ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
-decl = MkDeclaration(specifiers, declarators);
-external = MkExternalDeclaration(decl);
-if(curExternal)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
-external->symbol = symbol;
-symbol->__anon2.__anon1.pointerExternal = external;
-}
-else
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us ^ value2));
+if(!exp->expType)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon1.pointerExternal, curExternal->prev);
-}
-if(curExternal)
-symbol->id = curExternal->symbol->idCode;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-struct Conversion
+static unsigned int CharBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Conversion * prev, * next;
-struct __ecereNameSpace__ecere__com__Property * convert;
-unsigned int isGet;
-struct Type * resultType;
-} __attribute__ ((gcc_struct));
-
-static struct __ecereNameSpace__ecere__com__Class * __ecereClass_Conversion;
+char value2 = op2->__anon1.c;
-extern void Compiler_Warning(const char * format, ...);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c ^ value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-static unsigned int CheckConstCompatibility(struct Type * source, struct Type * dest, unsigned int warn)
+static unsigned int UCharBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-unsigned int status = 0x1;
+unsigned char value2 = op2->__anon1.uc;
-if(((source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered) || source->kind == 12 || source->kind == 13) && ((dest->kind == 8 && dest->__anon1._class && dest->__anon1._class->__anon1.registered) || dest->kind == 13))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc ^ value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__Class * sourceClass = source->kind == 8 ? source->__anon1._class->__anon1.registered : (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * destClass = dest->kind == 8 ? dest->__anon1._class->__anon1.registered : (((void *)0));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if((!sourceClass || (sourceClass && sourceClass->type == 0 && !sourceClass->structSize)) && (!destClass || (destClass && destClass->type == 0 && !destClass->structSize)))
+static unsigned int IntLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * sourceType = source, * destType = dest;
+int value2 = op2->__anon1.i;
-while((sourceType->kind == 13 || sourceType->kind == 12) && sourceType->__anon1.type)
-sourceType = sourceType->__anon1.type;
-while((destType->kind == 13 || destType->kind == 12) && destType->__anon1.type)
-destType = destType->__anon1.type;
-if(!destType->constant && sourceType->constant)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i << value2));
+if(!exp->expType)
{
-status = 0x0;
-if(warn)
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "discarding const qualifier\n", (((void *)0))));
-}
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return status;
+return 1;
}
-extern void CopyTypeInto(struct Type * type, struct Type * src);
-
-void PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
-
-unsigned int MatchTypes(struct Type * source, struct Type * dest, struct __ecereNameSpace__ecere__sys__OldList * conversions, struct __ecereNameSpace__ecere__com__Class * owningClassSource, struct __ecereNameSpace__ecere__com__Class * owningClassDest, unsigned int doConversion, unsigned int enumBaseType, unsigned int acceptReversedParams, unsigned int isConversionExploration, unsigned int warnConst)
-{
-if(source && dest)
-{
-if(warnConst)
-CheckConstCompatibility(source, dest, 0x1);
-if(source->kind == 20 && dest->kind != 20)
+static unsigned int UIntLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * type = ProcessTemplateParameterType(source->__anon1.templateParameter);
+unsigned int value2 = op2->__anon1.ui;
-if(type)
-source = type;
-}
-if(dest->kind == 20 && source->kind != 20)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui << value2));
+if(!exp->expType)
{
-struct Type * type = ProcessTemplateParameterType(dest->__anon1.templateParameter);
-
-if(type)
-dest = type;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(dest->classObjectType == 2 && dest->kind != 11)
-{
-if(source->classObjectType != 3)
-return 0x1;
-else
+return 1;
+}
+
+static unsigned int Int64LShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if((dest->__anon1._class && strcmp(dest->__anon1._class->string, "class")) || (source->__anon1._class && strcmp(source->__anon1._class->string, "class")))
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 << value2));
+if(!exp->expType)
{
-return 0x1;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else
+
+static unsigned int UInt64LShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(source->kind != 11 && source->classObjectType == 3)
-return 0x1;
-if(dest->kind != 11 && dest->classObjectType == 3 && source->classObjectType != 2)
-return 0x1;
-}
-if((dest->kind == 9 && source->kind == 9) || (dest->kind == 10 && source->kind == 10))
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 << value2));
+if(!exp->expType)
{
-if((dest->__anon1.__anon1.enumName && source->__anon1.__anon1.enumName && !strcmp(dest->__anon1.__anon1.enumName, source->__anon1.__anon1.enumName)) || (source->__anon1.__anon1.members.first && source->__anon1.__anon1.members.first == dest->__anon1.__anon1.members.first))
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(dest->kind == 14 && source->kind != 0)
-return 0x1;
-if(dest->kind == 13 && dest->__anon1.type->kind == 0 && ((source->kind == 8 && (!source->__anon1._class || !source->__anon1._class->__anon1.registered || source->__anon1._class->__anon1.registered->type == 1 || source->__anon1._class->__anon1.registered->type == 0 || source->__anon1._class->__anon1.registered->type == 5 || source->__anon1._class->__anon1.registered->type == 1000)) || source->kind == 19 || source->kind == 13 || source->kind == 12 || source->kind == 11 || source->kind == 21))
-return 0x1;
-if(!isConversionExploration && source->kind == 13 && source->__anon1.type->kind == 0 && ((dest->kind == 8 && (!dest->__anon1._class || !dest->__anon1._class->__anon1.registered || dest->__anon1._class->__anon1.registered->type == 1 || dest->__anon1._class->__anon1.registered->type == 0 || dest->__anon1._class->__anon1.registered->type == 5 || dest->__anon1._class->__anon1.registered->type == 1000)) || dest->kind == 19 || dest->kind == 13 || dest->kind == 12 || dest->kind == 11 || dest->kind == 21))
-return 0x1;
-if(((source->kind == 8 && dest->kind == 8) || (source->kind == 19 && dest->kind == 19)) && source->__anon1._class)
-{
-if(source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 3)
+return 1;
+}
+
+static unsigned int ShortLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(conversions != (((void *)0)))
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s << value2));
+if(!exp->expType)
{
-if(source->__anon1._class->__anon1.registered == dest->__anon1._class->__anon1.registered)
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
+return 1;
+}
+
+static unsigned int UShortLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Class * sourceBase, * destBase;
+unsigned short value2 = op2->__anon1.us;
-for(sourceBase = source->__anon1._class->__anon1.registered; sourceBase && sourceBase->base->type != 1000; sourceBase = sourceBase->base)
-;
-for(destBase = dest->__anon1._class->__anon1.registered; destBase && destBase->base->type != 1000; destBase = destBase->base)
-;
-if(sourceBase == destBase)
-return 0x1;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us << value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else if(source->__anon1._class && dest->__anon1._class && (dest->classObjectType == source->classObjectType || !dest->classObjectType) && (enumBaseType || (!source->__anon1._class->__anon1.registered || source->__anon1._class->__anon1.registered->type != 4) || (!dest->__anon1._class->__anon1.registered || dest->__anon1._class->__anon1.registered->type != 4)) && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, dest->__anon1._class->__anon1.registered))
-return 0x1;
-else
-{
-if(enumBaseType && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4 && ((source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type != 4) || source->kind == 8))
+
+static unsigned int CharLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(__ecereNameSpace__ecere__com__eClass_IsDerived(dest->__anon1._class->__anon1.registered, source->__anon1._class->__anon1.registered))
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c << value2));
+if(!exp->expType)
{
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UCharLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned char value2 = op2->__anon1.uc;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc << value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(source->kind == 19 && dest->kind == 8 && dest->__anon1._class && !strcmp(dest->__anon1._class->string, "ecere::com::Class"))
-return 0x1;
-if(doConversion)
-{
-if(source->kind == 8)
+
+static unsigned int IntRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Class * _class;
+int value2 = op2->__anon1.i;
-for(_class = source->__anon1._class ? source->__anon1._class->__anon1.registered : (((void *)0)); _class; _class = _class->base)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i >> value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__Property * convert;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(convert = _class->conversions.first; convert; convert = convert->next)
+static unsigned int UIntRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(convert->memberAccess == 1 || _class->module == privateModule)
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui >> value2));
+if(!exp->expType)
{
-struct Conversion * after = (conversions != (((void *)0))) ? conversions->last : (((void *)0));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!convert->dataType)
-convert->dataType = ProcessTypeString(convert->dataTypeString, 0x0);
-if((!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), (convert->dataType->kind == 8 && !strcmp(convert->dataTypeString, "String")) ? 0x1 : 0x0, convert->dataType->kind == 8, 0x0, 0x1, warnConst))
+static unsigned int Int64RShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!conversions && !convert->Get)
-return 0x1;
-else if(conversions != (((void *)0)))
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 >> value2));
+if(!exp->expType)
{
-if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (dest->kind != 8 || dest->__anon1._class->__anon1.registered != _class->base))
-return 0x1;
-else
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UInt64RShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 0x1, conv);
+uint64 value2 = op2->__anon1.ui64;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(conversions, after, conv);
-return 0x1;
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 >> value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int ShortRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s >> value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UShortRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us >> value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(dest->kind == 8)
-{
-struct __ecereNameSpace__ecere__com__Class * _class;
-for(_class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0)); _class; _class = _class->base)
+static unsigned int CharRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Property * convert;
+char value2 = op2->__anon1.c;
-for(convert = _class->conversions.first; convert; convert = convert->next)
-{
-if(convert->memberAccess == 1 || _class->module == privateModule)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c >> value2));
+if(!exp->expType)
{
-struct Type * constType = (((void *)0));
-unsigned int success = 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!convert->dataType)
-convert->dataType = ProcessTypeString(convert->dataTypeString, 0x0);
-if(warnConst && convert->dataType->kind == 13 && convert->dataType->__anon1.type && dest->constant)
+static unsigned int UCharRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * ptrType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-constType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+unsigned char value2 = op2->__anon1.uc;
-__ecereInstance1->kind = 13, __ecereInstance1->refCount = 1, __ecereInstance1->__anon1.type = ptrType, __ecereInstance1;
-});
-CopyTypeInto(ptrType, convert->dataType->__anon1.type);
-ptrType->constant = 0x1;
-}
-if((constType || convert->dataType != dest) && MatchTypes(source, constType ? constType : convert->dataType, conversions, (((void *)0)), (((void *)0)), 0x1, 0x0, 0x0, 0x1, warnConst))
-{
-if(!conversions && !convert->Set)
-success = 0x1;
-else if(conversions != (((void *)0)))
-{
-if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (source->kind != 8 || source->__anon1._class->__anon1.registered != _class->base))
-success = 0x1;
-else
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc >> value2));
+if(!exp->expType)
{
-struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv);
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(conversions, conv);
-success = 0x1;
-}
-}
-}
-if(constType)
-FreeType(constType);
-if(success)
-return 0x1;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(enumBaseType && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4)
-{
-if(!dest->__anon1._class->__anon1.registered->dataType)
-dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-if(dest->__anon1._class->__anon1.registered->dataType->kind == 8 || source->truth || dest->truth)
+
+static unsigned int IntBitNot(struct Expression * exp, struct Operand * op1)
{
-if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 0x1, dest->__anon1._class->__anon1.registered->dataType->kind == 8, 0x0, 0x0, warnConst))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((~op1->__anon1.i));
+if(!exp->expType)
{
-return 0x1;
-}
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(source->kind == 8)
-{
-struct __ecereNameSpace__ecere__com__Class * _class;
-for(_class = source->__anon1._class ? source->__anon1._class->__anon1.registered : (((void *)0)); _class; _class = _class->base)
+static unsigned int UIntBitNot(struct Expression * exp, struct Operand * op1)
{
-struct __ecereNameSpace__ecere__com__Property * convert;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(~op1->__anon1.ui));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(convert = _class->conversions.first; convert; convert = convert->next)
+static unsigned int Int64BitNot(struct Expression * exp, struct Operand * op1)
{
-if(convert->memberAccess == 1 || _class->module == privateModule)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((long long)(~op1->__anon1.i64));
+if(!exp->expType)
{
-struct Conversion * after = (conversions != (((void *)0))) ? conversions->last : (((void *)0));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(!convert->dataType)
-convert->dataType = ProcessTypeString(convert->dataTypeString, 0x0);
-if(convert->dataType != source && (!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), convert->dataType->kind == 8, convert->dataType->kind == 8, 0x0, 0x1, warnConst))
-{
-if(!conversions && !convert->Get)
-return 0x1;
-else if(conversions != (((void *)0)))
+static unsigned int UInt64BitNot(struct Expression * exp, struct Operand * op1)
{
-if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (dest->kind != 8 || dest->__anon1._class->__anon1.registered != _class->base))
-return 0x1;
-else
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(~op1->__anon1.ui64));
+if(!exp->expType)
{
-struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 0x1, conv);
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(conversions, after, conv);
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int ShortBitNot(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(~op1->__anon1.s));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UShortBitNot(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(~op1->__anon1.us));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(enumBaseType && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 4)
+
+static unsigned int CharBitNot(struct Expression * exp, struct Operand * op1)
{
-if(!source->__anon1._class->__anon1.registered->dataType)
-source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-if(!isConversionExploration || source->__anon1._class->__anon1.registered->dataType->kind == 8 || !strcmp(source->__anon1._class->__anon1.registered->name, "String"))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(~op1->__anon1.c));
+if(!exp->expType)
{
-if(MatchTypes(source->__anon1._class->__anon1.registered->dataType, dest, conversions, (((void *)0)), (((void *)0)), source->__anon1._class->__anon1.registered->dataType->kind == 8, source->__anon1._class->__anon1.registered->dataType->kind == 8, 0x0, 0x0, warnConst))
-return 0x1;
-else if(MatchTypes(dest, source->__anon1._class->__anon1.registered->dataType, (((void *)0)), (((void *)0)), (((void *)0)), 0x0, 0x0, 0x0, 0x0, warnConst))
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UCharBitNot(struct Expression * exp, struct Operand * op1)
+{
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(~op1->__anon1.uc));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(source->kind == 8 || source->kind == 19)
-;
-else if(dest->kind == source->kind && (dest->kind != 9 && dest->kind != 10 && dest->kind != 11 && dest->kind != 12 && dest->kind != 13 && dest->kind != 16))
-return 0x1;
-else if(dest->kind == 7 && source->kind == 6)
-return 0x1;
-else if(dest->kind == 2 && (source->kind == 1 || source->kind == 24))
-return 0x1;
-else if(dest->kind == 3 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 23))
-return 0x1;
-else if(dest->kind == 4 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 22 || source->kind == 23))
-return 0x1;
-else if(dest->kind == 22 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 23 || source->kind == 4))
-return 0x1;
-else if(dest->kind == 23 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 4 || source->kind == 22))
-return 0x1;
-else if(source->kind == 15 && (dest->kind == 3 || dest->kind == 2 || dest->kind == 1 || source->kind == 24 || dest->kind == 5 || dest->kind == 4 || dest->kind == 22 || dest->kind == 23))
-return 0x1;
-else if(dest->kind == 15 && !isConversionExploration && (source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 5 || source->kind == 4 || source->kind == 22 || source->kind == 23))
-return 0x1;
-else if((dest->kind == 11 || (dest->kind == 13 && dest->__anon1.type->kind == 11) || dest->kind == 16) && ((source->kind == 11 || (source->kind == 13 && source->__anon1.type->kind == 11) || source->kind == 16)))
-{
-struct Type * paramSource, * paramDest;
-if(dest->kind == 16)
-owningClassDest = dest->__anon1.__anon3.methodClass ? dest->__anon1.__anon3.methodClass : dest->__anon1.__anon3.method->_class;
-if(source->kind == 16)
-owningClassSource = source->__anon1.__anon3.methodClass ? source->__anon1.__anon3.methodClass : source->__anon1.__anon3.method->_class;
-if(dest->kind == 13 && dest->__anon1.type->kind == 11)
-dest = dest->__anon1.type;
-if(source->kind == 13 && source->__anon1.type->kind == 11)
-source = source->__anon1.type;
-if(dest->kind == 16)
-dest = dest->__anon1.__anon3.method->dataType;
-if(source->kind == 16)
-source = source->__anon1.__anon3.method->dataType;
-paramSource = source->__anon1.__anon2.params.first;
-if(paramSource && paramSource->kind == 0)
-paramSource = (((void *)0));
-paramDest = dest->__anon1.__anon2.params.first;
-if(paramDest && paramDest->kind == 0)
-paramDest = (((void *)0));
-if((dest->__anon1.__anon2.staticMethod || (!dest->__anon1.__anon2.thisClass && !owningClassDest)) && !(source->__anon1.__anon2.staticMethod || (!source->__anon1.__anon2.thisClass && !owningClassSource)))
+static unsigned int IntAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!paramDest || (!(paramDest->kind == 13 && paramDest->__anon1.type && paramDest->__anon1.type->kind == 0) && (paramDest->kind != 8 || !__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass ? source->__anon1.__anon2.thisClass->__anon1.registered : owningClassSource, paramDest->__anon1._class->__anon1.registered))))
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i &= value2));
+if(!exp->expType)
{
-if(paramDest && paramDest->kind == 8)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), paramDest->__anon1._class->string);
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class should not take an object\n", (((void *)0))));
-return 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-paramDest = paramDest->next;
+return 1;
}
-else if(!dest->__anon1.__anon2.staticMethod && (dest->__anon1.__anon2.thisClass || owningClassDest))
+
+static unsigned int UIntAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if((source->__anon1.__anon2.staticMethod || (!source->__anon1.__anon2.thisClass && !owningClassSource)))
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui &= value2));
+if(!exp->expType)
{
-if(dest->__anon1.__anon2.thisClass)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int Int64AndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!paramSource || paramSource->kind != 8 || !__ecereNameSpace__ecere__com__eClass_IsDerived(paramSource->__anon1._class->__anon1.registered, dest->__anon1.__anon2.thisClass->__anon1.registered))
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 &= value2));
+if(!exp->expType)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), dest->__anon1.__anon2.thisClass->string);
-return 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else
+
+static unsigned int UInt64AndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!paramSource || paramSource->kind != 8 || (owningClassDest && !__ecereNameSpace__ecere__com__eClass_IsDerived(paramSource->__anon1._class->__anon1.registered, owningClassDest)))
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 &= value2));
+if(!exp->expType)
{
-if(owningClassDest)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s expected to be derived from method class\n", (((void *)0))), owningClassDest->fullName);
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "overriding class expected to be derived from method class\n", (((void *)0))));
-return 0x0;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-paramSource = paramSource->next;
+return 1;
}
-else
-{
-if(dest->__anon1.__anon2.thisClass)
+
+static unsigned int ShortAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass ? source->__anon1.__anon2.thisClass->__anon1.registered : owningClassSource, dest->__anon1.__anon2.thisClass->__anon1.registered))
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s &= value2));
+if(!exp->expType)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), dest->__anon1.__anon2.thisClass->string);
-return 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else
+
+static unsigned int UShortAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(source->__anon1.__anon2.thisClass && source->__anon1.__anon2.thisClass->__anon1.registered && owningClassDest && !__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass->__anon1.registered, owningClassDest))
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us &= value2));
+if(!exp->expType)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s expected to be derived from method class\n", (((void *)0))), source->__anon1.__anon2.thisClass->__anon1.registered->fullName);
-return 0x0;
-}
-}
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(!MatchTypes(source->__anon1.__anon2.returnType, dest->__anon1.__anon2.returnType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst))
-{
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible return type for function\n", (((void *)0))));
-return 0x0;
+return 1;
}
-else
-CheckConstCompatibility(dest->__anon1.__anon2.returnType, source->__anon1.__anon2.returnType, 0x1);
-for(; paramDest; paramDest = paramDest->next)
+
+static unsigned int CharAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!paramSource)
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c &= value2));
+if(!exp->expType)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough parameters\n", (((void *)0))));
-return 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-{
-struct Type * paramDestType = paramDest;
-struct Type * paramSourceType = paramSource;
-struct Type * type = paramDestType;
-if(paramDest->kind == 20 && paramDest->__anon1.templateParameter->type == 0 && owningClassSource && paramSource->kind != 20)
+static unsigned int UCharAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int id = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * sClass;
+unsigned char value2 = op2->__anon1.uc;
-for(sClass = owningClassSource; sClass; sClass = sClass->base)
-{
-id = 0;
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
-{
-if(curParam->type == 0 && !strcmp(type->__anon1.templateParameter->identifier->string, curParam->name))
-{
-for(sClass = sClass->base; sClass; sClass = sClass->base)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc &= value2));
+if(!exp->expType)
{
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-id += sClass->templateParams.count;
-}
-break;
-}
-id++;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(curParam)
-break;
+return 1;
}
-if(curParam)
+
+static unsigned int IntOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = owningClassSource->templateArgs[id];
+int value2 = op2->__anon1.i;
-paramDestType = type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i |= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!MatchTypes(paramDestType, paramSourceType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst) && (!acceptReversedParams || !MatchTypes(paramSourceType, paramDestType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst)))
+
+static unsigned int UIntOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-char type[1024];
+unsigned int value2 = op2->__anon1.ui;
-type[0] = (char)0;
-PrintType(paramDest, type, 0x0, 0x1);
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible parameter %s (expected %s)\n", (((void *)0))), paramSource->name, type);
-if(paramDestType != paramDest)
-FreeType(paramDestType);
-return 0x0;
-}
-if(paramDestType != paramDest)
-FreeType(paramDestType);
-}
-paramSource = paramSource->next;
-}
-if(paramSource)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui |= value2));
+if(!exp->expType)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many parameters\n", (((void *)0))));
-return 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-else if((dest->kind == 11 || (dest->kind == 13 && dest->__anon1.type->kind == 11) || dest->kind == 16) && (source->kind == 13 && source->__anon1.type->kind == 0))
+
+static unsigned int Int64OrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-return 0x1;
-}
-else if((dest->kind == 13 || dest->kind == 12) && (source->kind == 12 || source->kind == 13))
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 |= value2));
+if(!exp->expType)
{
-if(MatchTypes(source->__anon1.type, dest->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst))
-return 0x1;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return 0x0;
+return 1;
}
-static void FreeConvert(struct Conversion * convert)
+static unsigned int UInt64OrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(convert->resultType)
-FreeType(convert->resultType);
-}
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__BTNamedLink;
+uint64 value2 = op2->__anon1.ui64;
-struct __ecereNameSpace__ecere__com__BTNamedLink
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 |= value2));
+if(!exp->expType)
{
-const char * name;
-struct __ecereNameSpace__ecere__com__BTNamedLink * parent;
-struct __ecereNameSpace__ecere__com__BTNamedLink * left;
-struct __ecereNameSpace__ecere__com__BTNamedLink * right;
-int depth;
-void * data;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__EnumClassData;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-struct __ecereNameSpace__ecere__com__EnumClassData
+static unsigned int ShortOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__OldList values;
-int largest;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink;
+short value2 = op2->__anon1.s;
-struct __ecereNameSpace__ecere__sys__NamedLink
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s |= value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * prev;
-struct __ecereNameSpace__ecere__sys__NamedLink * next;
-char * name;
-void * data;
-} __attribute__ ((gcc_struct));
-
-extern void FreeExpContents(struct Expression * exp);
-
-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;
-
-struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(struct __ecereNameSpace__ecere__sys__BTNode * this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__sys__BTNode_next;
-
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(struct __ecereNameSpace__ecere__sys__OldList * this, void (* freeFn)(void * ));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-unsigned int MatchWithEnums_NameSpace(struct __ecereNameSpace__ecere__com__NameSpace * nameSpace, struct Expression * sourceExp, struct Type * dest, char * string, struct __ecereNameSpace__ecere__sys__OldList * conversions)
+static unsigned int UShortOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__BTNamedLink * link;
+unsigned short value2 = op2->__anon1.us;
-for(link = (struct __ecereNameSpace__ecere__com__BTNamedLink *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->classes); link; link = (struct __ecereNameSpace__ecere__com__BTNamedLink *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)link)))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us |= value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__Class * _class = link->data;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(_class->type == 4)
+static unsigned int CharOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__OldList converts =
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c |= value2));
+if(!exp->expType)
{
-0, 0, 0, 0, 0
-};
-struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-type->kind = 8;
-if(!_class->symbol)
-_class->symbol = FindClass(_class->fullName);
-type->__anon1._class = _class->symbol;
-if(MatchTypes(type, dest, &converts, (((void *)0)), (((void *)0)), 0x1, 0x0, 0x0, 0x0, 0x0))
+static unsigned int UCharOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * value;
-struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
+unsigned char value2 = op2->__anon1.uc;
-if(enumClass)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc |= value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__Class * baseClass;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(baseClass = _class; baseClass && baseClass->type == 4; baseClass = baseClass->base)
+static unsigned int IntXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__EnumClassData * e = (baseClass ? ((void *)(((char *)baseClass->data) + enumClass->offsetClass)) : (((void *)0)));
+int value2 = op2->__anon1.i;
-for(value = e->values.first; value; value = value->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i ^= value2));
+if(!exp->expType)
{
-if(!strcmp(value->name, string))
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(value)
-{
-FreeExpContents(sourceExp);
-FreeType(sourceExp->expType);
-sourceExp->isConstant = 0x1;
-sourceExp->expType = MkClassType(baseClass->fullName);
-{
-char constant[256];
-
-sourceExp->type = 2;
-if(!strcmp(baseClass->dataTypeString, "int"))
-sprintf(constant, "%d", (int)value->data);
-else
-sprintf(constant, "0x%X", (int)value->data);
-sourceExp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
+return 1;
}
-while(converts.first)
+
+static unsigned int UIntXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Conversion * convert = converts.first;
+unsigned int value2 = op2->__anon1.ui;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(&converts, convert);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(conversions, convert);
-}
-((type ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
-return 0x1;
-}
-}
-}
-}
-if(converts.first)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(&converts, FreeConvert);
-((type ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
-}
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui ^= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-for(nameSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->nameSpaces); nameSpace != (((void *)0)); nameSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)nameSpace)))
-if(MatchWithEnums_NameSpace(nameSpace, sourceExp, dest, string, conversions))
-return 0x1;
-return 0x0;
+return 1;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SubModule;
-
-struct __ecereNameSpace__ecere__com__SubModule
+static unsigned int Int64XorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__SubModule * prev;
-struct __ecereNameSpace__ecere__com__SubModule * next;
-struct __ecereNameSpace__ecere__com__Instance * module;
-int importMode;
-} __attribute__ ((gcc_struct));
+long long value2 = op2->__anon1.i64;
-unsigned int ModuleVisibility(struct __ecereNameSpace__ecere__com__Instance * searchIn, struct __ecereNameSpace__ecere__com__Instance * searchFor)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 ^= value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__SubModule * subModule;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-if(searchFor == searchIn)
-return 0x1;
-for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->modules.first; subModule; subModule = subModule->next)
+static unsigned int UInt64XorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(subModule->importMode == 1 || searchIn == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->application)
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 ^= value2));
+if(!exp->expType)
{
-if(ModuleVisibility(subModule->module, searchFor))
-return 0x1;
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return 0x0;
+return 1;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Application;
+static unsigned int ShortXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+short value2 = op2->__anon1.s;
-struct __ecereNameSpace__ecere__com__Application
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s ^= value2));
+if(!exp->expType)
{
-int argc;
-const char * * argv;
-int exitCode;
-unsigned int isGUIApp;
-struct __ecereNameSpace__ecere__sys__OldList allModules;
-char * parsedCommand;
-struct __ecereNameSpace__ecere__com__NameSpace systemNameSpace;
-} __attribute__ ((gcc_struct));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-unsigned int MatchWithEnums_Module(struct __ecereNameSpace__ecere__com__Instance * mainModule, struct Expression * sourceExp, struct Type * dest, char * string, struct __ecereNameSpace__ecere__sys__OldList * conversions)
+static unsigned int UShortXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Instance * module;
+unsigned short value2 = op2->__anon1.us;
-if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, sourceExp, dest, string, conversions))
-return 0x1;
-if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Instance)))->privateNameSpace, sourceExp, dest, string, conversions))
-return 0x1;
-if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Instance)))->publicNameSpace, sourceExp, dest, string, conversions))
-return 0x1;
-for(module = ((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Module)))->allModules.first; module; module = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us ^= value2));
+if(!exp->expType)
{
-if(ModuleVisibility(mainModule, module) && MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->publicNameSpace, sourceExp, dest, string, conversions))
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return 0x0;
+return 1;
}
-extern struct Expression * CopyExpression(struct Expression * exp);
-
-extern unsigned long strtoul(const char * nptr, char * * endptr, int base);
-
-void ReadString(char * output, char * string);
+static unsigned int CharXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
-extern struct Specifier * MkEnum(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * list);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c ^= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-extern struct TypeName * QMkClass(const char * spec, struct Declarator * decl);
+static unsigned int UCharXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned char value2 = op2->__anon1.uc;
-extern struct Expression * MkExpBrackets(struct __ecereNameSpace__ecere__sys__OldList * expressions);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc ^= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-unsigned int MatchTypeExpression(struct Expression * sourceExp, struct Type * dest, struct __ecereNameSpace__ecere__sys__OldList * conversions, unsigned int skipUnitBla, unsigned int warnConst)
+static unsigned int IntLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * source;
-struct Type * realDest = dest;
-struct Type * backupSourceExpType = (((void *)0));
-struct Expression * computedExp = sourceExp;
+int value2 = op2->__anon1.i;
-dest->refCount++;
-if(sourceExp->isConstant && sourceExp->type != 2 && sourceExp->type != 0 && sourceExp->type != 11 && dest->kind == 8 && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i <<= value2));
+if(!exp->expType)
{
-computedExp = CopyExpression(sourceExp);
-ComputeExpression(computedExp);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-source = sourceExp->expType;
-if(dest->kind == 13 && sourceExp->type == 2 && !strtoul(sourceExp->__anon1.__anon1.constant, (((void *)0)), 0))
+return 1;
+}
+
+static unsigned int UIntLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(computedExp != sourceExp)
+unsigned int value2 = op2->__anon1.ui;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui <<= value2));
+if(!exp->expType)
{
-FreeExpression(computedExp);
-computedExp = sourceExp;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-FreeType(dest);
-return 0x1;
+return 1;
}
-if(!skipUnitBla && source && dest && source->kind == 8 && dest->kind == 8)
+
+static unsigned int Int64LShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 3)
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 <<= value2));
+if(!exp->expType)
{
-struct __ecereNameSpace__ecere__com__Class * sourceBase, * destBase;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-for(sourceBase = source->__anon1._class->__anon1.registered; sourceBase && sourceBase->base && sourceBase->base->type != 1000; sourceBase = sourceBase->base)
-;
-for(destBase = dest->__anon1._class->__anon1.registered; destBase && destBase->base && destBase->base->type != 1000; destBase = destBase->base)
-;
-if(sourceBase == destBase)
+static unsigned int UInt64LShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(computedExp != sourceExp)
+uint64 value2 = op2->__anon1.ui64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 <<= value2));
+if(!exp->expType)
{
-FreeExpression(computedExp);
-computedExp = sourceExp;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-FreeType(dest);
-return 0x1;
+return 1;
}
+
+static unsigned int ShortLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s <<= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(source)
+
+static unsigned int UShortLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs;
-unsigned int flag = 0x0;
-long long value = (((int)0x7fffffff));
+unsigned short value2 = op2->__anon1.us;
-source->refCount++;
-if(computedExp->type == 2)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us <<= value2));
+if(!exp->expType)
{
-if(source->isSigned)
-value = strtoll(computedExp->__anon1.__anon1.constant, (((void *)0)), 0);
-else
-value = strtoull(computedExp->__anon1.__anon1.constant, (((void *)0)), 0);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(computedExp->type == 4 && sourceExp->__anon1.op.op == '-' && !computedExp->__anon1.op.exp1 && computedExp->__anon1.op.exp2 && computedExp->__anon1.op.exp2->type == 2)
-{
-if(source->isSigned)
-value = -strtoll(computedExp->__anon1.op.exp2->__anon1.__anon1.constant, (((void *)0)), 0);
-else
-value = -strtoull(computedExp->__anon1.op.exp2->__anon1.__anon1.constant, (((void *)0)), 0);
+return 1;
}
-if(computedExp != sourceExp)
+
+static unsigned int CharLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-FreeExpression(computedExp);
-computedExp = sourceExp;
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c <<= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
}
-if(dest->kind != 8 && source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && !strcmp(source->__anon1._class->__anon1.registered->fullName, "ecere::com::unichar"))
+
+static unsigned int UCharLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-FreeType(source);
-source = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+unsigned char value2 = op2->__anon1.uc;
-__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0x0, __ecereInstance1->refCount = 1, __ecereInstance1;
-});
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc <<= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(dest->kind == 8)
+return 1;
+}
+
+static unsigned int IntRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0));
+int value2 = op2->__anon1.i;
-if(_class && _class->type == 3)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i >>= value2));
+if(!exp->expType)
{
-if(source->kind != 8)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UIntRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * tempType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-struct Type * tempDest, * tempSource;
+unsigned int value2 = op2->__anon1.ui;
-for(; _class->base->type != 1000; _class = _class->base)
-;
-tempSource = dest;
-tempDest = tempType;
-tempType->kind = 8;
-if(!_class->symbol)
-_class->symbol = FindClass(_class->fullName);
-tempType->__anon1._class = _class->symbol;
-tempType->truth = dest->truth;
-if(tempType->__anon1._class)
-MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst);
-backupSourceExpType = sourceExp->expType;
-sourceExp->expType = dest;
-dest->refCount++;
-flag = 0x1;
-((tempType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)tempType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(tempType)) : 0), tempType = 0);
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui >>= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(_class && _class->type == 2 && source->kind != 8)
+
+static unsigned int Int64RShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(!dest->__anon1._class->__anon1.registered->dataType)
-dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst))
+long long value2 = op2->__anon1.i64;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 >>= value2));
+if(!exp->expType)
{
-FreeType(source);
-FreeType(sourceExp->expType);
-source = sourceExp->expType = MkClassType(dest->__anon1._class->string);
-source->refCount++;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(_class && !strcmp(_class->fullName, "ecere::com::Class") && source->kind == 13 && source->__anon1.type && source->__anon1.type->kind == 1 && sourceExp->type == 3)
+
+static unsigned int UInt64RShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl;
-char string[1024];
+uint64 value2 = op2->__anon1.ui64;
-ReadString(string, sourceExp->__anon1.__anon2.string);
-decl = SpecDeclFromString(string, specs, (((void *)0)));
-FreeExpContents(sourceExp);
-FreeType(sourceExp->expType);
-sourceExp->type = 24;
-sourceExp->__anon1._classExp.specifiers = specs;
-sourceExp->__anon1._classExp.decl = decl;
-sourceExp->expType = dest;
-dest->refCount++;
-FreeType(source);
-FreeType(dest);
-if(backupSourceExpType)
-FreeType(backupSourceExpType);
-return 0x1;
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 >>= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else if(source->kind == 8)
-{
-struct __ecereNameSpace__ecere__com__Class * _class = source->__anon1._class ? source->__anon1._class->__anon1.registered : (((void *)0));
-if(_class && (_class->type == 3 || _class->type == 2))
-{
-if(dest->kind != 8)
+static unsigned int ShortRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Type * tempType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-struct Type * tempDest, * tempSource;
+short value2 = op2->__anon1.s;
-if(!source->__anon1._class->__anon1.registered->dataType)
-source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-for(; _class->base->type != 1000; _class = _class->base)
-;
-tempDest = source;
-tempSource = tempType;
-tempType->kind = 8;
-tempType->__anon1._class = FindClass(_class->fullName);
-tempType->truth = source->truth;
-tempType->classObjectType = source->classObjectType;
-if(tempType->__anon1._class)
-MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst);
-if(conversions->last)
-{
-((struct Conversion *)conversions->last)->resultType = dest;
-dest->refCount++;
-}
-FreeType(sourceExp->expType);
-sourceExp->expType = MkClassType(_class->fullName);
-sourceExp->expType->truth = source->truth;
-sourceExp->expType->classObjectType = source->classObjectType;
-if(!sourceExp->destType)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s >>= value2));
+if(!exp->expType)
{
-FreeType(sourceExp->destType);
-sourceExp->destType = sourceExp->expType;
-if(sourceExp->expType)
-sourceExp->expType->refCount++;
-}
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-FreeType(dest);
-dest = MkClassType(source->__anon1._class->string);
-dest->truth = source->truth;
-dest->classObjectType = source->classObjectType;
-FreeType(source);
-source = _class->dataType;
-source->refCount++;
-((tempType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)tempType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(tempType)) : 0), tempType = 0);
-}
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(!flag)
+
+static unsigned int UShortRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(MatchTypes(source, dest, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst))
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us >>= value2));
+if(!exp->expType)
{
-FreeType(source);
-FreeType(dest);
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(dest->kind == 8)
-{
-struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0));
-unsigned int fittingValue = 0x0;
-if(_class && _class->type == 4)
+static unsigned int CharRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-struct __ecereNameSpace__ecere__com__EnumClassData * c = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
+char value2 = op2->__anon1.c;
-if(c && value >= 0 && value <= c->largest)
-fittingValue = 0x1;
-}
-if(_class && !dest->truth && (_class->type == 3 || fittingValue || (_class->type != 1 && !value && source->kind == 3) || _class->type == 2))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c >>= value2));
+if(!exp->expType)
{
-if(_class->type == 0 || _class->type == 5)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UCharRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+unsigned char value2 = op2->__anon1.uc;
-*newExp = *sourceExp;
-if(sourceExp->destType)
-sourceExp->destType->refCount++;
-if(sourceExp->expType)
-sourceExp->expType->refCount++;
-sourceExp->type = 11;
-sourceExp->__anon1.cast.typeName = MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0))));
-sourceExp->__anon1.cast.exp = newExp;
-FreeType(sourceExp->expType);
-sourceExp->expType = (((void *)0));
-ProcessExpressionType(sourceExp);
-if(!inCompiler)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc >>= value2));
+if(!exp->expType)
{
-FreeType(sourceExp->expType);
-sourceExp->expType = dest;
-}
-FreeType(source);
-if(inCompiler)
-FreeType(dest);
-if(backupSourceExpType)
-FreeType(backupSourceExpType);
-return 0x1;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-FreeType(dest);
-dest = _class->dataType;
-dest->refCount++;
+return 1;
}
-if(dest->kind == 7 && (source->kind == 7 || source->kind == 6 || dest->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24))
+
+static unsigned int IntNot(struct Expression * exp, struct Operand * op1)
{
-specs = MkListOne(MkSpecifier(DOUBLE));
-}
-else if(dest->kind == 6 && (source->kind == 6 || dest->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 7))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((int)(!op1->__anon1.i));
+if(!exp->expType)
{
-specs = MkListOne(MkSpecifier(FLOAT));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(dest->kind == 4 && (source->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 6 || source->kind == 7))
-{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(INT64));
+return 1;
}
-else if(dest->kind == 3 && (source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 6 || source->kind == 7))
+
+static unsigned int UIntNot(struct Expression * exp, struct Operand * op1)
{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(INT));
-}
-else if(dest->kind == 2 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 6 || source->kind == 7))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(!op1->__anon1.ui));
+if(!exp->expType)
{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(SHORT));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(dest->kind == 1 && (source->kind == 1 || source->kind == 24 || source->kind == 2 || source->kind == 3 || source->kind == 6 || source->kind == 7))
-{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(CHAR));
+return 1;
}
-else
+
+static unsigned int Int64Not(struct Expression * exp, struct Operand * op1)
{
-FreeType(source);
-FreeType(dest);
-if(backupSourceExpType)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((long long)(!op1->__anon1.i64));
+if(!exp->expType)
{
-if(sourceExp->expType)
-FreeType(sourceExp->expType);
-sourceExp->expType = backupSourceExpType;
-}
-return 0x0;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-else if(dest->kind == 7 && (source->kind == 7 || source->kind == 6 || source->kind == 4 || source->kind == 3 || source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1))
+
+static unsigned int UInt64Not(struct Expression * exp, struct Operand * op1)
{
-specs = MkListOne(MkSpecifier(DOUBLE));
-}
-else if(dest->kind == 6 && (source->kind == 6 || source->kind == 15 || source->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 24 || source->kind == 1))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(!op1->__anon1.ui64));
+if(!exp->expType)
{
-specs = MkListOne(MkSpecifier(FLOAT));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(dest->kind == 24 && (source->kind == 24 || source->kind == 1 || source->kind == 15 || source->kind == 2 || source->kind == 3) && (value == 1 || value == 0))
-{
-specs = MkList();
-ListAdd(specs, MkSpecifier(BOOL));
+return 1;
}
-else if(dest->kind == 1 && (source->kind == 24 || source->kind == 1 || source->kind == 15 || source->kind == 2 || source->kind == 3) && (dest->isSigned ? (value >= -128 && value <= 127) : (value >= 0 && value <= 255)))
+
+static unsigned int ShortNot(struct Expression * exp, struct Operand * op1)
{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(CHAR));
-}
-else if(dest->kind == 2 && (source->kind == 15 || source->kind == 24 || source->kind == 1 || source->kind == 2 || (source->kind == 3 && (dest->isSigned ? (value >= -32768 && value <= 32767) : (value >= 0 && value <= 65535)))))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(!op1->__anon1.s));
+if(!exp->expType)
{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(SHORT));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else if(dest->kind == 3 && (source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1 || source->kind == 3))
-{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(INT));
+return 1;
}
-else if(dest->kind == 4 && (source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1 || source->kind == 3 || source->kind == 4))
+
+static unsigned int UShortNot(struct Expression * exp, struct Operand * op1)
{
-specs = MkList();
-if(!dest->isSigned)
-ListAdd(specs, MkSpecifier(UNSIGNED));
-ListAdd(specs, MkSpecifier(INT64));
-}
-else if(dest->kind == 15 && (source->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 24 || source->kind == 1))
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(!op1->__anon1.us));
+if(!exp->expType)
{
-specs = MkListOne(MkEnum(MkIdentifier(dest->__anon1.__anon1.enumName), (((void *)0))));
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
+return 1;
+}
+
+static unsigned int CharNot(struct Expression * exp, struct Operand * op1)
{
-FreeType(source);
-FreeType(dest);
-if(backupSourceExpType)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(!op1->__anon1.c));
+if(!exp->expType)
{
-if(sourceExp->expType)
-FreeType(sourceExp->expType);
-sourceExp->expType = backupSourceExpType;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return 0x0;
+return 1;
}
-if(!flag && !sourceExp->opDestType)
-{
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-*newExp = *sourceExp;
-newExp->prev = (((void *)0));
-newExp->next = (((void *)0));
-if(sourceExp->destType)
-sourceExp->destType->refCount++;
-if(sourceExp->expType)
-sourceExp->expType->refCount++;
-sourceExp->type = 11;
-if(realDest->kind == 8)
+static unsigned int UCharNot(struct Expression * exp, struct Operand * op1)
{
-sourceExp->__anon1.cast.typeName = QMkClass(realDest->__anon1._class->string, (((void *)0)));
-FreeList(specs, FreeSpecifier);
-}
-else
-sourceExp->__anon1.cast.typeName = MkTypeName(specs, (((void *)0)));
-if(newExp->type == 4)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(!op1->__anon1.uc));
+if(!exp->expType)
{
-sourceExp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp));
-}
-else
-sourceExp->__anon1.cast.exp = newExp;
-FreeType(sourceExp->expType);
-sourceExp->expType = (((void *)0));
-ProcessExpressionType(sourceExp);
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-else
-FreeList(specs, FreeSpecifier);
-FreeType(dest);
-FreeType(source);
-if(backupSourceExpType)
-FreeType(backupSourceExpType);
-return 0x1;
+return 1;
}
-else
+
+static unsigned int IntEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-if(computedExp != sourceExp)
+int value2 = op2->__anon1.i;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i == value2));
+if(!exp->expType)
{
-FreeExpression(computedExp);
-computedExp = sourceExp;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-while((sourceExp->type == 5 || sourceExp->type == 32) && sourceExp->__anon1.list)
-sourceExp = (*sourceExp->__anon1.list).last;
-if(sourceExp->type == 0)
+return 1;
+}
+
+static unsigned int UIntEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct Identifier * id = sourceExp->__anon1.__anon1.identifier;
+unsigned int value2 = op2->__anon1.ui;
-if(dest->kind == 8)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui == value2));
+if(!exp->expType)
{
-if(dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int Int64Equ(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class->__anon1.registered;
-struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
+long long value2 = op2->__anon1.i64;
-if(enumClass)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 == value2));
+if(!exp->expType)
{
-for(; _class && _class->type == 4; _class = _class->base)
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UInt64Equ(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * value;
-struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
+uint64 value2 = op2->__anon1.ui64;
-for(value = e->values.first; value; value = value->next)
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 == value2));
+if(!exp->expType)
{
-if(!strcmp(value->name, id->string))
-break;
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-if(value)
+return 1;
+}
+
+static unsigned int ShortEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-FreeExpContents(sourceExp);
-FreeType(sourceExp->expType);
-sourceExp->isConstant = 0x1;
-sourceExp->expType = MkClassType(_class->fullName);
+short value2 = op2->__anon1.s;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s == value2));
+if(!exp->expType)
{
-char constant[256];
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
-sourceExp->type = 2;
-if(_class->dataTypeString && !strcmp(_class->dataTypeString, "int"))
-sprintf(constant, "%d", (int)value->data);
-else
-sprintf(constant, "0x%X", (int)value->data);
-sourceExp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
+static unsigned int UShortEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned short value2 = op2->__anon1.us;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us == value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-FreeType(dest);
-return 0x1;
+return 1;
}
+
+static unsigned int CharEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c == value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
+
+static unsigned int UCharEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned char value2 = op2->__anon1.uc;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc == value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-if(dest->classObjectType != 2 && dest->kind == 8 && MatchWithEnums_Module(privateModule, sourceExp, dest, id->string, conversions))
+
+static unsigned int FloatEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-FreeType(dest);
-return 0x1;
+float value2 = op2->__anon1.f;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f == value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
+return 1;
}
-FreeType(dest);
+
+static unsigned int DoubleEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+double value2 = op2->__anon1.d;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d == value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
}
-return 0x0;
+return 1;
}
-static unsigned int IntAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int IntNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
int value2 = op2->__anon1.i;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i + value2));
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UIntNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned int value2 = op2->__anon1.ui;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui + value2));
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Add(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int Int64Nqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
long long value2 = op2->__anon1.i64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 + value2));
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Add(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UInt64Nqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
uint64 value2 = op2->__anon1.ui64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 + value2));
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int ShortNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
short value2 = op2->__anon1.s;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s + value2));
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UShortNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned short value2 = op2->__anon1.us;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us + value2));
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int CharNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
char value2 = op2->__anon1.c;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c + value2));
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UCharNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned char value2 = op2->__anon1.uc;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc + value2));
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int FloatNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
float value2 = op2->__anon1.f;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f + value2));
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int DoubleAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int DoubleNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
double value2 = op2->__anon1.d;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d + value2));
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d != value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int IntAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
int value2 = op2->__anon1.i;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i - value2));
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UIntAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned int value2 = op2->__anon1.ui;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui - value2));
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Sub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int Int64And(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
long long value2 = op2->__anon1.i64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 - value2));
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Sub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UInt64And(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
uint64 value2 = op2->__anon1.ui64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 - value2));
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int ShortAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
short value2 = op2->__anon1.s;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s - value2));
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UShortAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned short value2 = op2->__anon1.us;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us - value2));
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int CharAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
char value2 = op2->__anon1.c;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c - value2));
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UCharAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned char value2 = op2->__anon1.uc;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc - value2));
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int FloatAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
float value2 = op2->__anon1.f;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f - value2));
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int DoubleSub(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int DoubleAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
double value2 = op2->__anon1.d;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d - value2));
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d && value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int IntOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
int value2 = op2->__anon1.i;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i * value2));
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UIntOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned int value2 = op2->__anon1.ui;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui * value2));
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Mul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int Int64Or(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
long long value2 = op2->__anon1.i64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 * value2));
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Mul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UInt64Or(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
uint64 value2 = op2->__anon1.ui64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 * value2));
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int ShortOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
short value2 = op2->__anon1.s;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s * value2));
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UShortOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned short value2 = op2->__anon1.us;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us * value2));
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int CharOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
char value2 = op2->__anon1.c;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c * value2));
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UCharOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned char value2 = op2->__anon1.uc;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc * value2));
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int FloatOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
float value2 = op2->__anon1.f;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f * value2));
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int DoubleMul(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int DoubleOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
double value2 = op2->__anon1.d;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d * value2));
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d || value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int IntGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
int value2 = op2->__anon1.i;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt(value2 ? (op1->__anon1.i / value2) : 0);
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UIntGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned int value2 = op2->__anon1.ui;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt(value2 ? (op1->__anon1.ui / value2) : 0);
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Div(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int Int64Grt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
long long value2 = op2->__anon1.i64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64(value2 ? (op1->__anon1.i64 / value2) : 0);
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Div(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UInt64Grt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
uint64 value2 = op2->__anon1.ui64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64(value2 ? (op1->__anon1.ui64 / value2) : 0);
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int ShortGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
short value2 = op2->__anon1.s;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort(value2 ? (op1->__anon1.s / value2) : (short)0);
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UShortGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned short value2 = op2->__anon1.us;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort(value2 ? (op1->__anon1.us / value2) : (unsigned short)0);
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int CharGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
char value2 = op2->__anon1.c;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar(value2 ? (op1->__anon1.c / value2) : (char)0);
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UCharGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned char value2 = op2->__anon1.uc;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar(value2 ? (op1->__anon1.uc / value2) : (unsigned char)0);
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int FloatGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
float value2 = op2->__anon1.f;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat(op1->__anon1.f / value2);
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int DoubleDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int DoubleGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
double value2 = op2->__anon1.d;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble(op1->__anon1.d / value2);
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d > value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int IntSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
int value2 = op2->__anon1.i;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt(value2 ? (op1->__anon1.i % value2) : 0);
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UIntSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned int value2 = op2->__anon1.ui;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt(value2 ? (op1->__anon1.ui % value2) : 0);
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Mod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int Int64Sma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
long long value2 = op2->__anon1.i64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64(value2 ? (op1->__anon1.i64 % value2) : 0);
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Mod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UInt64Sma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
uint64 value2 = op2->__anon1.ui64;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64(value2 ? (op1->__anon1.ui64 % value2) : 0);
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int ShortSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
short value2 = op2->__anon1.s;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort(value2 ? (op1->__anon1.s % value2) : (short)0);
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UShortSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned short value2 = op2->__anon1.us;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort(value2 ? (op1->__anon1.us % value2) : (unsigned short)0);
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int CharSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
char value2 = op2->__anon1.c;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar(value2 ? (op1->__anon1.c % value2) : (char)0);
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharMod(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int UCharSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
unsigned char value2 = op2->__anon1.uc;
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar(value2 ? (op1->__anon1.uc % value2) : (unsigned char)0);
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int FloatSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+float value2 = op2->__anon1.f;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((-op1->__anon1.i));
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int DoubleSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+double value2 = op2->__anon1.d;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(-op1->__anon1.ui));
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d < value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Neg(struct Expression * exp, struct Operand * op1)
+static unsigned int IntGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+int value2 = op2->__anon1.i;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((-op1->__anon1.i64));
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Neg(struct Expression * exp, struct Operand * op1)
+static unsigned int UIntGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+unsigned int value2 = op2->__anon1.ui;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(-op1->__anon1.ui64));
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int Int64GrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+long long value2 = op2->__anon1.i64;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((-op1->__anon1.s));
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int UInt64GrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+uint64 value2 = op2->__anon1.ui64;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(-op1->__anon1.us));
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int ShortGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+short value2 = op2->__anon1.s;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((-op1->__anon1.c));
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int UShortGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+unsigned short value2 = op2->__anon1.us;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(-op1->__anon1.uc));
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int CharGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+char value2 = op2->__anon1.c;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(-op1->__anon1.f));
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int DoubleNeg(struct Expression * exp, struct Operand * op1)
+static unsigned int UCharGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+unsigned char value2 = op2->__anon1.uc;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(-op1->__anon1.d));
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntInc(struct Expression * exp, struct Operand * op1)
+static unsigned int FloatGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+float value2 = op2->__anon1.f;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((++op1->__anon1.i));
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntInc(struct Expression * exp, struct Operand * op1)
+static unsigned int DoubleGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+double value2 = op2->__anon1.d;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((++op1->__anon1.ui));
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d >= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Inc(struct Expression * exp, struct Operand * op1)
+static unsigned int IntSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+int value2 = op2->__anon1.i;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((++op1->__anon1.i64));
+exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Inc(struct Expression * exp, struct Operand * op1)
+static unsigned int UIntSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+unsigned int value2 = op2->__anon1.ui;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((++op1->__anon1.ui64));
+exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortInc(struct Expression * exp, struct Operand * op1)
+static unsigned int Int64SmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+long long value2 = op2->__anon1.i64;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((++op1->__anon1.s));
+exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortInc(struct Expression * exp, struct Operand * op1)
+static unsigned int UInt64SmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+uint64 value2 = op2->__anon1.ui64;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((++op1->__anon1.us));
+exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharInc(struct Expression * exp, struct Operand * op1)
+static unsigned int ShortSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+short value2 = op2->__anon1.s;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((++op1->__anon1.c));
+exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharInc(struct Expression * exp, struct Operand * op1)
+static unsigned int UShortSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+unsigned short value2 = op2->__anon1.us;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((++op1->__anon1.uc));
+exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us <= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int CharSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+char value2 = op2->__anon1.c;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c <= value2));
+if(!exp->expType)
+{
+exp->expType = op1->type;
+if(op1->type)
+op1->type->refCount++;
+}
+return 1;
+}
+
+static unsigned int UCharSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+{
+unsigned char value2 = op2->__anon1.uc;
+
+exp->type = 2;
+exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatInc(struct Expression * exp, struct Operand * op1)
+static unsigned int FloatSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+float value2 = op2->__anon1.f;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(++op1->__anon1.f));
+exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int DoubleInc(struct Expression * exp, struct Operand * op1)
+static unsigned int DoubleSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
+double value2 = op2->__anon1.d;
+
exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(++op1->__anon1.d));
+exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d <= value2));
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int IntDec(struct Expression * exp, struct Operand * op1)
+static unsigned int IntCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((--op1->__anon1.i));
+exp->__anon1.__anon2.string = PrintInt(op1->__anon1.i ? op2->__anon1.i : op3->__anon1.i);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UIntDec(struct Expression * exp, struct Operand * op1)
+static unsigned int UIntCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((--op1->__anon1.ui));
+exp->__anon1.__anon2.string = PrintUInt(op1->__anon1.ui ? op2->__anon1.ui : op3->__anon1.ui);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int Int64Dec(struct Expression * exp, struct Operand * op1)
+static unsigned int Int64Cond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((--op1->__anon1.i64));
+exp->__anon1.__anon2.string = PrintInt64(op1->__anon1.i64 ? op2->__anon1.i64 : op3->__anon1.i64);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UInt64Dec(struct Expression * exp, struct Operand * op1)
+static unsigned int UInt64Cond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((--op1->__anon1.ui64));
+exp->__anon1.__anon2.string = PrintUInt64(op1->__anon1.ui64 ? op2->__anon1.ui64 : op3->__anon1.ui64);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int ShortDec(struct Expression * exp, struct Operand * op1)
+static unsigned int ShortCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((--op1->__anon1.s));
+exp->__anon1.__anon2.string = PrintShort(op1->__anon1.s ? op2->__anon1.s : op3->__anon1.s);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UShortDec(struct Expression * exp, struct Operand * op1)
+static unsigned int UShortCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((--op1->__anon1.us));
+exp->__anon1.__anon2.string = PrintUShort(op1->__anon1.us ? op2->__anon1.us : op3->__anon1.us);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int CharDec(struct Expression * exp, struct Operand * op1)
+static unsigned int CharCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((--op1->__anon1.c));
+exp->__anon1.__anon2.string = PrintChar(op1->__anon1.c ? op2->__anon1.c : op3->__anon1.c);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int UCharDec(struct Expression * exp, struct Operand * op1)
+static unsigned int UCharCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
{
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((--op1->__anon1.uc));
+exp->__anon1.__anon2.string = PrintUChar(op1->__anon1.uc ? op2->__anon1.uc : op3->__anon1.uc);
if(!exp->expType)
{
exp->expType = op1->type;
if(op1->type)
op1->type->refCount++;
}
-return 0x1;
+return 1;
}
-static unsigned int FloatDec(struct Expression * exp, struct Operand * op1)
+static void PrintName(struct Type * type, char * string, unsigned int fullName)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(--op1->__anon1.f));
-if(!exp->expType)
+if(type->name && type->name[0])
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(fullName)
+strcat(string, type->name);
+else
+{
+char * name = __ecereNameSpace__ecere__sys__RSearchString(type->name, "::", strlen(type->name), 1, 0);
+
+if(name)
+name += 2;
+else
+name = type->name;
+strcat(string, name);
+}
}
-return 0x1;
}
-static unsigned int DoubleDec(struct Expression * exp, struct Operand * op1)
+static void PrintAttribs(struct Type * type, char * string)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(--op1->__anon1.d));
-if(!exp->expType)
+if(type)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(type->dllExport)
+strcat(string, "dllexport ");
+if(type->attrStdcall)
+strcat(string, "stdcall ");
}
-return 0x1;
}
-static unsigned int IntAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static struct Type * FindMember(struct Type * type, char * string)
{
-int value2 = op2->__anon1.i;
+struct Type * memberType;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i = value2));
-if(!exp->expType)
+for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!memberType->name)
+{
+struct Type * subType = FindMember(memberType, string);
+
+if(subType)
+return subType;
+}
+else if(!strcmp(memberType->name, string))
+return memberType;
}
-return 0x1;
+return (((void *)0));
}
-static unsigned int UIntAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int __ecereProp_Type_Get_isPointerType(struct Type * this);
+
+unsigned int __ecereProp_Type_Get_specConst(struct Type * this);
+
+static unsigned int Promote(struct Operand * op, int kind, unsigned int isSigned)
{
-unsigned int value2 = op2->__anon1.ui;
+unsigned int result = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui = value2));
-if(!exp->expType)
+switch(kind)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+case 2:
+if(op->kind == 1 || op->kind == 15 || op->kind == 24)
+result = isSigned ? GetOpShort(op, &op->__anon1.s) : GetOpUShort(op, &op->__anon1.us);
+break;
+case 3:
+case 5:
+if(op->kind == 1 || op->kind == 2 || op->kind == 15 || op->kind == 24)
+result = isSigned ? GetOpInt(op, &op->__anon1.i) : GetOpUInt(op, &op->__anon1.ui);
+break;
+case 4:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 7 || op->kind == 13 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
+result = isSigned ? GetOpInt64(op, &op->__anon1.i64) : GetOpUInt64(op, &op->__anon1.ui64);
+break;
+case 6:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
+result = GetOpFloat(op, &op->__anon1.f);
+break;
+case 7:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
+result = GetOpDouble(op, &op->__anon1.d);
+break;
+case 13:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 7 || op->kind == 13 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
+result = GetOpUInt64(op, &op->__anon1.ui64);
+break;
+case 15:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 7 || op->kind == 13 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
+result = isSigned ? GetOpInt(op, &op->__anon1.i) : GetOpUInt(op, &op->__anon1.ui);
+break;
+case 22:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 5 || op->kind == 15 || op->kind == 24)
+result = isSigned ? GetOpInt64(op, &op->__anon1.i64) : GetOpUInt64(op, &op->__anon1.ui64);
+break;
+case 23:
+if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 5 || op->kind == 15 || op->kind == 24)
+result = isSigned ? GetOpInt64(op, &op->__anon1.i64) : GetOpUInt64(op, &op->__anon1.ui64);
+break;
+}
+return result;
+}
+
+struct OpTable floatOps =
+{
+(void *)(FloatAdd), (void *)(FloatSub), (void *)(FloatMul), (void *)(FloatDiv), (((void *)0)), (void *)(FloatNeg), (void *)(FloatInc), (void *)(FloatDec), (void *)(FloatAsign), (void *)(FloatAddAsign), (void *)(FloatSubAsign), (void *)(FloatMulAsign), (void *)(FloatDivAsign), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (void *)(FloatEqu), (void *)(FloatNqu), (void *)(FloatAnd), (void *)(FloatOr), (void *)(FloatGrt), (void *)(FloatSma), (void *)(FloatGrtEqu), (void *)(FloatSmaEqu)
+};
+
+struct OpTable doubleOps =
+{
+(void *)(DoubleAdd), (void *)(DoubleSub), (void *)(DoubleMul), (void *)(DoubleDiv), (((void *)0)), (void *)(DoubleNeg), (void *)(DoubleInc), (void *)(DoubleDec), (void *)(DoubleAsign), (void *)(DoubleAddAsign), (void *)(DoubleSubAsign), (void *)(DoubleMulAsign), (void *)(DoubleDivAsign), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (void *)(DoubleEqu), (void *)(DoubleNqu), (void *)(DoubleAnd), (void *)(DoubleOr), (void *)(DoubleGrt), (void *)(DoubleSma), (void *)(DoubleGrtEqu), (void *)(DoubleSmaEqu)
+};
+
+struct OpTable intOps =
+{
+(void *)(IntAdd), (void *)(IntSub), (void *)(IntMul), (void *)(IntDiv), (void *)(IntMod), (void *)(IntNeg), (void *)(IntInc), (void *)(IntDec), (void *)(IntAsign), (void *)(IntAddAsign), (void *)(IntSubAsign), (void *)(IntMulAsign), (void *)(IntDivAsign), (void *)(IntModAsign), (void *)(IntBitAnd), (void *)(IntBitOr), (void *)(IntBitXor), (void *)(IntLShift), (void *)(IntRShift), (void *)(IntBitNot), (void *)(IntAndAsign), (void *)(IntOrAsign), (void *)(IntXorAsign), (void *)(IntLShiftAsign), (void *)(IntRShiftAsign), (void *)(IntNot), (void *)(IntEqu), (void *)(IntNqu), (void *)(IntAnd), (void *)(IntOr), (void *)(IntGrt), (void *)(IntSma), (void *)(IntGrtEqu), (void *)(IntSmaEqu), (void *)(IntCond)
+};
+
+struct OpTable uintOps =
+{
+(void *)(UIntAdd), (void *)(UIntSub), (void *)(UIntMul), (void *)(UIntDiv), (void *)(UIntMod), (void *)(UIntNeg), (void *)(UIntInc), (void *)(UIntDec), (void *)(UIntAsign), (void *)(UIntAddAsign), (void *)(UIntSubAsign), (void *)(UIntMulAsign), (void *)(UIntDivAsign), (void *)(UIntModAsign), (void *)(UIntBitAnd), (void *)(UIntBitOr), (void *)(UIntBitXor), (void *)(UIntLShift), (void *)(UIntRShift), (void *)(UIntBitNot), (void *)(UIntAndAsign), (void *)(UIntOrAsign), (void *)(UIntXorAsign), (void *)(UIntLShiftAsign), (void *)(UIntRShiftAsign), (void *)(UIntNot), (void *)(UIntEqu), (void *)(UIntNqu), (void *)(UIntAnd), (void *)(UIntOr), (void *)(UIntGrt), (void *)(UIntSma), (void *)(UIntGrtEqu), (void *)(UIntSmaEqu), (void *)(UIntCond)
+};
+
+struct OpTable int64Ops =
+{
+(void *)(Int64Add), (void *)(Int64Sub), (void *)(Int64Mul), (void *)(Int64Div), (void *)(Int64Mod), (void *)(Int64Neg), (void *)(Int64Inc), (void *)(Int64Dec), (void *)(Int64Asign), (void *)(Int64AddAsign), (void *)(Int64SubAsign), (void *)(Int64MulAsign), (void *)(Int64DivAsign), (void *)(Int64ModAsign), (void *)(Int64BitAnd), (void *)(Int64BitOr), (void *)(Int64BitXor), (void *)(Int64LShift), (void *)(Int64RShift), (void *)(Int64BitNot), (void *)(Int64AndAsign), (void *)(Int64OrAsign), (void *)(Int64XorAsign), (void *)(Int64LShiftAsign), (void *)(Int64RShiftAsign), (void *)(Int64Not), (void *)(Int64Equ), (void *)(Int64Nqu), (void *)(Int64And), (void *)(Int64Or), (void *)(Int64Grt), (void *)(Int64Sma), (void *)(Int64GrtEqu), (void *)(Int64SmaEqu), (void *)(Int64Cond)
+};
+
+struct OpTable uint64Ops =
+{
+(void *)(UInt64Add), (void *)(UInt64Sub), (void *)(UInt64Mul), (void *)(UInt64Div), (void *)(UInt64Mod), (void *)(UInt64Neg), (void *)(UInt64Inc), (void *)(UInt64Dec), (void *)(UInt64Asign), (void *)(UInt64AddAsign), (void *)(UInt64SubAsign), (void *)(UInt64MulAsign), (void *)(UInt64DivAsign), (void *)(UInt64ModAsign), (void *)(UInt64BitAnd), (void *)(UInt64BitOr), (void *)(UInt64BitXor), (void *)(UInt64LShift), (void *)(UInt64RShift), (void *)(UInt64BitNot), (void *)(UInt64AndAsign), (void *)(UInt64OrAsign), (void *)(UInt64XorAsign), (void *)(UInt64LShiftAsign), (void *)(UInt64RShiftAsign), (void *)(UInt64Not), (void *)(UInt64Equ), (void *)(UInt64Nqu), (void *)(UInt64And), (void *)(UInt64Or), (void *)(UInt64Grt), (void *)(UInt64Sma), (void *)(UInt64GrtEqu), (void *)(UInt64SmaEqu), (void *)(UInt64Cond)
+};
+
+struct OpTable shortOps =
+{
+(void *)(ShortAdd), (void *)(ShortSub), (void *)(ShortMul), (void *)(ShortDiv), (void *)(ShortMod), (void *)(ShortNeg), (void *)(ShortInc), (void *)(ShortDec), (void *)(ShortAsign), (void *)(ShortAddAsign), (void *)(ShortSubAsign), (void *)(ShortMulAsign), (void *)(ShortDivAsign), (void *)(ShortModAsign), (void *)(ShortBitAnd), (void *)(ShortBitOr), (void *)(ShortBitXor), (void *)(ShortLShift), (void *)(ShortRShift), (void *)(ShortBitNot), (void *)(ShortAndAsign), (void *)(ShortOrAsign), (void *)(ShortXorAsign), (void *)(ShortLShiftAsign), (void *)(ShortRShiftAsign), (void *)(ShortNot), (void *)(ShortEqu), (void *)(ShortNqu), (void *)(ShortAnd), (void *)(ShortOr), (void *)(ShortGrt), (void *)(ShortSma), (void *)(ShortGrtEqu), (void *)(ShortSmaEqu), (void *)(ShortCond)
+};
+
+struct OpTable ushortOps =
+{
+(void *)(UShortAdd), (void *)(UShortSub), (void *)(UShortMul), (void *)(UShortDiv), (void *)(UShortMod), (void *)(UShortNeg), (void *)(UShortInc), (void *)(UShortDec), (void *)(UShortAsign), (void *)(UShortAddAsign), (void *)(UShortSubAsign), (void *)(UShortMulAsign), (void *)(UShortDivAsign), (void *)(UShortModAsign), (void *)(UShortBitAnd), (void *)(UShortBitOr), (void *)(UShortBitXor), (void *)(UShortLShift), (void *)(UShortRShift), (void *)(UShortBitNot), (void *)(UShortAndAsign), (void *)(UShortOrAsign), (void *)(UShortXorAsign), (void *)(UShortLShiftAsign), (void *)(UShortRShiftAsign), (void *)(UShortNot), (void *)(UShortEqu), (void *)(UShortNqu), (void *)(UShortAnd), (void *)(UShortOr), (void *)(UShortGrt), (void *)(UShortSma), (void *)(UShortGrtEqu), (void *)(UShortSmaEqu), (void *)(UShortCond)
+};
+
+struct OpTable charOps =
+{
+(void *)(CharAdd), (void *)(CharSub), (void *)(CharMul), (void *)(CharDiv), (void *)(CharMod), (void *)(CharNeg), (void *)(CharInc), (void *)(CharDec), (void *)(CharAsign), (void *)(CharAddAsign), (void *)(CharSubAsign), (void *)(CharMulAsign), (void *)(CharDivAsign), (void *)(CharModAsign), (void *)(CharBitAnd), (void *)(CharBitOr), (void *)(CharBitXor), (void *)(CharLShift), (void *)(CharRShift), (void *)(CharBitNot), (void *)(CharAndAsign), (void *)(CharOrAsign), (void *)(CharXorAsign), (void *)(CharLShiftAsign), (void *)(CharRShiftAsign), (void *)(CharNot), (void *)(CharEqu), (void *)(CharNqu), (void *)(CharAnd), (void *)(CharOr), (void *)(CharGrt), (void *)(CharSma), (void *)(CharGrtEqu), (void *)(CharSmaEqu), (void *)(CharCond)
+};
+
+struct OpTable ucharOps =
+{
+(void *)(UCharAdd), (void *)(UCharSub), (void *)(UCharMul), (void *)(UCharDiv), (void *)(UCharMod), (void *)(UCharNeg), (void *)(UCharInc), (void *)(UCharDec), (void *)(UCharAsign), (void *)(UCharAddAsign), (void *)(UCharSubAsign), (void *)(UCharMulAsign), (void *)(UCharDivAsign), (void *)(UCharModAsign), (void *)(UCharBitAnd), (void *)(UCharBitOr), (void *)(UCharBitXor), (void *)(UCharLShift), (void *)(UCharRShift), (void *)(UCharBitNot), (void *)(UCharAndAsign), (void *)(UCharOrAsign), (void *)(UCharXorAsign), (void *)(UCharLShiftAsign), (void *)(UCharRShiftAsign), (void *)(UCharNot), (void *)(UCharEqu), (void *)(UCharNqu), (void *)(UCharAnd), (void *)(UCharOr), (void *)(UCharGrt), (void *)(UCharSma), (void *)(UCharGrtEqu), (void *)(UCharSmaEqu), (void *)(UCharCond)
+};
+
+struct Type * FindMemberAndOffset(struct Type * type, char * string, unsigned int * offset)
+{
+struct Type * memberType;
+
+for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
+{
+if(!memberType->name)
+{
+struct Type * subType = FindMember(memberType, string);
+
+if(subType)
+{
+*offset += memberType->offset;
+return subType;
+}
+}
+else if(!strcmp(memberType->name, string))
+{
+*offset += memberType->offset;
+return memberType;
}
-return 0x1;
}
+return (((void *)0));
+}
+
+struct __ecereNameSpace__ecere__com__Module;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereNameSpace__ecere__com__eClass_FindProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, struct __ecereNameSpace__ecere__com__Instance * module);
+
+extern struct __ecereNameSpace__ecere__com__Instance * privateModule;
+
+extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_FindMethod(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, struct __ecereNameSpace__ecere__com__Instance * module);
+
+extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere__com__eClass_FindDataMember(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, struct __ecereNameSpace__ecere__com__Instance * module, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos);
+
+extern struct ModuleImport * FindModule(struct __ecereNameSpace__ecere__com__Instance * moduleToFind);
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
+
+struct GlobalData
+{
+uintptr_t key;
+struct __ecereNameSpace__ecere__sys__BTNode * parent;
+struct __ecereNameSpace__ecere__sys__BTNode * left;
+struct __ecereNameSpace__ecere__sys__BTNode * right;
+int depth;
+struct __ecereNameSpace__ecere__com__Instance * module;
+char * dataTypeString;
+struct Type * dataType;
+void * symbol;
+char * fullName;
+} ecere_gcc_struct;
+
+extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, unsigned int * offset, struct __ecereNameSpace__ecere__com__Instance * module, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos);
+
+extern struct __ecereNameSpace__ecere__com__Instance * GetPrivateModule(void);
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_RegisterClass(int type, const char * name, const 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__Instance * __thisModule;
+
+struct __ecereNameSpace__ecere__com__DefinedExpression;
+
+extern struct __ecereNameSpace__ecere__com__DefinedExpression * __ecereNameSpace__ecere__com__eSystem_FindDefine(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
+
+struct __ecereNameSpace__ecere__com__DefinedExpression
+{
+struct __ecereNameSpace__ecere__com__DefinedExpression * prev;
+struct __ecereNameSpace__ecere__com__DefinedExpression * next;
+const char * name;
+const char * value;
+struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
+} ecere_gcc_struct;
-static unsigned int Int64Asign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-long long value2 = op2->__anon1.i64;
+struct __ecereNameSpace__ecere__sys__BinaryTree;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 = value2));
-if(!exp->expType)
+struct __ecereNameSpace__ecere__sys__BinaryTree
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__sys__BTNode * root;
+int count;
+int (* CompareKey)(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, uintptr_t a, uintptr_t b);
+void (* FreeKey)(void * key);
+} ecere_gcc_struct;
-static unsigned int UInt64Asign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct __ecereNameSpace__ecere__com__Class
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__Class * prev;
+struct __ecereNameSpace__ecere__com__Class * next;
+const char * name;
+int offset;
+int structSize;
+void * * _vTbl;
+int vTblSize;
+unsigned int (* Constructor)(void * );
+void (* Destructor)(void * );
+int offsetClass;
+int sizeClass;
+struct __ecereNameSpace__ecere__com__Class * base;
+struct __ecereNameSpace__ecere__sys__BinaryTree methods;
+struct __ecereNameSpace__ecere__sys__BinaryTree members;
+struct __ecereNameSpace__ecere__sys__BinaryTree prop;
+struct __ecereNameSpace__ecere__sys__OldList membersAndProperties;
+struct __ecereNameSpace__ecere__sys__BinaryTree classProperties;
+struct __ecereNameSpace__ecere__sys__OldList derivatives;
+int memberID;
+int startMemberID;
+int type;
+struct __ecereNameSpace__ecere__com__Instance * module;
+struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
+const char * dataTypeString;
+struct Type * dataType;
+int typeSize;
+int defaultAlignment;
+void (* Initialize)();
+int memberOffset;
+struct __ecereNameSpace__ecere__sys__OldList selfWatchers;
+const char * designerClass;
+unsigned int noExpansion;
+const char * defaultProperty;
+unsigned int comRedefinition;
+int count;
+int isRemote;
+unsigned int internalDecl;
+void * data;
+unsigned int computeSize;
+short structAlignment;
+short pointerAlignment;
+int destructionWatchOffset;
+unsigned int fixed;
+struct __ecereNameSpace__ecere__sys__OldList delayedCPValues;
+int inheritanceAccess;
+const char * fullName;
+void * symbol;
+struct __ecereNameSpace__ecere__sys__OldList conversions;
+struct __ecereNameSpace__ecere__sys__OldList templateParams;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument * templateArgs;
+struct __ecereNameSpace__ecere__com__Class * templateClass;
+struct __ecereNameSpace__ecere__sys__OldList templatized;
+int numParams;
+unsigned int isInstanceClass;
+unsigned int byValueSystemClass;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 = value2));
-if(!exp->expType)
+struct __ecereNameSpace__ecere__com__NameSpace
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+const char * name;
+struct __ecereNameSpace__ecere__com__NameSpace * btParent;
+struct __ecereNameSpace__ecere__com__NameSpace * left;
+struct __ecereNameSpace__ecere__com__NameSpace * right;
+int depth;
+struct __ecereNameSpace__ecere__com__NameSpace * parent;
+struct __ecereNameSpace__ecere__sys__BinaryTree nameSpaces;
+struct __ecereNameSpace__ecere__sys__BinaryTree classes;
+struct __ecereNameSpace__ecere__sys__BinaryTree defines;
+struct __ecereNameSpace__ecere__sys__BinaryTree functions;
+} ecere_gcc_struct;
-static unsigned int ShortAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct __ecereNameSpace__ecere__com__DataMember
{
-short value2 = op2->__anon1.s;
+struct __ecereNameSpace__ecere__com__DataMember * prev;
+struct __ecereNameSpace__ecere__com__DataMember * next;
+const char * name;
+unsigned int isProperty;
+int memberAccess;
+int id;
+struct __ecereNameSpace__ecere__com__Class * _class;
+const char * dataTypeString;
+struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
+struct Type * dataType;
+int type;
+int offset;
+int memberID;
+struct __ecereNameSpace__ecere__sys__OldList members;
+struct __ecereNameSpace__ecere__sys__BinaryTree membersAlpha;
+int memberOffset;
+short structAlignment;
+short pointerAlignment;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s = value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(struct __ecereNameSpace__ecere__sys__BinaryTree * this, const char * key);
-static unsigned int UShortAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned short value2 = op2->__anon1.us;
+unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(struct __ecereNameSpace__ecere__sys__BinaryTree * this, struct __ecereNameSpace__ecere__sys__BTNode * node);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us = value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(struct __ecereNameSpace__ecere__sys__BinaryTree * this);
-static unsigned int CharAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-char value2 = op2->__anon1.c;
+struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindPrefix(struct __ecereNameSpace__ecere__sys__BinaryTree * this, const char * key);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c = value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+void __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Remove(struct __ecereNameSpace__ecere__sys__BinaryTree * this, struct __ecereNameSpace__ecere__sys__BTNode * node);
-static unsigned int UCharAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned char value2 = op2->__anon1.uc;
+static struct __ecereNameSpace__ecere__com__Class * __ecereClass_Conversion;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc = value2));
-if(!exp->expType)
+static void _DeclareType(struct External * neededFor, struct Type * type, unsigned int needDereference, unsigned int forFunctionDef, unsigned int fwdDecl)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int FloatAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(inCompiler)
{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f = value2));
-if(!exp->expType)
+if(type->kind == 11)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Type * param;
-static unsigned int DoubleAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(param = type->__anon1.__anon2.params.first; param; param = param->next)
+_DeclareType(neededFor, param, forFunctionDef, 0, fwdDecl);
+_DeclareType(neededFor, type->__anon1.__anon2.returnType, forFunctionDef, 0, fwdDecl);
+}
+else if(type->kind == 13)
+_DeclareType(neededFor, type->__anon1.type, 0, 0, fwdDecl);
+else if(type->kind == 8)
{
-double value2 = op2->__anon1.d;
+struct __ecereNameSpace__ecere__com__Class * c = type->__anon1._class->__anon1.registered;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d = value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+_DeclareStruct(neededFor, c ? c->fullName : "ecere::com::Instance", c ? c->type == 5 : 0, needDereference && c && c->type == 1, fwdDecl);
}
-return 0x1;
-}
-
-static unsigned int IntAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(type->kind == 9 || type->kind == 10)
{
-int value2 = op2->__anon1.i;
+struct Type * member;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i += value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+for(member = type->__anon1.__anon1.members.first; member; member = member->next)
+_DeclareType(neededFor, member, needDereference, forFunctionDef, fwdDecl);
+}
+else if(type->kind == 12)
+_DeclareType(neededFor, type->__anon1.__anon4.arrayType, 1, 0, fwdDecl);
}
-return 0x1;
}
-static unsigned int UIntAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int CheckConstCompatibility(struct Type * source, struct Type * dest, unsigned int warn)
{
-unsigned int value2 = op2->__anon1.ui;
+unsigned int status = 1;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui += value2));
-if(!exp->expType)
+if(((source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered) || source->kind == 12 || source->kind == 13) && ((dest->kind == 8 && dest->__anon1._class && dest->__anon1._class->__anon1.registered) || dest->kind == 13))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__Class * sourceClass = source->kind == 8 ? source->__anon1._class->__anon1.registered : (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * destClass = dest->kind == 8 ? dest->__anon1._class->__anon1.registered : (((void *)0));
-static unsigned int Int64AddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if((!sourceClass || (sourceClass && sourceClass->type == 0 && !sourceClass->structSize)) && (!destClass || (destClass && destClass->type == 0 && !destClass->structSize)))
{
-long long value2 = op2->__anon1.i64;
+struct Type * sourceType = source, * destType = dest;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 += value2));
-if(!exp->expType)
+while((sourceType->kind == 13 || sourceType->kind == 12) && sourceType->__anon1.type)
+sourceType = sourceType->__anon1.type;
+while((destType->kind == 13 || destType->kind == 12) && destType->__anon1.type)
+destType = destType->__anon1.type;
+if(!destType->constant && sourceType->constant)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+status = 0;
+if(warn)
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "discarding const qualifier\n", (((void *)0))));
+}
}
-return 0x1;
+}
+return status;
}
-static unsigned int UInt64AddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Operand GetOperand(struct Expression * exp)
{
-uint64 value2 = op2->__anon1.ui64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 += value2));
-if(!exp->expType)
+struct Operand op =
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+0, 0, 0,
+.__anon1 = {
+.c = 0
+},
+{
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
+};
+struct Type * type = exp->expType;
-static unsigned int ShortAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(type)
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s += value2));
-if(!exp->expType)
+while(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 2 || type->__anon1._class->__anon1.registered->type == 3 || type->__anon1._class->__anon1.registered->type == 4))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!type->__anon1._class->__anon1.registered->dataType)
+type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0);
+type = type->__anon1._class->__anon1.registered->dataType;
}
-return 0x1;
+if(exp->type == 3 && op.kind == 13)
+{
+op.__anon1.ui64 = (uint64)(uintptr_t)exp->__anon1.__anon2.string;
+op.kind = 13;
+op.ops = uint64Ops;
}
-
-static unsigned int UShortAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(exp->isConstant && exp->type == 2)
{
-unsigned short value2 = op2->__anon1.us;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us += value2));
-if(!exp->expType)
+op.kind = type->kind;
+op.type = type;
+switch(op.kind)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+case 24:
+case 1:
+{
+if(exp->__anon1.__anon1.constant[0] == '\'')
+{
+op.__anon1.c = exp->__anon1.__anon1.constant[1];
+op.ops = charOps;
}
-
-static unsigned int CharAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(type->isSigned)
{
-char value2 = op2->__anon1.c;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c += value2));
-if(!exp->expType)
+op.__anon1.c = (char)strtol(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = charOps;
+}
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+op.__anon1.uc = (unsigned char)strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = ucharOps;
}
-return 0x1;
+break;
}
-
-static unsigned int UCharAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 2:
+if(exp->__anon1.__anon1.constant[0] == '\'')
{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc += value2));
-if(!exp->expType)
+op.__anon1.s = exp->__anon1.__anon1.constant[1];
+op.ops = shortOps;
+}
+else if(type->isSigned)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+op.__anon1.s = (short)strtol(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = shortOps;
}
-return 0x1;
+else
+{
+op.__anon1.us = (unsigned short)strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = ushortOps;
}
-
-static unsigned int FloatAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+break;
+case 3:
+case 5:
+if(exp->__anon1.__anon1.constant[0] == '\'')
{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f += value2));
-if(!exp->expType)
+op.__anon1.i = exp->__anon1.__anon1.constant[1];
+op.ops = intOps;
+}
+else if(type->isSigned)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+op.__anon1.i = strtol(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = intOps;
}
-return 0x1;
+else
+{
+op.__anon1.ui = (unsigned int)strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = uintOps;
}
-
-static unsigned int DoubleAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+op.kind = 3;
+break;
+case 4:
+if(type->isSigned)
{
-double value2 = op2->__anon1.d;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d += value2));
-if(!exp->expType)
+op.__anon1.i64 = __ecereNameSpace__ecere__com___strtoi64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = int64Ops;
+}
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = uint64Ops;
}
-return 0x1;
+op.kind = 4;
+break;
+case 22:
+if(type->isSigned)
+{
+op.__anon1.i64 = __ecereNameSpace__ecere__com___strtoi64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = int64Ops;
}
-
-static unsigned int IntSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-int value2 = op2->__anon1.i;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i -= value2));
-if(!exp->expType)
+op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = uint64Ops;
+}
+op.kind = 4;
+break;
+case 23:
+if(type->isSigned)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+op.__anon1.i64 = __ecereNameSpace__ecere__com___strtoi64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = int64Ops;
+}
+else
+{
+op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.ops = uint64Ops;
+}
+op.kind = 4;
+break;
+case 6:
+if(!strcmp(exp->__anon1.__anon1.constant, "inf"))
+op.__anon1.f = __ecereMethod_float_inf();
+else if(!strcmp(exp->__anon1.__anon1.constant, "-inf"))
+op.__anon1.f = -__ecereMethod_float_inf();
+else if(!strcmp(exp->__anon1.__anon1.constant, "nan"))
+op.__anon1.f = __ecereMethod_float_nan();
+else if(!strcmp(exp->__anon1.__anon1.constant, "-nan"))
+op.__anon1.f = -__ecereMethod_float_nan();
+else
+op.__anon1.f = (float)strtod(exp->__anon1.__anon1.constant, (((void *)0)));
+op.ops = floatOps;
+break;
+case 7:
+if(!strcmp(exp->__anon1.__anon1.constant, "inf"))
+op.__anon1.d = __ecereMethod_double_inf();
+else if(!strcmp(exp->__anon1.__anon1.constant, "-inf"))
+op.__anon1.d = -__ecereMethod_double_inf();
+else if(!strcmp(exp->__anon1.__anon1.constant, "nan"))
+op.__anon1.d = __ecereMethod_double_nan();
+else if(!strcmp(exp->__anon1.__anon1.constant, "-nan"))
+op.__anon1.d = -__ecereMethod_double_nan();
+else
+op.__anon1.d = (double)strtod(exp->__anon1.__anon1.constant, (((void *)0)));
+op.ops = doubleOps;
+break;
+case 12:
+case 13:
+case 8:
+op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
+op.kind = 13;
+op.ops = uint64Ops;
+break;
}
-return 0x1;
+}
+}
+return op;
}
-static unsigned int UIntSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static long long GetEnumValue(struct __ecereNameSpace__ecere__com__Class * _class, void * ptr)
{
-unsigned int value2 = op2->__anon1.ui;
+long long v = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui -= value2));
-if(!exp->expType)
+switch(_class->typeSize)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+case 8:
+if(!strcmp(_class->dataTypeString, "uint64"))
+v = (long long)*(uint64 *)ptr;
+else
+v = *(long long *)ptr;
+break;
+case 4:
+if(!strcmp(_class->dataTypeString, "uint"))
+v = (long long)*(unsigned int *)ptr;
+else
+v = (long long)*(int *)ptr;
+break;
+case 2:
+if(!strcmp(_class->dataTypeString, "uint16"))
+v = (long long)*(unsigned short *)ptr;
+else
+v = (long long)*(short *)ptr;
+break;
+case 1:
+if(!strcmp(_class->dataTypeString, "byte"))
+v = (long long)*(unsigned char *)ptr;
+else
+v = (long long)*(char *)ptr;
+break;
}
-return 0x1;
+return v;
}
-static unsigned int Int64SubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void GetTypeSpecs(struct Type * type, struct __ecereNameSpace__ecere__sys__OldList * specs)
{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 -= value2));
-if(!exp->expType)
+if(!type->isSigned && type->kind != 22 && type->kind != 23)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+switch(type->kind)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+case 8:
+{
+if(type->__anon1._class->__anon1.registered)
+{
+if(!type->__anon1._class->__anon1.registered->dataType)
+type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0);
+GetTypeSpecs(type->__anon1._class->__anon1.registered->dataType, specs);
+}
+break;
+}
+case 7:
+ListAdd(specs, MkSpecifier(DOUBLE));
+break;
+case 6:
+ListAdd(specs, MkSpecifier(FLOAT));
+break;
+case 1:
+ListAdd(specs, MkSpecifier(CHAR));
+break;
+case 24:
+ListAdd(specs, MkSpecifier(_BOOL));
+break;
+case 2:
+ListAdd(specs, MkSpecifier(SHORT));
+break;
+case 4:
+ListAdd(specs, MkSpecifier(INT64));
+break;
+case 22:
+ListAdd(specs, MkSpecifierName(type->isSigned ? "intptr" : "uintptr"));
+break;
+case 23:
+ListAdd(specs, MkSpecifierName(type->isSigned ? "intsize" : "uintsize"));
+break;
+case 3:
+default:
+ListAdd(specs, MkSpecifier(INT));
+break;
}
-return 0x1;
}
-static unsigned int UInt64SubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-uint64 value2 = op2->__anon1.ui64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 -= value2));
-if(!exp->expType)
+static void PrintTypeSpecs(struct Type * type, char * string, unsigned int fullName, unsigned int printConst)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int ShortSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(type)
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s -= value2));
-if(!exp->expType)
+if(printConst && type->constant)
+strcat(string, "const ");
+switch(type->kind)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int UShortSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 8:
{
-unsigned short value2 = op2->__anon1.us;
+struct Symbol * c = type->__anon1._class;
+unsigned int isObjectBaseClass = !c || !c->string || !strcmp(c->string, "class");
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us -= value2));
-if(!exp->expType)
+if(type->classObjectType == 2 && isObjectBaseClass)
+strcat(string, "typed_object");
+else if(type->classObjectType == 3 && isObjectBaseClass)
+strcat(string, "any_object");
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(c && c->string)
+strcat(string, (fullName || !c->__anon1.registered) ? c->string : c->__anon1.registered->name);
}
-return 0x1;
+if(type->byReference)
+strcat(string, " &");
+break;
}
-
-static unsigned int CharSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-char value2 = op2->__anon1.c;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c -= value2));
-if(!exp->expType)
+case 0:
+strcat(string, "void");
+break;
+case 3:
+strcat(string, type->isSigned ? "int" : "uint");
+break;
+case 4:
+strcat(string, type->isSigned ? "int64" : "uint64");
+break;
+case 22:
+strcat(string, type->isSigned ? "intptr" : "uintptr");
+break;
+case 23:
+strcat(string, type->isSigned ? "intsize" : "uintsize");
+break;
+case 1:
+strcat(string, type->isSigned ? "char" : "byte");
+break;
+case 24:
+strcat(string, "_Bool");
+break;
+case 2:
+strcat(string, type->isSigned ? "short" : "uint16");
+break;
+case 6:
+strcat(string, "float");
+break;
+case 7:
+strcat(string, "double");
+break;
+case 9:
+if(type->__anon1.__anon1.enumName)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+strcat(string, "struct ");
+strcat(string, type->__anon1.__anon1.enumName);
}
-
-static unsigned int UCharSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(type->typeName)
+strcat(string, type->typeName);
+else
{
-unsigned char value2 = op2->__anon1.uc;
+struct Type * member;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc -= value2));
-if(!exp->expType)
+strcat(string, "struct { ");
+for(member = type->__anon1.__anon1.members.first; member; member = member->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+PrintType(member, string, 1, fullName);
+strcat(string, "; ");
}
-return 0x1;
+strcat(string, "}");
}
-
-static unsigned int FloatSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f -= value2));
-if(!exp->expType)
+break;
+case 10:
+if(type->__anon1.__anon1.enumName)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+strcat(string, "union ");
+strcat(string, type->__anon1.__anon1.enumName);
}
-
-static unsigned int DoubleSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(type->typeName)
+strcat(string, type->typeName);
+else
{
-double value2 = op2->__anon1.d;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d -= value2));
-if(!exp->expType)
+strcat(string, "union ");
+strcat(string, "(unnamed)");
+}
+break;
+case 15:
+if(type->__anon1.__anon1.enumName)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+strcat(string, "enum ");
+strcat(string, type->__anon1.__anon1.enumName);
}
-return 0x1;
+else if(type->typeName)
+strcat(string, type->typeName);
+else
+strcat(string, "int");
+break;
+case 14:
+strcat(string, "...");
+break;
+case 19:
+strcat(string, "subclass(");
+strcat(string, type->__anon1._class ? type->__anon1._class->string : "int");
+strcat(string, ")");
+break;
+case 20:
+strcat(string, type->__anon1.templateParameter->identifier->string);
+break;
+case 21:
+strcat(string, "thisclass");
+break;
+case 17:
+strcat(string, "__builtin_va_list");
+break;
}
-
-static unsigned int IntMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-int value2 = op2->__anon1.i;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-static unsigned int UIntMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned int value2 = op2->__anon1.ui;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui *= value2));
-if(!exp->expType)
+unsigned int RelatedUnits(struct __ecereNameSpace__ecere__com__Class * c1, struct __ecereNameSpace__ecere__com__Class * c2)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(c1->base->type == 3)
+c1 = c1->base;
+if(c2->base->type == 3)
+c2 = c2->base;
+return c1 == c2;
}
-static unsigned int Int64MulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-long long value2 = op2->__anon1.i64;
+extern char * __ecereNameSpace__ecere__com__PrintString(struct __ecereNameSpace__ecere__com__Class * class, const void * object, ...);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__TempFile;
-static unsigned int UInt64MulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-uint64 value2 = op2->__anon1.ui64;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassImport;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Symbol;
-static unsigned int ShortMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-short value2 = op2->__anon1.s;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyImport;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Type;
-static unsigned int UShortMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned short value2 = op2->__anon1.us;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplatedType;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateParameter;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MethodImport;
-static unsigned int CharMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-char value2 = op2->__anon1.c;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_FunctionImport;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Expression;
-static unsigned int UCharMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned char value2 = op2->__anon1.uc;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Instantiation;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64;
-static unsigned int FloatMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-float value2 = op2->__anon1.f;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TypeName;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Context;
-static unsigned int DoubleMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-double value2 = op2->__anon1.d;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Module;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d *= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__LinkList;
-static unsigned int IntDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-int value2 = op2->__anon1.i;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Application;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt(value2 ? (op1->__anon1.i /= value2) : 0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_int;
-static unsigned int UIntDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned int value2 = op2->__anon1.ui;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt(value2 ? (op1->__anon1.ui /= value2) : 0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__File;
-static unsigned int Int64DivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-long long value2 = op2->__anon1.i64;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_External;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64(value2 ? (op1->__anon1.i64 /= value2) : 0);
-if(!exp->expType)
+struct __ecereNameSpace__ecere__com__Application
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+int argc;
+const char * * argv;
+int exitCode;
+unsigned int isGUIApp;
+struct __ecereNameSpace__ecere__sys__OldList allModules;
+char * parsedCommand;
+struct __ecereNameSpace__ecere__com__NameSpace systemNameSpace;
+} ecere_gcc_struct;
-static unsigned int UInt64DivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void FindNextDataMember(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos)
{
-uint64 value2 = op2->__anon1.ui64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64(value2 ? (op1->__anon1.ui64 /= value2) : 0);
-if(!exp->expType)
+if(*curMember)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+*curMember = (*curMember)->next;
+if(subMemberStackPos && *subMemberStackPos > 0 && subMemberStack[*subMemberStackPos - 1]->type == 1)
+{
+*curMember = subMemberStack[--(*subMemberStackPos)];
+*curMember = (*curMember)->next;
}
-
-static unsigned int ShortDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+while((*curMember) && (*curMember)->isProperty)
+*curMember = (*curMember)->next;
+if(subMemberStackPos)
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort(value2 ? (op1->__anon1.s /= value2) : (short)0);
-if(!exp->expType)
+while((*curMember) && !(*curMember)->isProperty && !(*curMember)->name && ((*curMember)->type == 2 || (*curMember)->type == 1))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+subMemberStack[(*subMemberStackPos)++] = *curMember;
+*curMember = (*curMember)->members.first;
+while(*curMember && (*curMember)->isProperty)
+*curMember = (*curMember)->next;
}
-return 0x1;
}
-
-static unsigned int UShortDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+while(!*curMember)
{
-unsigned short value2 = op2->__anon1.us;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort(value2 ? (op1->__anon1.us /= value2) : (unsigned short)0);
-if(!exp->expType)
+if(!*curMember)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(subMemberStackPos && *subMemberStackPos)
+{
+*curMember = subMemberStack[--(*subMemberStackPos)];
+*curMember = (*curMember)->next;
}
-
-static unsigned int CharDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-char value2 = op2->__anon1.c;
+struct __ecereNameSpace__ecere__com__Class * lastCurClass = *curClass;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar(value2 ? (op1->__anon1.c /= value2) : (char)0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(*curClass == _class)
+break;
+for(*curClass = _class; (*curClass)->base != lastCurClass && (*curClass)->base->type != 1000; *curClass = (*curClass)->base)
+;
+*curMember = (*curClass)->membersAndProperties.first;
}
-
-static unsigned int UCharDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+while((*curMember) && (*curMember)->isProperty)
+*curMember = (*curMember)->next;
+if(subMemberStackPos)
{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar(value2 ? (op1->__anon1.uc /= value2) : (unsigned char)0);
-if(!exp->expType)
+while((*curMember) && !(*curMember)->isProperty && !(*curMember)->name && ((*curMember)->type == 2 || (*curMember)->type == 1))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+subMemberStack[(*subMemberStackPos)++] = *curMember;
+*curMember = (*curMember)->members.first;
+while(*curMember && (*curMember)->isProperty)
+*curMember = (*curMember)->next;
+}
}
-return 0x1;
}
-
-static unsigned int FloatDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat(op1->__anon1.f /= value2);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-static unsigned int DoubleDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static struct GlobalData * ScanGlobalData(struct __ecereNameSpace__ecere__com__NameSpace * nameSpace, char * name)
{
-double value2 = op2->__anon1.d;
+struct __ecereNameSpace__ecere__sys__BinaryTree * tree = &nameSpace->functions;
+struct GlobalData * data = (struct GlobalData *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString((&*tree), name);
+struct __ecereNameSpace__ecere__com__NameSpace * child;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble(op1->__anon1.d /= value2);
-if(!exp->expType)
+if(!data)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+for(child = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->nameSpaces); child; child = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)child)))
+{
+data = ScanGlobalData(child, name);
+if(data)
+break;
+}
}
-return 0x1;
+return data;
}
-static unsigned int IntModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static struct Symbol * ScanWithNameSpace(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, const char * nameSpace, const char * name)
{
-int value2 = op2->__anon1.i;
+int nsLen = strlen(nameSpace);
+struct Symbol * symbol;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt(value2 ? (op1->__anon1.i %= value2) : 0);
-if(!exp->expType)
+for(symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindPrefix(tree, nameSpace); symbol; symbol = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)symbol)))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+char * s = symbol->string;
-static unsigned int UIntModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!strncmp(s, nameSpace, nsLen))
{
-unsigned int value2 = op2->__anon1.ui;
+int c;
+char * namePart;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt(value2 ? (op1->__anon1.ui %= value2) : 0);
-if(!exp->expType)
+for(c = strlen(s) - 1; c >= 0; c--)
+if(s[c] == ':')
+break;
+namePart = s + c + 1;
+if(!strcmp(namePart, name))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+return symbol;
}
-return 0x1;
}
-
-static unsigned int Int64ModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64(value2 ? (op1->__anon1.i64 %= value2) : 0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+else
+break;
}
-return 0x1;
+return (((void *)0));
}
-static unsigned int UInt64ModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetInt(struct Expression * exp, int * value2)
{
-uint64 value2 = op2->__anon1.ui64;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64(value2 ? (op1->__anon1.ui64 %= value2) : 0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpInt(&op2, value2);
}
-static unsigned int ShortModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetUInt(struct Expression * exp, unsigned int * value2)
{
-short value2 = op2->__anon1.s;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort(value2 ? (op1->__anon1.s %= value2) : (short)0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpUInt(&op2, value2);
}
-static unsigned int UShortModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetInt64(struct Expression * exp, long long * value2)
{
-unsigned short value2 = op2->__anon1.us;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort(value2 ? (op1->__anon1.us %= value2) : (unsigned short)0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpInt64(&op2, value2);
}
-static unsigned int CharModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetUInt64(struct Expression * exp, uint64 * value2)
{
-char value2 = op2->__anon1.c;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar(value2 ? (op1->__anon1.c %= value2) : (char)0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpUInt64(&op2, value2);
}
-static unsigned int UCharModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetIntPtr(struct Expression * exp, intptr_t * value2)
{
-unsigned char value2 = op2->__anon1.uc;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar(value2 ? (op1->__anon1.uc %= value2) : (unsigned char)0);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpIntPtr(&op2, value2);
}
-static unsigned int IntBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetUIntPtr(struct Expression * exp, uintptr_t * value2)
{
-int value2 = op2->__anon1.i;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpUIntPtr(&op2, value2);
}
-static unsigned int UIntBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetIntSize(struct Expression * exp, ssize_t * value2)
{
-unsigned int value2 = op2->__anon1.ui;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpIntSize(&op2, value2);
}
-static unsigned int Int64BitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetUIntSize(struct Expression * exp, size_t * value2)
{
-long long value2 = op2->__anon1.i64;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpUIntSize(&op2, value2);
}
-static unsigned int UInt64BitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetShort(struct Expression * exp, short * value2)
{
-uint64 value2 = op2->__anon1.ui64;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpShort(&op2, value2);
}
-static unsigned int ShortBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetUShort(struct Expression * exp, unsigned short * value2)
{
-short value2 = op2->__anon1.s;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpUShort(&op2, value2);
}
-static unsigned int UShortBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetChar(struct Expression * exp, char * value2)
{
-unsigned short value2 = op2->__anon1.us;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpChar(&op2, value2);
}
-static unsigned int CharBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetUChar(struct Expression * exp, unsigned char * value2)
{
-char value2 = op2->__anon1.c;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpUChar(&op2, value2);
}
-static unsigned int UCharBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetFloat(struct Expression * exp, float * value2)
{
-unsigned char value2 = op2->__anon1.uc;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc & value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpFloat(&op2, value2);
}
-static unsigned int IntBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int GetDouble(struct Expression * exp, double * value2)
{
-int value2 = op2->__anon1.i;
+struct Operand op2 = GetOperand(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i | value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+return GetOpDouble(&op2, value2);
}
-static unsigned int UIntBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void PrePrintType(struct Type * type, char * string, unsigned int fullName, struct Type * parentType, unsigned int printConst)
{
-unsigned int value2 = op2->__anon1.ui;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui | value2));
-if(!exp->expType)
+if(type->kind == 12 || type->kind == 13 || type->kind == 11 || type->kind == 16)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if((type->kind == 11 || type->kind == 16) && (!parentType || parentType->kind != 13))
+PrintAttribs(type, string);
+if(printConst && type->constant && (type->kind == 11 || type->kind == 16))
+strcat(string, " const");
+PrePrintType(type->kind == 16 ? type->__anon1.__anon3.method->dataType : type->__anon1.type, string, fullName, type, printConst);
+if(type->kind == 13 && (type->__anon1.type->kind == 12 || type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16))
+strcat(string, " (");
+if(type->kind == 13)
+{
+if(type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16)
+PrintAttribs(type->__anon1.type, string);
+}
+if(type->kind == 13)
+{
+if(type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16 || type->__anon1.type->kind == 12)
+strcat(string, "*");
+else
+strcat(string, " *");
+}
+if(printConst && type->constant && type->kind == 13)
+strcat(string, " const");
}
-return 0x1;
+else
+PrintTypeSpecs(type, string, fullName, printConst);
}
-static unsigned int Int64BitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void PrintExpression(struct Expression * exp, char * string)
{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 | value2));
-if(!exp->expType)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
+int count;
+unsigned int backOutputLineNumbers = outputLineNumbers;
+
+outputLineNumbers = 0;
+if(exp)
+OutputExpression(exp, f);
+(__extension__ ({
+unsigned int (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode);
+
+__internal_VirtualMethod = ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__TempFile->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek]);
+__internal_VirtualMethod ? __internal_VirtualMethod(f, 0, 0) : (unsigned int)1;
+}));
+count = strlen(string);
+count += (__extension__ ({
+int (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Instance *, void * buffer, unsigned int size, unsigned int count);
+
+__internal_VirtualMethod = ((int (*)(struct __ecereNameSpace__ecere__com__Instance *, void * buffer, unsigned int size, unsigned int count))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__TempFile->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Read]);
+__internal_VirtualMethod ? __internal_VirtualMethod(f, string + count, 1, 1023) : (int)1;
+}));
+string[count] = '\0';
+(__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0);
+outputLineNumbers = backOutputLineNumbers;
}
-return 0x1;
}
-static unsigned int UInt64BitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Type * Dereference(struct Type * source)
{
-uint64 value2 = op2->__anon1.ui64;
+struct Type * type = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 | value2));
-if(!exp->expType)
+if(source)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(source->kind == 13 || source->kind == 12)
+{
+type = source->__anon1.type;
+source->__anon1.type->refCount++;
}
-
-static unsigned int ShortBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(source->kind == 8 && !strcmp(source->__anon1._class->string, "String"))
{
-short value2 = op2->__anon1.s;
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s | value2));
-if(!exp->expType)
+__ecereInstance1->kind = 1, __ecereInstance1->refCount = 1, __ecereInstance1;
+});
+}
+else if(source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 5)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+type = source;
+source->refCount++;
+}
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot dereference type\n", (((void *)0))));
}
-return 0x1;
+return type;
}
-static unsigned int UShortBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static struct Type * Reference(struct Type * source)
{
-unsigned short value2 = op2->__anon1.us;
+struct Type * type = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us | value2));
-if(!exp->expType)
+if(source)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = source, __ecereInstance1->refCount = 1, __ecereInstance1;
+});
+source->refCount++;
}
-return 0x1;
+return type;
}
-static unsigned int CharBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void ReplaceExpContents(struct Expression * checkedExp, struct Expression * newExp)
{
-char value2 = op2->__anon1.c;
+struct Expression * prev = checkedExp->prev, * next = checkedExp->next;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c | value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+FreeExpContents(checkedExp);
+FreeType(checkedExp->expType);
+FreeType(checkedExp->destType);
+*checkedExp = *newExp;
+((newExp ? __extension__ ({
+void * __ecerePtrToDelete = (newExp);
+
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), newExp = 0);
+checkedExp->prev = prev;
+checkedExp->next = next;
}
-static unsigned int UCharBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void FinishTemplatesContext(struct Context * context)
{
-unsigned char value2 = op2->__anon1.uc;
+PopContext(context);
+FreeContext(context);
+((context ? __extension__ ({
+void * __ecerePtrToDelete = (context);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc | value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+__ecereClass_Context->Destructor ? __ecereClass_Context->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), context = 0);
}
-static unsigned int IntBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static __attribute__((unused)) void UnusedFunction()
{
-int value2 = op2->__anon1.i;
+int a;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i ^ value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+(__extension__ ({
+const char * (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Class * , const void * , char * tempString, void * fieldData, unsigned int * needClass);
+
+__internal_VirtualMethod = ((const char * (*)(struct __ecereNameSpace__ecere__com__Class *, const void *, char * tempString, void * fieldData, unsigned int * needClass))__ecereClass_int->_vTbl[__ecereVMethodID_class_OnGetString]);
+__internal_VirtualMethod ? __internal_VirtualMethod(__ecereClass_int, (void *)&a, 0, 0, 0) : (const char * )1;
+}));
}
-static unsigned int UIntBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Expression * ParseExpressionString(char * expression)
{
-unsigned int value2 = op2->__anon1.ui;
+parseError = 0;
+fileInput = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
+(__extension__ ({
+int (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui ^ value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+__internal_VirtualMethod = ((int (*)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write]);
+__internal_VirtualMethod ? __internal_VirtualMethod(fileInput, expression, 1, strlen(expression)) : (int)1;
+}));
+(__extension__ ({
+unsigned int (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode);
+
+__internal_VirtualMethod = ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek]);
+__internal_VirtualMethod ? __internal_VirtualMethod(fileInput, 0, 0) : (unsigned int)1;
+}));
+echoOn = 0;
+parsedExpression = (((void *)0));
+resetScanner();
+expression_yyparse();
+(__ecereNameSpace__ecere__com__eInstance_DecRef(fileInput), fileInput = 0);
+return parsedExpression;
}
-static unsigned int Int64BitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct __ecereNameSpace__ecere__com__Module
{
-long long value2 = op2->__anon1.i64;
+struct __ecereNameSpace__ecere__com__Instance * application;
+struct __ecereNameSpace__ecere__sys__OldList classes;
+struct __ecereNameSpace__ecere__sys__OldList defines;
+struct __ecereNameSpace__ecere__sys__OldList functions;
+struct __ecereNameSpace__ecere__sys__OldList modules;
+struct __ecereNameSpace__ecere__com__Instance * prev;
+struct __ecereNameSpace__ecere__com__Instance * next;
+const char * name;
+void * library;
+void * Unload;
+int importType;
+int origImportType;
+struct __ecereNameSpace__ecere__com__NameSpace privateNameSpace;
+struct __ecereNameSpace__ecere__com__NameSpace publicNameSpace;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 ^ value2));
-if(!exp->expType)
+static struct GlobalData * FindGlobalData(char * name)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+int start = 0, c;
+struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
-static unsigned int UInt64BitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+nameSpace = globalData;
+for(c = 0; name[c]; c++)
{
-uint64 value2 = op2->__anon1.ui64;
+if(name[c] == '.' || (name[c] == ':' && name[c + 1] == ':'))
+{
+struct __ecereNameSpace__ecere__com__NameSpace * newSpace;
+char * spaceName = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (c - start + 1));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 ^ value2));
-if(!exp->expType)
+strncpy(spaceName, name + start, c - start);
+spaceName[c - start] = '\0';
+newSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&(*nameSpace).nameSpaces, spaceName);
+(__ecereNameSpace__ecere__com__eSystem_Delete(spaceName), spaceName = 0);
+if(!newSpace)
+return (((void *)0));
+nameSpace = newSpace;
+if(name[c] == ':')
+c++;
+start = c + 1;
+}
+}
+if(c - start)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+return ScanGlobalData(nameSpace, name + start);
}
-return 0x1;
+return (((void *)0));
}
-static unsigned int ShortBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static struct Symbol * FindWithNameSpace(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, const char * name)
{
-short value2 = op2->__anon1.s;
+int c;
+char nameSpace[1024];
+const char * namePart;
+unsigned int gotColon = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s ^ value2));
-if(!exp->expType)
+nameSpace[0] = '\0';
+for(c = strlen(name) - 1; c >= 0; c--)
+if(name[c] == ':')
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+gotColon = 1;
+break;
}
+namePart = name + c + 1;
+while(c >= 0 && name[c] == ':')
+c--;
+if(c >= 0)
+{
+struct Symbol * symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(tree, name);
-static unsigned int UShortBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(symbol)
+return symbol;
+memcpy(nameSpace, name, c + 1);
+nameSpace[c + 1] = 0;
+return ScanWithNameSpace(tree, nameSpace, namePart);
+}
+else if(gotColon)
{
-unsigned short value2 = op2->__anon1.us;
+struct Symbol * symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(tree, namePart);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us ^ value2));
-if(!exp->expType)
+return symbol;
+}
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct Symbol * symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(tree, namePart);
+
+if(symbol)
+return symbol;
+return ScanWithNameSpace(tree, "", namePart);
}
-return 0x1;
+return (((void *)0));
}
-static unsigned int CharBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void PrintArraySize(struct Type * arrayType, char * string)
{
-char value2 = op2->__anon1.c;
+char size[256];
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c ^ value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+size[0] = '\0';
+strcat(size, "[");
+if(arrayType->__anon1.__anon4.enumClass)
+strcat(size, arrayType->__anon1.__anon4.enumClass->string);
+else if(arrayType->__anon1.__anon4.arraySizeExp)
+PrintExpression(arrayType->__anon1.__anon4.arraySizeExp, size);
+strcat(size, "]");
+strcat(string, size);
}
-static unsigned int UCharBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void __ecereUnregisterModule_pass15(struct __ecereNameSpace__ecere__com__Instance * module)
{
-unsigned char value2 = op2->__anon1.uc;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc ^ value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
}
-static unsigned int IntLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void PostPrintType(struct Type * type, char * string, unsigned int fullName)
{
-int value2 = op2->__anon1.i;
+if(type->kind == 13 && (type->__anon1.type->kind == 12 || type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16))
+strcat(string, ")");
+if(type->kind == 12)
+PrintArraySize(type, string);
+else if(type->kind == 11)
+{
+struct Type * param;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i << value2));
-if(!exp->expType)
+strcat(string, "(");
+for(param = type->__anon1.__anon2.params.first; param; param = param->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+PrintType(param, string, 1, fullName);
+if(param->next)
+strcat(string, ", ");
+}
+strcat(string, ")");
}
-return 0x1;
+if(type->kind == 12 || type->kind == 13 || type->kind == 11 || type->kind == 16)
+PostPrintType(type->kind == 16 ? type->__anon1.__anon3.method->dataType : type->__anon1.type, string, fullName);
}
-static unsigned int UIntLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void _PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName, unsigned int printConst)
{
-unsigned int value2 = op2->__anon1.ui;
+PrePrintType(type, string, fullName, (((void *)0)), printConst);
+if(type->__anon1.__anon2.thisClass || (printName && type->name && type->name[0]))
+strcat(string, " ");
+if((type->__anon1.__anon2.thisClass || type->__anon1.__anon2.staticMethod))
+{
+struct Symbol * _class = type->__anon1.__anon2.thisClass;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui << value2));
-if(!exp->expType)
+if((type->classObjectType == 2 || type->classObjectType == 1) || (_class && !strcmp(_class->string, "class")))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(type->classObjectType == 1)
+strcat(string, "class");
+else
+strcat(string, type->byReference ? "typed_object&" : "typed_object");
}
-
-static unsigned int Int64LShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(_class && _class->string)
{
-long long value2 = op2->__anon1.i64;
+char * s = _class->string;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 << value2));
-if(!exp->expType)
+if(fullName)
+strcat(string, s);
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+char * name = __ecereNameSpace__ecere__sys__RSearchString(s, "::", strlen(s), 1, 0);
+
+if(name)
+name += 2;
+else
+name = s;
+strcat(string, name);
}
-return 0x1;
}
-
-static unsigned int UInt64LShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+strcat(string, "::");
+}
+if(printName && type->name)
+PrintName(type, string, fullName);
+PostPrintType(type, string, fullName);
+if(type->bitFieldCount)
{
-uint64 value2 = op2->__anon1.ui64;
+char count[100];
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 << value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+sprintf(count, ":%d", type->bitFieldCount);
+strcat(string, count);
}
-return 0x1;
}
-static unsigned int ShortLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Conversion;
+
+struct Conversion
{
-short value2 = op2->__anon1.s;
+struct Conversion * prev, * next;
+struct __ecereNameSpace__ecere__com__Property * convert;
+unsigned int isGet;
+struct Type * resultType;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s << value2));
-if(!exp->expType)
+static void FreeConvert(struct Conversion * convert)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(convert->resultType)
+FreeType(convert->resultType);
}
-static unsigned int UShortLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned short value2 = op2->__anon1.us;
+struct Enumerator;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us << value2));
-if(!exp->expType)
+struct Enumerator
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Enumerator * prev;
+struct Enumerator * next;
+struct Location loc;
+struct Identifier * id;
+struct Expression * exp;
+} ecere_gcc_struct;
-static unsigned int CharLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-char value2 = op2->__anon1.c;
+struct AsmField;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c << value2));
-if(!exp->expType)
+struct AsmField
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct AsmField * prev;
+struct AsmField * next;
+struct Location loc;
+char * command;
+struct Expression * expression;
+struct Identifier * symbolic;
+} ecere_gcc_struct;
-static unsigned int UCharLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned char value2 = op2->__anon1.uc;
+struct ClassDefinition;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc << value2));
-if(!exp->expType)
+struct Context
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Context * parent;
+struct __ecereNameSpace__ecere__sys__BinaryTree types;
+struct __ecereNameSpace__ecere__sys__BinaryTree classes;
+struct __ecereNameSpace__ecere__sys__BinaryTree symbols;
+struct __ecereNameSpace__ecere__sys__BinaryTree structSymbols;
+int nextID;
+int simpleID;
+struct __ecereNameSpace__ecere__sys__BinaryTree templateTypes;
+struct ClassDefinition * classDef;
+unsigned int templateTypesOnly;
+unsigned int hasNameSpace;
+} ecere_gcc_struct;
-static unsigned int IntRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct External
{
-int value2 = op2->__anon1.i;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i >> value2));
-if(!exp->expType)
+struct External * prev;
+struct External * next;
+struct Location loc;
+int type;
+struct Symbol * symbol;
+union
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct FunctionDefinition * function;
+struct ClassDefinition * _class;
+struct Declaration * declaration;
+char * importString;
+struct Identifier * id;
+struct DBTableDef * table;
+} ecere_gcc_struct __anon1;
+int importType;
+struct External * fwdDecl;
+struct __ecereNameSpace__ecere__com__Instance * outgoing;
+struct __ecereNameSpace__ecere__com__Instance * incoming;
+int nonBreakableIncoming;
+} ecere_gcc_struct;
-static unsigned int UIntRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct ClassDefinition
{
-unsigned int value2 = op2->__anon1.ui;
+struct ClassDefinition * prev;
+struct ClassDefinition * next;
+struct Location loc;
+struct Specifier * _class;
+struct __ecereNameSpace__ecere__sys__OldList * baseSpecs;
+struct __ecereNameSpace__ecere__sys__OldList * definitions;
+struct Symbol * symbol;
+struct Location blockStart;
+struct Location nameLoc;
+int declMode;
+unsigned int deleteWatchable;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui >> value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+void __ecereMethod_External_CreateUniqueEdge(struct External * this, struct External * from, unsigned int soft);
-static unsigned int Int64RShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void __ecereMethod_External_CreateEdge(struct External * this, struct External * from, unsigned int soft);
+
+void DeclareGlobalData(struct External * neededFor, struct GlobalData * data)
{
-long long value2 = op2->__anon1.i64;
+struct Symbol * symbol = data->symbol;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 >> value2));
-if(!exp->expType)
+if(!symbol || !symbol->__anon2.__anon1.pointerExternal)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(inCompiler)
+{
+if(!symbol)
+symbol = data->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
}
-
-static unsigned int UInt64RShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!data->dataType)
+data->dataType = ProcessTypeString(data->dataTypeString, 0);
+if(inCompiler)
{
-uint64 value2 = op2->__anon1.ui64;
+struct Declaration * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
+struct Declarator * d;
+struct External * external;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 >> value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+specifiers = MkList();
+declarators = MkList();
+ListAdd(specifiers, MkSpecifier(EXTERN));
+d = MkDeclaratorIdentifier(MkIdentifier(data->fullName));
+d = SpecDeclFromString(data->dataTypeString, specifiers, d);
+ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
+decl = MkDeclaration(specifiers, declarators);
+external = MkExternalDeclaration(decl);
+if(curExternal)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
+external->symbol = symbol;
+symbol->__anon2.__anon1.pointerExternal = external;
+DeclareType(external, data->dataType, 1, 1);
+}
}
-return 0x1;
+if(inCompiler && neededFor && symbol && symbol->__anon2.__anon1.pointerExternal)
+__ecereMethod_External_CreateUniqueEdge(neededFor, symbol->__anon2.__anon1.pointerExternal, 0);
}
-static unsigned int ShortRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Symbol * FindSymbol(const char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace)
{
-short value2 = op2->__anon1.s;
+struct Context * ctx;
+struct Symbol * symbol = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s >> value2));
-if(!exp->expType)
+for(ctx = startContext; ctx && !symbol; ctx = ctx->parent)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(ctx == globalContext && !globalNameSpace && ctx->hasNameSpace)
+{
+symbol = (((void *)0));
+if(thisNameSpace)
+{
+char curName[1024];
+
+strcpy(curName, thisNameSpace);
+strcat(curName, "::");
+strcat(curName, name);
+symbol = FindWithNameSpace(isStruct ? &ctx->structSymbols : &ctx->symbols, curName);
+}
+if(!symbol)
+symbol = FindWithNameSpace(isStruct ? &ctx->structSymbols : &ctx->symbols, name);
+}
+else
+symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString((isStruct ? &ctx->structSymbols : &ctx->symbols), name);
+if(symbol || ctx == endContext)
+break;
}
-return 0x1;
+if(inCompiler && symbol && ctx == globalContext && symbol->__anon2.__anon1.pointerExternal && curExternal && symbol->__anon2.__anon1.pointerExternal != curExternal)
+__ecereMethod_External_CreateUniqueEdge(curExternal, symbol->__anon2.__anon1.pointerExternal, symbol->__anon2.__anon1.pointerExternal->type == 0);
+return symbol;
}
-static unsigned int UShortRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned short value2 = op2->__anon1.us;
+struct PropertyDef;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us >> value2));
-if(!exp->expType)
+struct ClassDef
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int CharRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct ClassDef * prev;
+struct ClassDef * next;
+struct Location loc;
+int type;
+union
{
-char value2 = op2->__anon1.c;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c >> value2));
-if(!exp->expType)
+struct Declaration * decl;
+struct ClassFunction * function;
+struct __ecereNameSpace__ecere__sys__OldList * defProperties;
+struct PropertyDef * propertyDef;
+struct PropertyWatch * propertyWatch;
+char * designer;
+struct Identifier * defaultProperty;
+struct
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Identifier * id;
+struct Initializer * initializer;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct __anon1;
+int memberAccess;
+void * object;
+} ecere_gcc_struct;
-static unsigned int UCharRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct PropertyDef
{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc >> value2));
-if(!exp->expType)
+struct PropertyDef * prev;
+struct PropertyDef * next;
+struct Location loc;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct Declarator * declarator;
+struct Identifier * id;
+struct Statement * getStmt;
+struct Statement * setStmt;
+struct Statement * issetStmt;
+struct Symbol * symbol;
+struct Expression * category;
+struct
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+unsigned int conversion : 1;
+unsigned int isWatchable : 1;
+unsigned int isDBProp : 1;
+} ecere_gcc_struct __anon1;
+} ecere_gcc_struct;
-static unsigned int IntBitNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((~op1->__anon1.i));
-if(!exp->expType)
+static void IdentifyAnonStructs(struct __ecereNameSpace__ecere__sys__OldList * definitions)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct ClassDef * def;
+int anonID = 1;
-static unsigned int UIntBitNot(struct Expression * exp, struct Operand * op1)
+for(def = (*definitions).first; def; def = def->next)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(~op1->__anon1.ui));
-if(!exp->expType)
+if(def->type == 2)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Declaration * decl = def->__anon1.decl;
-static unsigned int Int64BitNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(~op1->__anon1.i64));
-if(!exp->expType)
+if(decl && decl->__anon1.__anon1.specifiers)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Specifier * spec;
+unsigned int isStruct = 0;
-static unsigned int UInt64BitNot(struct Expression * exp, struct Operand * op1)
+for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(~op1->__anon1.ui64));
-if(!exp->expType)
+if(spec->type == 3 || spec->type == 4)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(spec->__anon1.__anon2.definitions)
+IdentifyAnonStructs(spec->__anon1.__anon2.definitions);
+isStruct = 1;
}
-return 0x1;
}
+if(isStruct)
+{
+struct Declarator * d = (((void *)0));
-static unsigned int ShortBitNot(struct Expression * exp, struct Operand * op1)
+if(decl->__anon1.__anon1.declarators)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(~op1->__anon1.s));
-if(!exp->expType)
+for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct Identifier * idDecl = GetDeclId(d);
+
+if(idDecl)
+break;
}
-return 0x1;
}
-
-static unsigned int UShortBitNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(~op1->__anon1.us));
-if(!exp->expType)
+if(!d)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+char id[100];
+
+sprintf(id, "__anon%d", anonID++);
+if(!decl->__anon1.__anon1.declarators)
+decl->__anon1.__anon1.declarators = MkList();
+ListAdd(decl->__anon1.__anon1.declarators, MkDeclaratorIdentifier(MkIdentifier(id)));
}
-return 0x1;
}
-
-static unsigned int CharBitNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(~op1->__anon1.c));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-
-static unsigned int UCharBitNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(~op1->__anon1.uc));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-static unsigned int IntAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct MemberInit;
+
+typedef union YYSTYPE
{
-int value2 = op2->__anon1.i;
+int specifierType;
+int i;
+int declMode;
+struct Identifier * id;
+struct Expression * exp;
+struct Specifier * specifier;
+struct __ecereNameSpace__ecere__sys__OldList * list;
+struct Enumerator * enumerator;
+struct Declarator * declarator;
+struct Pointer * pointer;
+struct Initializer * initializer;
+struct InitDeclarator * initDeclarator;
+struct TypeName * typeName;
+struct Declaration * declaration;
+struct Statement * stmt;
+struct FunctionDefinition * function;
+struct External * external;
+struct Context * context;
+struct AsmField * asmField;
+struct Attrib * attrib;
+struct ExtDecl * extDecl;
+struct Attribute * attribute;
+struct Instantiation * instance;
+struct MembersInit * membersInit;
+struct MemberInit * memberInit;
+struct ClassFunction * classFunction;
+struct ClassDefinition * _class;
+struct ClassDef * classDef;
+struct PropertyDef * prop;
+char * string;
+struct Symbol * symbol;
+struct PropertyWatch * propertyWatch;
+struct TemplateParameter * templateParameter;
+struct TemplateArgument * templateArgument;
+struct TemplateDatatype * templateDatatype;
+struct DBTableEntry * dbtableEntry;
+struct DBIndexItem * dbindexItem;
+struct DBTableDef * dbtableDef;
+} ecere_gcc_struct YYSTYPE;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i &= value2));
-if(!exp->expType)
+extern YYSTYPE yylval;
+
+struct MemberInit
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct MemberInit * prev;
+struct MemberInit * next;
+struct Location loc;
+struct Location realLoc;
+struct __ecereNameSpace__ecere__sys__OldList * identifiers;
+struct Initializer * initializer;
+unsigned int used;
+unsigned int variable;
+unsigned int takeOutExp;
+} ecere_gcc_struct;
-static unsigned int UIntAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+extern struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer);
+
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter;
+
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter
{
-unsigned int value2 = op2->__anon1.ui;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * prev;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * next;
+const char * name;
+int type;
+union
+{
+const char * dataTypeString;
+int memberType;
+} ecere_gcc_struct __anon1;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
+void * param;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui &= value2));
-if(!exp->expType)
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument * FindTemplateArg(struct __ecereNameSpace__ecere__com__Class * _class, struct TemplateParameter * param)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument * arg = (((void *)0));
+int id = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * sClass;
-static unsigned int Int64AndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(sClass = _class; sClass; sClass = sClass->base)
{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 &= value2));
-if(!exp->expType)
+id = 0;
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int UInt64AndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(curParam->type == 0 && !strcmp(param->identifier->string, curParam->name))
{
-uint64 value2 = op2->__anon1.ui64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 &= value2));
-if(!exp->expType)
+for(sClass = sClass->base; sClass; sClass = sClass->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+id += sClass->templateParams.count;
}
-return 0x1;
+break;
}
-
-static unsigned int ShortAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s &= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+id++;
}
-return 0x1;
+if(curParam)
+break;
}
-
-static unsigned int UShortAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned short value2 = op2->__anon1.us;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us &= value2));
-if(!exp->expType)
+if(curParam)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+arg = &_class->templateArgs[id];
+if(arg && param->type == 0)
+(*arg).__anon1.__anon1.dataTypeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, (*arg).__anon1.__anon1.dataTypeString);
}
-return 0x1;
+return arg;
}
-static unsigned int CharAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Context * SetupTemplatesContext(struct __ecereNameSpace__ecere__com__Class * _class)
{
-char value2 = op2->__anon1.c;
+struct Context * context = PushContext();
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c &= value2));
-if(!exp->expType)
+context->templateTypesOnly = 1;
+if(_class->symbol && ((struct Symbol *)_class->symbol)->templateParams)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct TemplateParameter * param = (*((struct Symbol *)_class->symbol)->templateParams).first;
-static unsigned int UCharAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(; param; param = param->next)
{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc &= value2));
-if(!exp->expType)
+if(param->type == 0 && param->identifier)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (uintptr_t)param->identifier->string, type->param = param, type);
+
+__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type);
}
-return 0x1;
}
-
-static unsigned int IntOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+else if(_class)
{
-int value2 = op2->__anon1.i;
+struct __ecereNameSpace__ecere__com__Class * sClass;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i |= value2));
-if(!exp->expType)
+for(sClass = _class; sClass; sClass = sClass->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * p;
-static unsigned int UIntOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(p = sClass->templateParams.first; p; p = p->next)
{
-unsigned int value2 = op2->__anon1.ui;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui |= value2));
-if(!exp->expType)
+if(p->type == 0)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct TemplateParameter * param = p->param;
+struct TemplatedType * type;
-static unsigned int Int64OrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!param)
{
-long long value2 = op2->__anon1.i64;
+p->param = param = __extension__ ({
+struct TemplateParameter * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 |= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+__ecereInstance1->identifier = MkIdentifier(p->name), __ecereInstance1->type = p->type, __ecereInstance1->dataTypeString = p->__anon1.dataTypeString, __ecereInstance1;
+});
}
+type = __extension__ ({
+struct TemplatedType * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType);
-static unsigned int UInt64OrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-uint64 value2 = op2->__anon1.ui64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 |= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+__ecereInstance1->key = (uintptr_t)p->name, __ecereInstance1->param = param, __ecereInstance1;
+});
+__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type);
}
-return 0x1;
}
-
-static unsigned int ShortOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s |= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
+}
+return context;
}
-static unsigned int UShortOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+char * ReplaceThisClass(struct __ecereNameSpace__ecere__com__Class * _class)
{
-unsigned short value2 = op2->__anon1.us;
+if(thisClassParams && _class->templateParams.count && !_class->templateClass)
+{
+unsigned int first = 1;
+int p = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
+int lastParam = -1;
+char className[1024];
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us |= value2));
-if(!exp->expType)
+strcpy(className, _class->fullName);
+for(param = _class->templateParams.first; param; param = param->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+{
+if(first)
+strcat(className, "<");
+if(!first)
+strcat(className, ", ");
+if(lastParam + 1 != p)
+{
+strcat(className, param->name);
+strcat(className, " = ");
+}
+strcat(className, param->name);
+first = 0;
+lastParam = p;
}
-return 0x1;
+p++;
}
-
-static unsigned int CharOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!first)
{
-char value2 = op2->__anon1.c;
+int len = strlen(className);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c |= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(className[len - 1] == '>')
+className[len++] = ' ';
+className[len++] = '>';
+className[len++] = '\0';
+}
+return __ecereNameSpace__ecere__sys__CopyString(className);
}
-return 0x1;
+else
+return __ecereNameSpace__ecere__sys__CopyString(_class->fullName);
}
-static unsigned int UCharOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct Type * ReplaceThisClassType(struct __ecereNameSpace__ecere__com__Class * _class)
{
-unsigned char value2 = op2->__anon1.uc;
+struct Type * type;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc |= value2));
-if(!exp->expType)
+if(thisClassParams && _class->templateParams.count && !_class->templateClass)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+unsigned int first = 1;
+int p = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
+int lastParam = -1;
+char className[1024];
-static unsigned int IntXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+strcpy(className, _class->fullName);
+for(param = _class->templateParams.first; param; param = param->next)
{
-int value2 = op2->__anon1.i;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i ^= value2));
-if(!exp->expType)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(first)
+strcat(className, "<");
+if(!first)
+strcat(className, ", ");
+if(lastParam + 1 != p)
+{
+strcat(className, param->name);
+strcat(className, " = ");
+}
+strcat(className, param->name);
+first = 0;
+lastParam = p;
}
-return 0x1;
+p++;
}
-
-static unsigned int UIntXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!first)
{
-unsigned int value2 = op2->__anon1.ui;
+int len = strlen(className);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui ^= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(className[len - 1] == '>')
+className[len++] = ' ';
+className[len++] = '>';
+className[len++] = '\0';
}
-return 0x1;
+type = MkClassType(className);
}
-
-static unsigned int Int64XorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 ^= value2));
-if(!exp->expType)
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+type = MkClassType(_class->fullName);
}
-return 0x1;
+return type;
}
-static unsigned int UInt64XorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static int DeclareMembers(struct External * neededBy, struct __ecereNameSpace__ecere__com__Class * _class, unsigned int isMember)
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__DataMember * topMember = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * member;
+struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 ^= value2));
-if(!exp->expType)
+if(!isMember && (_class->type == 1 || _class->type == 5) && _class->base->type != 1000)
+DeclareMembers(neededBy, _class->base, 0);
+for(member = isMember ? topMember->members.first : _class->membersAndProperties.first; member; member = member->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int ShortXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!member->isProperty)
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s ^= value2));
-if(!exp->expType)
+switch(member->type)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int UShortXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 0:
{
-unsigned short value2 = op2->__anon1.us;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us ^= value2));
-if(!exp->expType)
+if(!member->dataType && member->dataTypeString)
+member->dataType = ProcessTypeString(member->dataTypeString, 0);
+if(member->dataType)
+DeclareType(neededBy, member->dataType, 1, 0);
+break;
+}
+case 1:
+case 2:
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+DeclareMembers(neededBy, (struct __ecereNameSpace__ecere__com__Class *)member, 1);
+break;
}
-return 0x1;
+}
+}
+}
+if(context)
+FinishTemplatesContext(context);
+return topMember ? topMember->memberID : _class->memberID;
}
-static unsigned int CharXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void ProcessMethodType(struct __ecereNameSpace__ecere__com__Method * method)
{
-char value2 = op2->__anon1.c;
+if(!method->dataType)
+{
+struct Context * context = SetupTemplatesContext(method->_class);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c ^= value2));
-if(!exp->expType)
+method->dataType = ProcessTypeString(method->dataTypeString, 0);
+FinishTemplatesContext(context);
+if(method->type != 1 && method->dataType)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!method->dataType->__anon1.__anon2.thisClass && !method->dataType->__anon1.__anon2.staticMethod)
+{
+if(!method->_class->symbol)
+method->_class->symbol = FindClass(method->_class->fullName);
+method->dataType->__anon1.__anon2.thisClass = method->_class->symbol;
+}
+}
}
-return 0x1;
}
-static unsigned int UCharXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void ProcessPropertyType(struct __ecereNameSpace__ecere__com__Property * prop)
{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc ^= value2));
-if(!exp->expType)
+if(!prop->dataType)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct Context * context = SetupTemplatesContext(prop->_class);
+
+prop->dataType = ProcessTypeString(prop->dataTypeString, 0);
+FinishTemplatesContext(context);
}
-return 0x1;
}
-static unsigned int IntLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void ReplaceThisClassSpecifiers(struct __ecereNameSpace__ecere__sys__OldList * specs, struct __ecereNameSpace__ecere__com__Class * _class)
{
-int value2 = op2->__anon1.i;
+if(specs != (((void *)0)) && _class)
+{
+struct Specifier * spec;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i <<= value2));
-if(!exp->expType)
+for(spec = specs->first; spec; spec = spec->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(spec->type == 0 && spec->__anon1.specifier == THISCLASS)
+{
+spec->type = 1;
+spec->__anon1.__anon1.name = ReplaceThisClass(_class);
+spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name);
+}
+}
}
-return 0x1;
}
-static unsigned int UIntLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static unsigned int ResolveIdWithClass(struct Expression * exp, struct __ecereNameSpace__ecere__com__Class * _class, unsigned int skipIDClassCheck)
{
-unsigned int value2 = op2->__anon1.ui;
+struct Identifier * id = exp->__anon1.__anon1.identifier;
+struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
+struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
+struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui <<= value2));
-if(!exp->expType)
+if(_class && _class->type == 4)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__sys__NamedLink64 * value = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-static unsigned int Int64LShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(enumClass)
{
-long long value2 = op2->__anon1.i64;
+struct __ecereNameSpace__ecere__com__Class * baseClass;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 <<= value2));
-if(!exp->expType)
+for(baseClass = _class; baseClass && baseClass->type == 4; baseClass = baseClass->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__EnumClassData * e = (baseClass ? ((void *)(((char *)baseClass->data) + enumClass->offsetClass)) : (((void *)0)));
-static unsigned int UInt64LShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(value = e->values.first; value; value = value->next)
{
-uint64 value2 = op2->__anon1.ui64;
+if(!strcmp(value->name, id->string))
+break;
+}
+if(value)
+{
+exp->isConstant = 1;
+if(inCompiler || inPreCompiler || inDebugger)
+{
+char constant[256];
+FreeExpContents(exp);
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 <<= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!strcmp(baseClass->dataTypeString, "int") || !strcmp(baseClass->dataTypeString, "int64") || !strcmp(baseClass->dataTypeString, "char") || !strcmp(baseClass->dataTypeString, "short"))
+sprintf(constant, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), value->data);
+else
+sprintf(constant, ((__runtimePlatform == 1) ? "0x%I64X" : "0x%llX"), value->data);
+exp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
}
-return 0x1;
+exp->expType = MkClassType(baseClass->fullName);
+break;
}
-
-static unsigned int ShortLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+}
+if(value)
+return 1;
+}
+if((method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule)))
{
-short value2 = op2->__anon1.s;
+ProcessMethodType(method);
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s <<= value2));
-if(!exp->expType)
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 16, __ecereInstance1->__anon1.__anon3.method = method, __ecereInstance1->__anon1.__anon3.methodClass = (skipIDClassCheck || (id && id->_class)) ? _class : (((void *)0)), __ecereInstance1;
+});
+return 1;
+}
+else if((prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule)))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!prop->dataType)
+ProcessPropertyType(prop);
+exp->expType = prop->dataType;
+if(prop->dataType)
+prop->dataType->refCount++;
+return 1;
}
-return 0x1;
+else if((member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)))))
+{
+if(!member->dataType)
+member->dataType = ProcessTypeString(member->dataTypeString, 0);
+exp->expType = member->dataType;
+if(member->dataType)
+member->dataType->refCount++;
+return 1;
}
-
-static unsigned int UShortLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if((classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(_class, id->string)))
{
-unsigned short value2 = op2->__anon1.us;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us <<= value2));
-if(!exp->expType)
+if(!classProp->dataType)
+classProp->dataType = ProcessTypeString(classProp->dataTypeString, 0);
+if(classProp->constant)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+FreeExpContents(exp);
+exp->isConstant = 1;
+if(classProp->dataType->kind == 13 && classProp->dataType->__anon1.type->kind == 1)
+{
+exp->type = 3;
+exp->__anon1.__anon1.constant = QMkString((char *)(uintptr_t)classProp->Get(_class));
}
-
-static unsigned int CharLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-char value2 = op2->__anon1.c;
+char constant[256];
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c <<= value2));
-if(!exp->expType)
+sprintf(constant, "%d", (int)classProp->Get(_class));
+exp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
+}
+}
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
+exp->expType = classProp->dataType;
+if(classProp->dataType)
+classProp->dataType->refCount++;
+return 1;
+}
+return 0;
}
-static unsigned int UCharLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void DeclareProperty(struct External * neededBy, struct __ecereNameSpace__ecere__com__Property * prop, char * setName, char * getName)
{
-unsigned char value2 = op2->__anon1.uc;
+struct Symbol * symbol = prop->symbol;
+unsigned int imported = 0;
+unsigned int dllImport = 0;
+struct External * structExternal = (((void *)0));
+struct External * instExternal = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc <<= value2));
-if(!exp->expType)
+strcpy(setName, "__ecereProp_");
+FullClassNameCat(setName, prop->_class->fullName, 0);
+strcat(setName, "_Set_");
+FullClassNameCat(setName, prop->name, 1);
+strcpy(getName, "__ecereProp_");
+FullClassNameCat(getName, prop->_class->fullName, 0);
+strcat(getName, "_Get_");
+FullClassNameCat(getName, prop->name, 1);
+if(!symbol || symbol->_import)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int IntRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!symbol)
{
-int value2 = op2->__anon1.i;
+struct Symbol * classSym;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((op1->__anon1.i >>= value2));
-if(!exp->expType)
+if(!prop->_class->symbol)
+prop->_class->symbol = FindClass(prop->_class->fullName);
+classSym = prop->_class->symbol;
+if(classSym && !classSym->_import)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+struct ModuleImport * module;
+
+if(prop->_class->module)
+module = FindModule(prop->_class->module);
+else
+module = mainModule;
+classSym->_import = __extension__ ({
+struct ClassImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassImport);
+
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->_class->fullName), __ecereInstance1->isRemote = prop->_class->isRemote, __ecereInstance1;
+});
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->classes, classSym->_import);
}
+symbol = prop->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+symbol->_import = (struct ClassImport *)__extension__ ({
+struct PropertyImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyImport);
-static unsigned int UIntRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->isVirtual = 0, __ecereInstance1->hasSet = prop->Set ? 1 : 0, __ecereInstance1->hasGet = prop->Get ? 1 : 0, __ecereInstance1;
+});
+if(classSym)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classSym->_import->properties, symbol->_import);
+}
+imported = 1;
+if((prop->_class->module != privateModule || !strcmp(prop->_class->name, "float") || !strcmp(prop->_class->name, "double")) && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)prop->_class->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType != 1)
+dllImport = 1;
+}
+if(!symbol->type)
{
-unsigned int value2 = op2->__anon1.ui;
+struct Context * context = SetupTemplatesContext(prop->_class);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((op1->__anon1.ui >>= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+symbol->type = ProcessTypeString(prop->dataTypeString, 0);
+FinishTemplatesContext(context);
}
-return 0x1;
+if((prop->Get && !symbol->__anon2.__anon2.externalGet) || (prop->Set && !symbol->__anon2.__anon2.externalSet))
+{
+if(prop->_class->type == 0 && prop->_class->structSize)
+instExternal = DeclareStruct((((void *)0)), "ecere::com::Instance", 0, 1);
+structExternal = DeclareStruct((((void *)0)), prop->_class->fullName, prop->_class->type != 1, 0);
}
-
-static unsigned int Int64RShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(prop->Get && !symbol->__anon2.__anon2.externalGet)
{
-long long value2 = op2->__anon1.i64;
+struct Declaration * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
+struct Declarator * d;
+struct __ecereNameSpace__ecere__sys__OldList * params;
+struct Specifier * spec = (((void *)0));
+struct External * external;
+struct Declarator * typeDecl;
+unsigned int simple = 0;
+unsigned int needReference;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((op1->__anon1.i64 >>= value2));
-if(!exp->expType)
+specifiers = MkList();
+declarators = MkList();
+params = MkList();
+ListAdd(params, MkTypeName(MkListOne(MkSpecifierName(prop->_class->fullName)), MkDeclaratorIdentifier(MkIdentifier("this"))));
+d = MkDeclaratorIdentifier(MkIdentifier(getName));
+if(dllImport)
+d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Context * context = SetupTemplatesContext(prop->_class);
-static unsigned int UInt64RShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+typeDecl = SpecDeclFromString(prop->dataTypeString, specifiers, (((void *)0)));
+FinishTemplatesContext(context);
+}
+needReference = !typeDecl || typeDecl->type == 1;
+for(spec = (*specifiers).first; spec; spec = spec->next)
{
-uint64 value2 = op2->__anon1.ui64;
+if(spec->type == 1)
+{
+struct Symbol * classSym = spec->__anon1.__anon1.symbol;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((op1->__anon1.ui64 >>= value2));
-if(!exp->expType)
+if(needReference)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+symbol->_class = classSym->__anon1.registered;
+if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1)
+simple = 1;
}
-return 0x1;
+break;
}
-
-static unsigned int ShortRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((op1->__anon1.s >>= value2));
-if(!exp->expType)
+}
+if(!simple)
+d = PlugDeclarator(typeDecl, d);
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+ListAdd(params, MkTypeName(specifiers, PlugDeclarator(typeDecl, MkDeclaratorIdentifier(MkIdentifier("value")))));
+specifiers = MkList();
}
-return 0x1;
+d = MkDeclaratorFunction(d, params);
+if(dllImport)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(EXTERN));
+else if(prop->_class->symbol && ((struct Symbol *)prop->_class->symbol)->isStatic)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC));
+if(simple)
+ListAdd(specifiers, MkSpecifier(VOID));
+ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
+decl = MkDeclaration(specifiers, declarators);
+external = MkExternalDeclaration(decl);
+if(structExternal)
+__ecereMethod_External_CreateEdge(external, structExternal, 0);
+if(instExternal)
+__ecereMethod_External_CreateEdge(external, instExternal, 0);
+if(spec)
+DeclareStruct(external, spec->__anon1.__anon1.name, 0, needReference);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external);
+external->symbol = symbol;
+symbol->__anon2.__anon2.externalGet = external;
+ReplaceThisClassSpecifiers(specifiers, prop->_class);
+if(typeDecl)
+FreeDeclarator(typeDecl);
}
-
-static unsigned int UShortRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(prop->Set && !symbol->__anon2.__anon2.externalSet)
{
-unsigned short value2 = op2->__anon1.us;
+struct Declaration * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
+struct Declarator * d;
+struct __ecereNameSpace__ecere__sys__OldList * params;
+struct Specifier * spec = (((void *)0));
+struct External * external;
+struct Declarator * typeDecl;
+unsigned int needReference;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((op1->__anon1.us >>= value2));
-if(!exp->expType)
+declarators = MkList();
+params = MkList();
+if(!prop->conversion || prop->_class->type == 1)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+ListAdd(params, MkTypeName(MkListOne(MkSpecifierName(prop->_class->fullName)), MkDeclaratorIdentifier(MkIdentifier("this"))));
}
-
-static unsigned int CharRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+specifiers = MkList();
{
-char value2 = op2->__anon1.c;
+struct Context * context = SetupTemplatesContext(prop->_class);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((op1->__anon1.c >>= value2));
-if(!exp->expType)
+typeDecl = d = SpecDeclFromString(prop->dataTypeString, specifiers, MkDeclaratorIdentifier(MkIdentifier("value")));
+FinishTemplatesContext(context);
+}
+if(!strcmp(prop->_class->base->fullName, "eda::Row") || !strcmp(prop->_class->base->fullName, "eda::Id"))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(CONST));
+ListAdd(params, MkTypeName(specifiers, d));
+d = MkDeclaratorIdentifier(MkIdentifier(setName));
+if(dllImport)
+d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
+d = MkDeclaratorFunction(d, params);
+needReference = !typeDecl || typeDecl->type == 1;
+for(spec = (*specifiers).first; spec; spec = spec->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(spec->type == 1)
+{
+struct Symbol * classSym = spec->__anon1.__anon1.symbol;
+
+if(needReference)
+symbol->_class = classSym->__anon1.registered;
+break;
}
-return 0x1;
}
-
-static unsigned int UCharRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
+specifiers = MkList();
+if(dllImport)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(EXTERN));
+else if(prop->_class->symbol && ((struct Symbol *)prop->_class->symbol)->isStatic)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC));
+if(!prop->conversion || prop->_class->type == 1)
+ListAdd(specifiers, MkSpecifier(VOID));
+else
+ListAdd(specifiers, MkSpecifierName(prop->_class->fullName));
+decl = MkDeclaration(specifiers, declarators);
+external = MkExternalDeclaration(decl);
+if(structExternal)
+__ecereMethod_External_CreateEdge(external, structExternal, 0);
+if(instExternal)
+__ecereMethod_External_CreateEdge(external, instExternal, 0);
+if(spec)
+DeclareStruct(external, spec->__anon1.__anon1.name, 0, needReference);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external);
+external->symbol = symbol;
+symbol->__anon2.__anon2.externalSet = external;
+ReplaceThisClassSpecifiers(specifiers, prop->_class);
+}
+if(!symbol->__anon2.__anon2.externalPtr)
{
-unsigned char value2 = op2->__anon1.uc;
+struct Declaration * decl;
+struct External * external;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers = MkList();
+char propName[1024];
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((op1->__anon1.uc >>= value2));
-if(!exp->expType)
+if(imported)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(EXTERN));
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*specifiers), MkSpecifierExtended(MkExtDeclAttrib(MkAttrib(ATTRIB, MkListOne(MkAttribute(__ecereNameSpace__ecere__sys__CopyString("unused"), (((void *)0))))))));
}
-
-static unsigned int IntNot(struct Expression * exp, struct Operand * op1)
+ListAdd(specifiers, MkSpecifierName("Property"));
+strcpy(propName, "__ecereProp_");
+FullClassNameCat(propName, prop->_class->fullName, 0);
+strcat(propName, "_");
+FullClassNameCat(propName, prop->name, 1);
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(!op1->__anon1.i));
-if(!exp->expType)
+struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
+
+ListAdd(list, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(propName)), (((void *)0))));
+if(!imported)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+strcpy(propName, "__ecerePropM_");
+FullClassNameCat(propName, prop->_class->fullName, 0);
+strcat(propName, "_");
+FullClassNameCat(propName, prop->name, 1);
+ListAdd(list, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(propName)), (((void *)0))));
+}
+decl = MkDeclaration(specifiers, list);
}
-return 0x1;
+external = MkExternalDeclaration(decl);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, external);
+external->symbol = symbol;
+symbol->__anon2.__anon2.externalPtr = external;
}
-
-static unsigned int UIntNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(!op1->__anon1.ui));
-if(!exp->expType)
+if(inCompiler && neededBy)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(symbol->__anon2.__anon2.externalPtr)
+__ecereMethod_External_CreateUniqueEdge(neededBy, symbol->__anon2.__anon2.externalPtr, 0);
+if(symbol->__anon2.__anon2.externalGet)
+__ecereMethod_External_CreateUniqueEdge(neededBy, symbol->__anon2.__anon2.externalGet, symbol->__anon2.__anon2.externalGet->type == 0);
+if(symbol->__anon2.__anon2.externalSet)
+__ecereMethod_External_CreateUniqueEdge(neededBy, symbol->__anon2.__anon2.externalSet, symbol->__anon2.__anon2.externalSet->type == 0);
}
-return 0x1;
}
-static unsigned int Int64Not(struct Expression * exp, struct Operand * op1)
+static void ProcessDeclarator(struct Declarator * decl, unsigned int isFunction);
+
+void DeclareMethod(struct External * neededFor, struct __ecereNameSpace__ecere__com__Method * method, const char * name)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(!op1->__anon1.i64));
-if(!exp->expType)
+struct Symbol * symbol = method->symbol;
+
+if(!symbol || (!symbol->__anon2.__anon1.pointerExternal && (!symbol->__anon2.__anon3.methodCodeExternal || method->type == 1)))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+unsigned int dllImport = 0;
-static unsigned int UInt64Not(struct Expression * exp, struct Operand * op1)
+if(!method->dataType)
+method->dataType = ProcessTypeString(method->dataTypeString, 0);
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(!op1->__anon1.ui64));
-if(!exp->expType)
+if(!symbol || method->type == 1)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Symbol * classSym;
-static unsigned int ShortNot(struct Expression * exp, struct Operand * op1)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(!op1->__anon1.s));
-if(!exp->expType)
+if(!method->_class->symbol)
+method->_class->symbol = FindClass(method->_class->fullName);
+classSym = method->_class->symbol;
+if(!classSym->_import)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct ModuleImport * module;
+
+if(method->_class->module && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)method->_class->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->name)
+module = FindModule(method->_class->module);
+else
+module = mainModule;
+classSym->_import = __extension__ ({
+struct ClassImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassImport);
+
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(method->_class->fullName), __ecereInstance1->isRemote = method->_class->isRemote, __ecereInstance1;
+});
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->classes, classSym->_import);
}
-return 0x1;
+if(!symbol)
+{
+symbol = method->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
}
+if(!symbol->_import)
+{
+symbol->_import = (struct ClassImport *)__extension__ ({
+struct MethodImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MethodImport);
-static unsigned int UShortNot(struct Expression * exp, struct Operand * op1)
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(method->name), __ecereInstance1->isVirtual = method->type == 1, __ecereInstance1;
+});
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classSym->_import->methods, symbol->_import);
+}
+if(!symbol)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(!op1->__anon1.us));
-if(!exp->expType)
+symbol->type = method->dataType;
+if(symbol->type)
+symbol->type->refCount++;
+}
+}
+if(!method->dataType->dllExport)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if((method->_class->module != privateModule || !strcmp(method->_class->name, "float") || !strcmp(method->_class->name, "double")) && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)method->_class->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType != 1)
+dllImport = 1;
}
-return 0x1;
}
-
-static unsigned int CharNot(struct Expression * exp, struct Operand * op1)
+if(inCompiler)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(!op1->__anon1.c));
-if(!exp->expType)
+struct Declaration * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
+struct Declarator * d;
+struct Declarator * funcDecl;
+struct External * external;
+
+specifiers = MkList();
+declarators = MkList();
+if(dllImport)
+ListAdd(specifiers, MkSpecifier(EXTERN));
+else if(method->_class->symbol && ((struct Symbol *)method->_class->symbol)->isStatic)
+ListAdd(specifiers, MkSpecifier(STATIC));
+if(method->type == 1)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+ListAdd(specifiers, MkSpecifier(INT));
+d = MkDeclaratorIdentifier(MkIdentifier(name));
}
-return 0x1;
+else
+{
+d = MkDeclaratorIdentifier(MkIdentifier(name));
+if(dllImport)
+d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
+{
+struct Context * context = SetupTemplatesContext(method->_class);
+
+d = SpecDeclFromString(method->dataTypeString, specifiers, d);
+FinishTemplatesContext(context);
}
+funcDecl = GetFuncDecl(d);
+if(dllImport)
+{
+struct Specifier * spec, * next;
-static unsigned int UCharNot(struct Expression * exp, struct Operand * op1)
+for(spec = (*specifiers).first; spec; spec = next)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(!op1->__anon1.uc));
-if(!exp->expType)
+next = spec->next;
+if(spec->type == 5)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*specifiers), spec);
+FreeSpecifier(spec);
}
-return 0x1;
}
-
-static unsigned int IntEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+if(method->dataType && !method->dataType->__anon1.__anon2.staticMethod)
{
-int value2 = op2->__anon1.i;
+if(funcDecl && funcDecl->__anon1.function.parameters && (*funcDecl->__anon1.function.parameters).count)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = method->dataType->__anon1.__anon2.thisClass ? method->dataType->__anon1.__anon2.thisClass->__anon1.registered : method->_class;
+struct TypeName * thisParam = MkTypeName(MkListOne(MkSpecifierName(method->dataType->__anon1.__anon2.thisClass ? method->dataType->__anon1.__anon2.thisClass->string : method->_class->fullName)), (_class && _class->type == 1000) ? MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier("this"))) : MkDeclaratorIdentifier(MkIdentifier("this")));
+struct TypeName * firstParam = ((struct TypeName *)(*funcDecl->__anon1.function.parameters).first);
+struct Specifier * firstSpec = firstParam->qualifiers ? (*firstParam->qualifiers).first : (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i == value2));
-if(!exp->expType)
+if(firstSpec && firstSpec->type == 0 && firstSpec->__anon1.specifier == VOID && !firstParam->declarator)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct TypeName * param = (*funcDecl->__anon1.function.parameters).first;
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*funcDecl->__anon1.function.parameters), param);
+FreeTypeName(param);
+}
+if(!funcDecl->__anon1.function.parameters)
+funcDecl->__anon1.function.parameters = MkList();
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*funcDecl->__anon1.function.parameters), (((void *)0)), thisParam);
}
-return 0x1;
}
-
-static unsigned int UIntEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+ProcessDeclarator(d, 1);
+ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
+decl = MkDeclaration(specifiers, declarators);
+ReplaceThisClassSpecifiers(specifiers, method->_class);
+external = MkExternalDeclaration(decl);
+external->symbol = symbol;
+symbol->__anon2.__anon1.pointerExternal = external;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external);
+DeclareStruct(external, method->_class->fullName, 1, 1);
+if(method->dataType)
+DeclareType(external, method->dataType, 1, 1);
+}
+}
+if(inCompiler && neededFor)
{
-unsigned int value2 = op2->__anon1.ui;
+struct External * external = symbol->__anon2.__anon1.pointerExternal ? symbol->__anon2.__anon1.pointerExternal : symbol->__anon2.__anon3.methodCodeExternal;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui == value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+__ecereMethod_External_CreateUniqueEdge(neededFor, external, external->type == 0);
}
-return 0x1;
}
-static unsigned int Int64Equ(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+struct __ecereNameSpace__ecere__com__GlobalFunction;
+
+struct __ecereNameSpace__ecere__com__GlobalFunction
{
-long long value2 = op2->__anon1.i64;
+struct __ecereNameSpace__ecere__com__GlobalFunction * prev;
+struct __ecereNameSpace__ecere__com__GlobalFunction * next;
+const char * name;
+int (* function)();
+struct __ecereNameSpace__ecere__com__Instance * module;
+struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
+const char * dataTypeString;
+struct Type * dataType;
+void * symbol;
+} ecere_gcc_struct;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 == value2));
-if(!exp->expType)
+extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_FindFunction(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
+
+extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_RegisterFunction(const char * name, const char * type, void * func, struct __ecereNameSpace__ecere__com__Instance * module, int declMode);
+
+unsigned int DeclareFunction(struct External * neededFor, struct __ecereNameSpace__ecere__com__GlobalFunction * function, char * name)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Symbol * symbol = function->symbol;
-static unsigned int UInt64Equ(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!symbol || !symbol->__anon2.__anon1.pointerExternal)
{
-uint64 value2 = op2->__anon1.ui64;
+unsigned int imported = 0;
+unsigned int dllImport = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 == value2));
-if(!exp->expType)
+if(!function->dataType)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+function->dataType = ProcessTypeString(function->dataTypeString, 0);
+if(!function->dataType->__anon1.__anon2.thisClass)
+function->dataType->__anon1.__anon2.staticMethod = 1;
}
+if(inCompiler)
+{
+if(!symbol)
+{
+struct ModuleImport * module = FindModule(function->module);
-static unsigned int ShortEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+symbol = function->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+if(module->name)
{
-short value2 = op2->__anon1.s;
+if(!function->dataType->dllExport)
+{
+symbol->_import = (struct ClassImport *)__extension__ ({
+struct FunctionImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionImport);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s == value2));
-if(!exp->expType)
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(function->name), __ecereInstance1;
+});
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->functions, symbol->_import);
+}
+}
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+symbol->type = ProcessTypeString(function->dataTypeString, 0);
+if(!symbol->type->__anon1.__anon2.thisClass)
+symbol->type->__anon1.__anon2.staticMethod = 1;
}
-return 0x1;
}
+imported = symbol->_import ? 1 : 0;
+if(imported && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType != 1)
+dllImport = 1;
+}
+if(inCompiler)
+{
+{
+struct Declaration * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
+struct Declarator * d;
+struct Declarator * funcDecl;
+struct External * external;
-static unsigned int UShortEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+specifiers = MkList();
+declarators = MkList();
+ListAdd(specifiers, MkSpecifier(EXTERN));
+d = MkDeclaratorIdentifier(MkIdentifier(imported ? name : function->name));
+if(dllImport)
+d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d));
+d = SpecDeclFromString(function->dataTypeString, specifiers, d);
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType == 1)
{
-unsigned short value2 = op2->__anon1.us;
+struct Specifier * spec;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us == value2));
-if(!exp->expType)
+for(spec = (*specifiers).first; spec; spec = spec->next)
+if(spec->type == 5 && spec->__anon1.__anon1.extDecl && spec->__anon1.__anon1.extDecl->type == 0 && !strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "dllexport"))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*specifiers), spec);
+FreeSpecifier(spec);
+break;
}
-return 0x1;
}
-
-static unsigned int CharEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+funcDecl = GetFuncDecl(d);
+if(funcDecl && !funcDecl->__anon1.function.parameters)
{
-char value2 = op2->__anon1.c;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c == value2));
-if(!exp->expType)
+funcDecl->__anon1.function.parameters = MkList();
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*funcDecl->__anon1.function.parameters), (((void *)0)), MkTypeName(MkListOne(MkSpecifier(VOID)), (((void *)0))));
+}
+ListAdd(declarators, MkInitDeclarator(d, (((void *)0))));
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct Context * oldCtx = curContext;
+
+curContext = globalContext;
+decl = MkDeclaration(specifiers, declarators);
+curContext = oldCtx;
+}
+external = MkExternalDeclaration(decl);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external);
+external->symbol = symbol;
+symbol->__anon2.__anon1.pointerExternal = external;
+DeclareType(external, function->dataType, 1, 1);
+}
}
-return 0x1;
+}
+if(inCompiler && neededFor && symbol && symbol->__anon2.__anon1.pointerExternal)
+__ecereMethod_External_CreateUniqueEdge(neededFor, symbol->__anon2.__anon1.pointerExternal, symbol->__anon2.__anon1.pointerExternal->type == 0);
+return (symbol && symbol->_import && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType != 1) ? 1 : 0;
}
-static unsigned int UCharEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void DeclareFunctionUtil(struct External * neededBy, const char * s)
{
-unsigned char value2 = op2->__anon1.uc;
+struct __ecereNameSpace__ecere__com__GlobalFunction * function = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, s);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc == value2));
-if(!exp->expType)
+if(function)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+char name[1024];
+
+name[0] = 0;
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType != 1 && (!function->dataType || !function->dataType->dllExport))
+strcpy(name, "__ecereFunction_");
+FullClassNameCat(name, s, 0);
+DeclareFunction(neededBy, function, name);
}
-return 0x1;
+else if(neededBy)
+FindSymbol(s, globalContext, globalContext, 0, 0);
}
-static unsigned int FloatEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void CreateFireWatcher(struct __ecereNameSpace__ecere__com__Property * prop, struct Expression * object, struct Statement * stmt)
{
-float value2 = op2->__anon1.f;
+char propName[1024], propNameM[1024];
+char getName[1024], setName[1024];
+struct __ecereNameSpace__ecere__sys__OldList * args;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f == value2));
-if(!exp->expType)
+DeclareProperty(curExternal, prop, setName, getName);
+strcpy(propName, "__ecereProp_");
+FullClassNameCat(propName, prop->_class->fullName, 0);
+strcat(propName, "_");
+FullClassNameCat(propName, prop->name, 1);
+strcpy(propNameM, "__ecerePropM_");
+FullClassNameCat(propNameM, prop->_class->fullName, 0);
+strcat(propNameM, "_");
+FullClassNameCat(propNameM, prop->name, 1);
+if(prop->isWatchable)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+args = MkList();
+ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireWatchers")), args));
+args = MkList();
+ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM)));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireWatchers")), args));
+DeclareFunctionUtil(curExternal, "eInstance_FireWatchers");
+}
+{
+args = MkList();
+ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args));
+args = MkList();
+ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM)));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args));
+DeclareFunctionUtil(curExternal, "eInstance_FireSelfWatchers");
}
-return 0x1;
+if(curFunction->propSet && !strcmp(curFunction->propSet->string, prop->name) && (!object || (object->type == 0 && !strcmp(object->__anon1.__anon1.identifier->string, "this"))))
+curFunction->propSet->fireWatchersDone = 1;
}
-static unsigned int DoubleEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-double value2 = op2->__anon1.d;
+struct __ecereNameSpace__ecere__com__SubModule;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d == value2));
-if(!exp->expType)
+struct __ecereNameSpace__ecere__com__SubModule
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__SubModule * prev;
+struct __ecereNameSpace__ecere__com__SubModule * next;
+struct __ecereNameSpace__ecere__com__Instance * module;
+int importMode;
+} ecere_gcc_struct;
-static unsigned int IntNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int ModuleVisibility(struct __ecereNameSpace__ecere__com__Instance * searchIn, struct __ecereNameSpace__ecere__com__Instance * searchFor)
{
-int value2 = op2->__anon1.i;
+struct __ecereNameSpace__ecere__com__SubModule * subModule;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i != value2));
-if(!exp->expType)
+if(searchFor == searchIn)
+return 1;
+for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->modules.first; subModule; subModule = subModule->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(subModule->importMode == 1 || searchIn == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application)
+{
+if(ModuleVisibility(subModule->module, searchFor))
+return 1;
+}
}
-return 0x1;
+return 0;
}
-static unsigned int UIntNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void ProcessExpressionType(struct Expression * exp);
+
+static void ReplaceClassMembers(struct Expression * exp, struct __ecereNameSpace__ecere__com__Class * _class)
{
-unsigned int value2 = op2->__anon1.ui;
+if(exp->type == 0 && exp->__anon1.__anon1.identifier)
+{
+struct Identifier * id = exp->__anon1.__anon1.identifier;
+struct Context * ctx;
+struct Symbol * symbol = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui != value2));
-if(!exp->expType)
+if(!id->_class || !id->_class->__anon1.__anon1.name || strcmp(id->_class->__anon1.__anon1.name, "property"))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+for(ctx = curContext; ctx != topContext->parent && !symbol; ctx = ctx->parent)
+{
+if(!ctx)
+break;
+symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->symbols, id->string);
+if(symbol)
+break;
}
-return 0x1;
}
-
-static unsigned int Int64Nqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!symbol && ((!id->_class || (id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property"))) || (id->classSym && __ecereNameSpace__ecere__com__eClass_IsDerived(_class, id->classSym->__anon1.registered))))
{
-long long value2 = op2->__anon1.i64;
+struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
+struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
+struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 != value2));
-if(!exp->expType)
+if(!prop)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule);
+}
+if(!prop && !method)
+member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)));
+if(!prop && !method && !member)
+{
+classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(_class, id->string);
}
-return 0x1;
+if(prop || method || member || classProp)
+{
+exp->type = 8;
+exp->__anon1.member.member = id;
+exp->__anon1.member.memberType = 0;
+exp->__anon1.member.exp = QMkExpId("this");
+exp->addedThis = 1;
}
-
-static unsigned int UInt64Nqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(_class && _class->templateParams.first)
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__Class * sClass;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 != value2));
-if(!exp->expType)
+for(sClass = _class; sClass; sClass = sClass->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+if(sClass->templateParams.first)
+{
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-static unsigned int ShortNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(param = sClass->templateParams.first; param; param = param->next)
{
-short value2 = op2->__anon1.s;
+if(param->type == 2 && !strcmp(param->name, id->string))
+{
+struct Expression * argExp = GetTemplateArgExpByName(param->name, _class, 2);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s != value2));
-if(!exp->expType)
+if(argExp)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+
+FreeIdentifier(exp->__anon1.member.member);
+ProcessExpressionType(argExp);
+decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
+exp->expType = ProcessType(specs, decl);
+exp->type = 5;
+exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), MkExpOp((((void *)0)), '&', argExp))));
+}
+}
+}
+}
+}
+}
+}
}
-return 0x1;
}
-static unsigned int UShortNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void PopulateInstanceProcessMember(struct Instantiation * inst, struct __ecereNameSpace__ecere__sys__OldList * memberList, struct __ecereNameSpace__ecere__com__DataMember * parentDataMember, unsigned int offset)
{
-unsigned short value2 = op2->__anon1.us;
+struct __ecereNameSpace__ecere__com__DataMember * dataMember;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us != value2));
-if(!exp->expType)
+for(dataMember = parentDataMember->members.first; dataMember; dataMember = dataMember->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+if(!dataMember->name && (dataMember->type == 2 || dataMember->type == 1))
+PopulateInstanceProcessMember(inst, memberList, dataMember, offset + dataMember->offset);
+else
+{
+struct Expression * exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct MemberInit * member = MkMemberInit(MkListOne(MkIdentifier(dataMember->name)), MkInitializerAssignment(exp));
+struct Type * type;
+void * ptr = inst->data + dataMember->offset + offset;
+char * result = (((void *)0));
-static unsigned int CharNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+exp->loc = member->loc = inst->loc;
+((struct Identifier *)(*member->identifiers).first)->loc = inst->loc;
+if(!dataMember->dataType)
+dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0);
+type = dataMember->dataType;
+if(type->kind == 8)
{
-char value2 = op2->__anon1.c;
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c != value2));
-if(!exp->expType)
+if(_class->type == 4)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-static unsigned int UCharNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(enumClass)
{
-unsigned char value2 = op2->__anon1.uc;
+struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
+struct __ecereNameSpace__ecere__sys__NamedLink64 * item;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc != value2));
-if(!exp->expType)
+for(item = e->values.first; item; item = item->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(item->data == GetEnumValue(_class, ptr))
+{
+result = item->name;
+break;
}
-return 0x1;
}
-
-static unsigned int FloatNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(result)
{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f != value2));
-if(!exp->expType)
+exp->__anon1.__anon1.identifier = MkIdentifier(result);
+exp->type = 0;
+exp->destType = MkClassType(_class->fullName);
+ProcessExpressionType(exp);
+}
+}
+}
+if(_class->type == 4 || _class->type == 3 || _class->type == 2)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+type = _class->dataType;
}
-return 0x1;
}
-
-static unsigned int DoubleNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!result)
{
-double value2 = op2->__anon1.d;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d != value2));
-if(!exp->expType)
+switch(type->kind)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+case 6:
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintFloat(*(float *)ptr);
+exp->type = 2;
+break;
}
-
-static unsigned int IntAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 7:
{
-int value2 = op2->__anon1.i;
-
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintDouble(*(double *)ptr);
exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i && value2));
-if(!exp->expType)
+break;
+}
+case 3:
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt(*(int *)ptr);
+exp->type = 2;
+break;
}
-return 0x1;
+case 4:
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt64(*(long long *)ptr);
+exp->type = 2;
+break;
}
-
-static unsigned int UIntAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 22:
{
-unsigned int value2 = op2->__anon1.ui;
-
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt64((long long)*(intptr_t *)ptr);
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui && value2));
-if(!exp->expType)
+break;
+}
+case 23:
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt64((long long)*(ssize_t *)ptr);
+exp->type = 2;
+break;
+}
+default:
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Unhandled type populating instance\n", (((void *)0))));
+}
+}
+ListAdd(memberList, member);
+}
+if(parentDataMember->type == 1)
+break;
}
-return 0x1;
}
-static unsigned int Int64And(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void CheckTemplateTypes(struct Expression * exp)
{
-long long value2 = op2->__anon1.i64;
+struct Expression * nbExp = GetNonBracketsExp(exp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 && value2));
-if(!exp->expType)
+if(exp->destType && exp->destType->passAsTemplate && exp->expType && exp->expType->kind != 20 && !exp->expType->passAsTemplate && (nbExp == exp || nbExp->type != 11))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct Context * context;
+int kind = exp->expType->kind;
-static unsigned int UInt64And(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+*newExp = *exp;
+if(exp->destType)
+exp->destType->refCount++;
+if(exp->expType)
+exp->expType->refCount++;
+newExp->prev = (((void *)0));
+newExp->next = (((void *)0));
+if(exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered)
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__Class * c = exp->expType->__anon1._class->__anon1.registered;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 && value2));
-if(!exp->expType)
+if(c->type == 2 || c->type == 4 || c->type == 3)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!c->dataType)
+c->dataType = ProcessTypeString(c->dataTypeString, 0);
+kind = c->dataType->kind;
}
-return 0x1;
}
-
-static unsigned int ShortAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+switch(kind)
{
-short value2 = op2->__anon1.s;
+case 7:
+if(exp->destType->classObjectType)
+{
+if(exp->destType)
+exp->destType->refCount--;
+if(exp->expType)
+exp->expType->refCount--;
+((newExp ? __extension__ ({
+void * __ecerePtrToDelete = (newExp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s && value2));
-if(!exp->expType)
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), newExp = 0);
+}
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct __ecereNameSpace__ecere__sys__OldList * specs;
+struct __ecereNameSpace__ecere__sys__OldList * unionDefs = MkList();
+struct __ecereNameSpace__ecere__sys__OldList * statements = MkList();
+
+context = PushContext();
+ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(DOUBLE)), MkListOne(MkDeclaratorIdentifier(MkIdentifier("d"))), (((void *)0)))));
+ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifierName("uint64")), MkListOne(MkDeclaratorIdentifier(MkIdentifier("i"))), (((void *)0)))));
+specs = MkListOne(MkStructOrUnion(4, (((void *)0)), unionDefs));
+exp->type = 23;
+exp->__anon1.compound = MkCompoundStmt(MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_union")), (((void *)0)))))), statements);
+ListAdd(statements, MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("d")), '=', newExp))));
+ListAdd(statements, MkExpressionStmt(MkListOne(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("i")))));
+exp->__anon1.compound->__anon1.compound.context = context;
+PopContext(context);
+}
+break;
+default:
+exp->type = 11;
+exp->__anon1.cast.typeName = MkTypeName(MkListOne(MkSpecifierName("uint64")), (((void *)0)));
+if((exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1) || __ecereProp_Type_Get_isPointerType(exp->expType))
+exp->__anon1.cast.exp = MkExpCast(MkTypeName(MkListOne(MkSpecifierName("uintptr")), (((void *)0))), MkExpBrackets(MkListOne(newExp)));
+else
+exp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp));
+exp->needCast = 1;
+break;
}
-return 0x1;
}
+else if(exp->expType && exp->expType->passAsTemplate && exp->destType && ((unsigned int)((exp->usage & 0x1) >> 0)) && exp->destType->kind != 20 && !exp->destType->passAsTemplate)
+{
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct Context * context;
+int kind = exp->expType->kind;
-static unsigned int UShortAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+*newExp = *exp;
+if(exp->destType)
+exp->destType->refCount++;
+if(exp->expType)
+exp->expType->refCount++;
+newExp->prev = (((void *)0));
+newExp->next = (((void *)0));
+if(exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered)
{
-unsigned short value2 = op2->__anon1.us;
+struct __ecereNameSpace__ecere__com__Class * c = exp->expType->__anon1._class->__anon1.registered;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us && value2));
-if(!exp->expType)
+if(c->type == 2 || c->type == 4 || c->type == 3)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!c->dataType)
+c->dataType = ProcessTypeString(c->dataTypeString, 0);
+kind = c->dataType->kind;
}
-return 0x1;
}
-
-static unsigned int CharAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+switch(kind)
{
-char value2 = op2->__anon1.c;
+case 7:
+if(exp->destType->classObjectType)
+{
+if(exp->destType)
+exp->destType->refCount--;
+if(exp->expType)
+exp->expType->refCount--;
+((newExp ? __extension__ ({
+void * __ecerePtrToDelete = (newExp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c && value2));
-if(!exp->expType)
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), newExp = 0);
+}
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct __ecereNameSpace__ecere__sys__OldList * specs;
+struct __ecereNameSpace__ecere__sys__OldList * unionDefs = MkList();
+struct __ecereNameSpace__ecere__sys__OldList * statements = MkList();
+
+context = PushContext();
+ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(DOUBLE)), MkListOne(MkDeclaratorIdentifier(MkIdentifier("d"))), (((void *)0)))));
+ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifierName("uint64")), MkListOne(MkDeclaratorIdentifier(MkIdentifier("i"))), (((void *)0)))));
+specs = MkListOne(MkStructOrUnion(4, (((void *)0)), unionDefs));
+exp->type = 23;
+exp->__anon1.compound = MkCompoundStmt(MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_union")), (((void *)0)))))), statements);
+ListAdd(statements, MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("i")), '=', newExp))));
+ListAdd(statements, MkExpressionStmt(MkListOne(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("d")))));
+exp->__anon1.compound->__anon1.compound.context = context;
+PopContext(context);
}
-return 0x1;
+break;
+case 8:
+{
+if(exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1)
+{
+exp->type = 5;
+newExp = MkExpCast(MkTypeName(MkListOne(MkSpecifierName("uintptr")), (((void *)0))), newExp);
+exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp->expType->__anon1._class->string)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), newExp)));
+ProcessExpressionType((*exp->__anon1.list).first);
+break;
}
-
-static unsigned int UCharAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc && value2));
-if(!exp->expType)
+exp->type = 5;
+if(__ecereProp_Type_Get_isPointerType(exp->expType))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+exp->needTemplateCast = 2;
+newExp->needCast = 1;
+newExp->needTemplateCast = 2;
+newExp = MkExpCast(MkTypeName(MkListOne(MkSpecifierName("uintptr")), (((void *)0))), newExp);
+}
+exp->__anon1.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp->expType->__anon1._class->string)), (((void *)0))), newExp));
+exp->needTemplateCast = 2;
+newExp->needCast = 1;
+newExp->needTemplateCast = 2;
+ProcessExpressionType((*exp->__anon1.list).first);
+break;
}
-return 0x1;
}
-
-static unsigned int FloatAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+default:
{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f && value2));
-if(!exp->expType)
+if(exp->expType->kind == 20)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Type * type = ProcessTemplateParameterType(exp->expType->__anon1.templateParameter);
-static unsigned int DoubleAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(type)
{
-double value2 = op2->__anon1.d;
+FreeType(exp->destType);
+FreeType(exp->expType);
+((newExp ? __extension__ ({
+void * __ecerePtrToDelete = (newExp);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d && value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), newExp = 0);
+break;
}
-return 0x1;
}
-
-static unsigned int IntOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
{
-int value2 = op2->__anon1.i;
+char typeString[1024];
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i || value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+typeString[0] = '\0';
+PrintType(exp->expType, typeString, 0, 0);
+decl = SpecDeclFromString(typeString, specs, (((void *)0)));
+exp->type = 11;
+exp->__anon1.cast.typeName = MkTypeName(specs, decl);
+exp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp));
+exp->__anon1.cast.exp->needCast = 1;
+exp->needTemplateCast = 2;
+newExp->needTemplateCast = 2;
+}
+break;
}
-return 0x1;
}
-
-static unsigned int UIntOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned int value2 = op2->__anon1.ui;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui || value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-static unsigned int Int64Or(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+static void ProcessInitializer(struct Initializer * init, struct Type * type)
{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 || value2));
-if(!exp->expType)
+switch(init->type)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int UInt64Or(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 0:
+if(!init->__anon1.exp || init->__anon1.exp->type != 1 || !init->__anon1.exp->__anon1.instance || init->__anon1.exp->__anon1.instance->_class || !type || type->kind == 8)
{
-uint64 value2 = op2->__anon1.ui64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 || value2));
-if(!exp->expType)
+if(init->__anon1.exp && !init->__anon1.exp->destType)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+FreeType(init->__anon1.exp->destType);
+init->__anon1.exp->destType = type;
+if(type)
+type->refCount++;
}
-
-static unsigned int ShortOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s || value2));
-if(!exp->expType)
+if(init->__anon1.exp)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+ProcessExpressionType(init->__anon1.exp);
+init->isConstant = init->__anon1.exp->isConstant;
}
-return 0x1;
+break;
}
-
-static unsigned int UShortOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-unsigned short value2 = op2->__anon1.us;
+struct Expression * exp = init->__anon1.exp;
+struct Instantiation * inst = exp->__anon1.instance;
+struct MembersInit * members;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us || value2));
-if(!exp->expType)
+init->type = 1;
+init->__anon1.list = MkList();
+if(inst->members)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int CharOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(members = (*inst->members).first; members; members = members->next)
{
-char value2 = op2->__anon1.c;
+if(members->type == 0)
+{
+struct MemberInit * member;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c || value2));
-if(!exp->expType)
+for(member = (*members->__anon1.dataMembers).first; member; member = member->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+ListAdd(init->__anon1.list, member->initializer);
+member->initializer = (((void *)0));
}
-return 0x1;
}
-
-static unsigned int UCharOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned char value2 = op2->__anon1.uc;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc || value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-
-static unsigned int FloatOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+FreeExpression(exp);
+}
+case 1:
{
-float value2 = op2->__anon1.f;
+struct Initializer * i;
+struct Type * initializerType = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256];
+int subMemberStackPos = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f || value2));
-if(!exp->expType)
+if(type && type->kind == 12)
+initializerType = Dereference(type);
+else if(type && (type->kind == 9 || type->kind == 10))
+initializerType = type->__anon1.__anon1.members.first;
+for(i = (*init->__anon1.list).first; i; i = i->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
-
-static unsigned int DoubleOr(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(type && type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
{
-double value2 = op2->__anon1.d;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d || value2));
-if(!exp->expType)
+FindNextDataMember(type->__anon1._class->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos);
+if(curMember)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!curMember->dataType)
+curMember->dataType = ProcessTypeString(curMember->dataTypeString, 0);
+initializerType = curMember->dataType;
}
-return 0x1;
}
-
-static unsigned int IntGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-int value2 = op2->__anon1.i;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i > value2));
-if(!exp->expType)
+ProcessInitializer(i, initializerType);
+if(initializerType && type && (type->kind == 9 || type->kind == 10))
+initializerType = initializerType->next;
+if(!i->isConstant)
+init->isConstant = 0;
+}
+if(type && type->kind == 12)
+FreeType(initializerType);
+if(type && type->kind != 12 && type->kind != 9 && type->kind != 10 && (type->kind != 8 || !type->__anon1._class->__anon1.registered || type->__anon1._class->__anon1.registered->type != 1))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Assigning list initializer to non list\n", (((void *)0))));
+}
+break;
+}
}
-return 0x1;
}
-static unsigned int UIntGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+void PopulateInstance(struct Instantiation * inst)
{
-unsigned int value2 = op2->__anon1.ui;
+struct Symbol * classSym = inst->_class->__anon1.__anon1.symbol;
+struct __ecereNameSpace__ecere__com__Class * _class = classSym->__anon1.registered;
+struct __ecereNameSpace__ecere__com__DataMember * dataMember;
+struct __ecereNameSpace__ecere__sys__OldList * memberList = MkList();
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui > value2));
-if(!exp->expType)
+if(!inst->members)
+inst->members = MkListOne(MkMembersInitList(memberList));
+else
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*inst->members), MkMembersInitList(memberList));
+for(dataMember = _class->membersAndProperties.first; dataMember; dataMember = dataMember->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+if(!dataMember->isProperty)
+{
+if(!dataMember->name && (dataMember->type == 2 || dataMember->type == 1))
+PopulateInstanceProcessMember(inst, memberList, dataMember, dataMember->offset);
+else
+{
+struct Expression * exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct MemberInit * member = MkMemberInit(MkListOne(MkIdentifier(dataMember->name)), MkInitializerAssignment(exp));
+struct Type * type;
+void * ptr = inst->data + dataMember->offset;
+char * result = (((void *)0));
-static unsigned int Int64Grt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+exp->loc = member->loc = inst->loc;
+((struct Identifier *)(*member->identifiers).first)->loc = inst->loc;
+if(!dataMember->dataType)
+dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0);
+type = dataMember->dataType;
+if(type->kind == 8)
{
-long long value2 = op2->__anon1.i64;
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 > value2));
-if(!exp->expType)
+if(_class->type == 4)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-static unsigned int UInt64Grt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(enumClass)
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
+struct __ecereNameSpace__ecere__sys__NamedLink64 * item;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 > value2));
-if(!exp->expType)
+for(item = e->values.first; item; item = item->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(item->data == GetEnumValue(_class, ptr))
+{
+result = item->name;
+break;
}
-return 0x1;
}
-
-static unsigned int ShortGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+if(result)
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s > value2));
-if(!exp->expType)
+exp->__anon1.__anon1.identifier = MkIdentifier(result);
+exp->type = 0;
+exp->destType = MkClassType(_class->fullName);
+ProcessExpressionType(exp);
+}
+}
+if(_class->type == 4 || _class->type == 3 || _class->type == 2)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+type = _class->dataType;
}
-return 0x1;
}
-
-static unsigned int UShortGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!result)
{
-unsigned short value2 = op2->__anon1.us;
-
+switch(type->kind)
+{
+case 6:
+{
+exp->__anon1.__anon1.constant = PrintFloat(*(float *)ptr);
exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us > value2));
-if(!exp->expType)
+break;
+}
+case 7:
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+exp->__anon1.__anon1.constant = PrintDouble(*(double *)ptr);
+exp->type = 2;
+break;
}
-return 0x1;
+case 3:
+{
+exp->__anon1.__anon1.constant = PrintInt(*(int *)ptr);
+exp->type = 2;
+break;
}
-
-static unsigned int CharGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+case 4:
{
-char value2 = op2->__anon1.c;
-
+exp->__anon1.__anon1.constant = PrintInt64(*(long long *)ptr);
exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c > value2));
-if(!exp->expType)
+break;
+}
+case 22:
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+exp->__anon1.__anon1.constant = PrintInt64((long long)*(intptr_t *)ptr);
+exp->type = 2;
+break;
+}
+default:
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Unhandled type populating instance\n", (((void *)0))));
+}
+}
+ListAdd(memberList, member);
+}
+}
}
-return 0x1;
}
-static unsigned int UCharGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-unsigned char value2 = op2->__anon1.uc;
+int ComputeTypeSize(struct Type * type);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc > value2));
-if(!exp->expType)
+void ComputeClassMembers(struct __ecereNameSpace__ecere__com__Class * _class, unsigned int isMember)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__DataMember * member = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
+struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
-static unsigned int FloatGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(member || ((_class->type == 2 || _class->type == 0 || _class->type == 1 || _class->type == 5) && (_class->type == 2 || (!_class->structSize || _class->structSize == _class->offset)) && _class->computeSize))
{
-float value2 = op2->__anon1.f;
+int unionMemberOffset = 0;
+int bitFields = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f > value2));
-if(!exp->expType)
+if(member)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+member->memberOffset = 0;
+if(targetBits < sizeof(void *) * 8)
+member->structAlignment = 0;
}
-
-static unsigned int DoubleGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(targetBits < sizeof(void *) * 8)
+_class->structAlignment = 0;
+if(!member && ((_class->type == 0 || _class->type == 5) || (_class->type == 1 && _class->memberOffset && _class->memberOffset > _class->base->structSize)))
+_class->memberOffset = (_class->base && _class->type == 1) ? _class->base->structSize : 0;
+if(!member && _class->destructionWatchOffset)
+_class->memberOffset += sizeof(struct __ecereNameSpace__ecere__sys__OldList);
{
-double value2 = op2->__anon1.d;
+struct __ecereNameSpace__ecere__com__DataMember * dataMember;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d > value2));
-if(!exp->expType)
+for(dataMember = member ? member->members.first : _class->membersAndProperties.first; dataMember; dataMember = dataMember->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!dataMember->isProperty)
+{
+if(dataMember->type == 0 && dataMember->dataTypeString && !dataMember->dataType)
+{
+dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0);
+}
}
-return 0x1;
}
+}
+{
+struct __ecereNameSpace__ecere__com__DataMember * dataMember;
-static unsigned int IntSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(dataMember = member ? member->members.first : _class->membersAndProperties.first; dataMember; dataMember = dataMember->next)
{
-int value2 = op2->__anon1.i;
+if(!dataMember->isProperty && (dataMember->type != 0 || dataMember->dataTypeString))
+{
+if(!isMember && _class->type == 2 && dataMember->dataType)
+{
+struct __ecereNameSpace__ecere__com__BitMember * bitMember = (struct __ecereNameSpace__ecere__com__BitMember *)dataMember;
+uint64 mask = 0;
+int d;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i < value2));
-if(!exp->expType)
+ComputeTypeSize(dataMember->dataType);
+if(bitMember->pos == -1)
+bitMember->pos = _class->memberOffset;
+if(!bitMember->size)
+bitMember->size = dataMember->dataType->size * 8;
+_class->memberOffset = bitMember->pos + bitMember->size;
+for(d = 0; d < bitMember->size; d++)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(d)
+mask <<= 1;
+mask |= 1;
}
-return 0x1;
+bitMember->mask = mask << bitMember->pos;
}
-
-static unsigned int UIntSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(dataMember->type == 0 && dataMember->dataType)
{
-unsigned int value2 = op2->__anon1.ui;
+int size;
+int alignment = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui < value2));
-if(!exp->expType)
+if(dataMember->dataType->kind != 8 || ((!dataMember->dataType->__anon1._class || !dataMember->dataType->__anon1._class->__anon1.registered || dataMember->dataType->__anon1._class->__anon1.registered != _class || _class->type != 1)))
+ComputeTypeSize(dataMember->dataType);
+if(dataMember->dataType->bitFieldCount)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+bitFields += dataMember->dataType->bitFieldCount;
+size = 0;
}
-
-static unsigned int Int64Sma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-long long value2 = op2->__anon1.i64;
+if(bitFields)
+{
+int size = (bitFields + 7) / 8;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 < value2));
-if(!exp->expType)
+if(isMember)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+int __simpleStruct0;
-static unsigned int UInt64Sma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(alignment)
{
-uint64 value2 = op2->__anon1.ui64;
+short __simpleStruct0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 < value2));
-if(!exp->expType)
+member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+if(member->memberOffset % alignment)
+member->memberOffset += alignment - (member->memberOffset % alignment);
+}
+dataMember->offset = member->memberOffset;
+if(member->type == 1)
+unionMemberOffset = (__simpleStruct0 = dataMember->dataType->size, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+member->memberOffset += size;
}
-return 0x1;
}
-
-static unsigned int ShortSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s < value2));
-if(!exp->expType)
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+short __simpleStruct0;
+
+_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+if(_class->memberOffset % alignment)
+_class->memberOffset += alignment - (_class->memberOffset % alignment);
+}
+dataMember->offset = _class->memberOffset;
+_class->memberOffset += size;
+}
+bitFields = 0;
}
-return 0x1;
+size = dataMember->dataType->size;
+alignment = dataMember->dataType->alignment;
}
+if(isMember)
+{
+int __simpleStruct0;
-static unsigned int UShortSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(alignment)
{
-unsigned short value2 = op2->__anon1.us;
+short __simpleStruct0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us < value2));
-if(!exp->expType)
+member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+if(member->memberOffset % alignment)
+member->memberOffset += alignment - (member->memberOffset % alignment);
+}
+dataMember->offset = member->memberOffset;
+if(member->type == 1)
+unionMemberOffset = (__simpleStruct0 = dataMember->dataType->size, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+member->memberOffset += size;
}
-return 0x1;
}
-
-static unsigned int CharSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-char value2 = op2->__anon1.c;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c < value2));
-if(!exp->expType)
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+short __simpleStruct0;
+
+_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+if(_class->memberOffset % alignment)
+_class->memberOffset += alignment - (_class->memberOffset % alignment);
+}
+dataMember->offset = _class->memberOffset;
+_class->memberOffset += size;
}
-return 0x1;
}
+else
+{
+int alignment;
-static unsigned int UCharSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+ComputeClassMembers((struct __ecereNameSpace__ecere__com__Class *)dataMember, 1);
+alignment = dataMember->structAlignment;
+if(isMember)
{
-unsigned char value2 = op2->__anon1.uc;
+int __simpleStruct0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc < value2));
-if(!exp->expType)
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+short __simpleStruct0;
+
+if(member->memberOffset % alignment)
+member->memberOffset += alignment - (member->memberOffset % alignment);
+member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
}
-return 0x1;
+dataMember->offset = member->memberOffset;
+if(member->type == 1)
+unionMemberOffset = (__simpleStruct0 = dataMember->memberOffset, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
+else
+member->memberOffset += dataMember->memberOffset;
}
-
-static unsigned int FloatSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f < value2));
-if(!exp->expType)
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+short __simpleStruct0;
+
+if(_class->memberOffset % alignment)
+_class->memberOffset += alignment - (_class->memberOffset % alignment);
+_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+}
+dataMember->offset = _class->memberOffset;
+_class->memberOffset += dataMember->memberOffset;
}
-return 0x1;
}
-
-static unsigned int DoubleSma(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+}
+if(bitFields)
{
-double value2 = op2->__anon1.d;
+int alignment = 0;
+int size = (bitFields + 7) / 8;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d < value2));
-if(!exp->expType)
+if(isMember)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+int __simpleStruct0;
-static unsigned int IntGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(alignment)
{
-int value2 = op2->__anon1.i;
+short __simpleStruct0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i >= value2));
-if(!exp->expType)
+member->structAlignment = (__simpleStruct0 = member->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+if(member->memberOffset % alignment)
+member->memberOffset += alignment - (member->memberOffset % alignment);
+}
+if(member->type == 1)
+unionMemberOffset = (__simpleStruct0 = dataMember->dataType->size, (unionMemberOffset > __simpleStruct0) ? unionMemberOffset : __simpleStruct0);
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+member->memberOffset += size;
}
-return 0x1;
}
-
-static unsigned int UIntGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-unsigned int value2 = op2->__anon1.ui;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui >= value2));
-if(!exp->expType)
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+short __simpleStruct0;
+
+_class->structAlignment = (__simpleStruct0 = _class->structAlignment, (__simpleStruct0 > alignment) ? __simpleStruct0 : alignment);
+if(_class->memberOffset % alignment)
+_class->memberOffset += alignment - (_class->memberOffset % alignment);
}
-return 0x1;
+_class->memberOffset += size;
}
-
-static unsigned int Int64GrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+bitFields = 0;
+}
+}
+if(member && member->type == 1)
{
-long long value2 = op2->__anon1.i64;
+member->memberOffset = unionMemberOffset;
+}
+if(!isMember)
+{
+if(_class->type != 2)
+{
+int extra = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 >= value2));
-if(!exp->expType)
+if(_class->structAlignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
+if(_class->memberOffset % _class->structAlignment)
+extra += _class->structAlignment - (_class->memberOffset % _class->structAlignment);
}
-
-static unsigned int UInt64GrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+_class->structSize = (_class->base ? (_class->base->templateClass ? (_class->base->type == 5 ? _class->base->templateClass->memberOffset : _class->base->templateClass->structSize) : (_class->base->type == 5 ? _class->base->memberOffset : _class->base->structSize)) : 0) + _class->memberOffset + extra;
+if(!member)
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__Property * prop;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 >= value2));
-if(!exp->expType)
+for(prop = _class->membersAndProperties.first; prop; prop = prop->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(prop->isProperty && prop->isWatchable)
+{
+prop->watcherOffset = _class->structSize;
+_class->structSize += sizeof(struct __ecereNameSpace__ecere__sys__OldList);
+}
}
-return 0x1;
}
+{
+struct __ecereNameSpace__ecere__sys__OldLink * derivative;
-static unsigned int ShortGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(derivative = _class->derivatives.first; derivative; derivative = derivative->next)
{
-short value2 = op2->__anon1.s;
+struct __ecereNameSpace__ecere__com__Class * deriv = derivative->data;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s >= value2));
-if(!exp->expType)
+if(deriv->computeSize)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+deriv->offset = (_class->type == 5 ? _class->memberOffset : _class->structSize);
+deriv->memberOffset = 0;
+deriv->structSize = deriv->offset;
+ComputeClassMembers(deriv, 0);
+}
+}
+}
}
-return 0x1;
+}
+}
+if(context)
+FinishTemplatesContext(context);
}
-static unsigned int UShortGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+int AddMembers(struct External * neededBy, struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__com__Class * _class, unsigned int isMember, unsigned int * retSize, struct __ecereNameSpace__ecere__com__Class * topClass, unsigned int * addedPadding)
{
-unsigned short value2 = op2->__anon1.us;
+struct __ecereNameSpace__ecere__com__DataMember * topMember = isMember ? (struct __ecereNameSpace__ecere__com__DataMember *)_class : (((void *)0));
+unsigned int totalSize = 0;
+unsigned int maxSize = 0;
+int alignment;
+unsigned int size;
+struct __ecereNameSpace__ecere__com__DataMember * member;
+int anonID = 1;
+struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us >= value2));
-if(!exp->expType)
+if(addedPadding)
+*addedPadding = 0;
+if(!isMember && _class->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+maxSize = _class->structSize;
+{
+if(_class->type == 1 || _class->type == 5)
+AddMembers(neededBy, declarations, _class->base, 0, &totalSize, topClass, (((void *)0)));
+else
+{
+unsigned int baseSize = _class->base->templateClass ? _class->base->templateClass->structSize : _class->base->structSize;
+
+if(maxSize > baseSize)
+maxSize -= baseSize;
+else
+maxSize = 0;
+}
}
-return 0x1;
}
+for(member = isMember ? topMember->members.first : _class->membersAndProperties.first; member; member = member->next)
+{
+if(!member->isProperty)
+{
+switch(member->type)
+{
+case 0:
+{
+if(member->dataTypeString)
+{
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(), * decls = MkList();
+struct Declarator * decl;
-static unsigned int CharGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+decl = SpecDeclFromString(member->dataTypeString, specs, MkDeclaratorIdentifier(MkIdentifier(member->name)));
+ListAdd(decls, MkStructDeclarator(decl, (((void *)0))));
+ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, decls, (((void *)0)))));
+if(!member->dataType)
+member->dataType = ProcessType(specs, decl);
+ReplaceThisClassSpecifiers(specs, topClass);
{
-char value2 = op2->__anon1.c;
+struct Type * type = ProcessType(specs, decl);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c >= value2));
-if(!exp->expType)
+DeclareType(neededBy, member->dataType, 1, 0);
+FreeType(type);
+}
+ComputeTypeSize(member->dataType);
+size = member->dataType->size;
+alignment = member->dataType->alignment;
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(totalSize % alignment)
+totalSize += alignment - (totalSize % alignment);
}
-return 0x1;
+totalSize += size;
}
-
-static unsigned int UCharGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+break;
+}
+case 1:
+case 2:
{
-unsigned char value2 = op2->__anon1.uc;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(), * list = MkList();
+char id[100];
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc >= value2));
-if(!exp->expType)
+sprintf(id, "__anon%d", anonID++);
+size = 0;
+AddMembers(neededBy, list, (struct __ecereNameSpace__ecere__com__Class *)member, 1, &size, topClass, (((void *)0)));
+ListAdd(specs, MkStructOrUnion((member->type == 1) ? 4 : 3, (((void *)0)), list));
+ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, MkListOne(MkDeclaratorIdentifier(MkIdentifier(id))), (((void *)0)))));
+alignment = member->structAlignment;
+if(alignment)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(totalSize % alignment)
+totalSize += alignment - (totalSize % alignment);
+}
+totalSize += size;
+break;
}
-return 0x1;
}
-
-static unsigned int FloatGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-float value2 = op2->__anon1.f;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f >= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
+if(retSize)
+{
+unsigned int __simpleStruct0;
-static unsigned int DoubleGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(topMember && topMember->type == 1)
+*retSize = (__simpleStruct0 = *retSize, (__simpleStruct0 > totalSize) ? __simpleStruct0 : totalSize);
+else
+*retSize += totalSize;
+}
+else if(totalSize < maxSize && _class->type != 1000)
{
-double value2 = op2->__anon1.d;
+int autoPadding = 0;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d >= value2));
-if(!exp->expType)
+if(!isMember && _class->structAlignment && totalSize % _class->structAlignment)
+autoPadding = _class->structAlignment - (totalSize % _class->structAlignment);
+if(totalSize + autoPadding < maxSize)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+char sizeString[50];
+
+sprintf(sizeString, "%d", maxSize - totalSize);
+ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(CHAR)), MkListOne(MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__ecere_padding")), MkExpConstant(sizeString))), (((void *)0)))));
+if(addedPadding)
+*addedPadding = 1;
}
-return 0x1;
+}
+if(context)
+FinishTemplatesContext(context);
+return topMember ? topMember->memberID : _class->memberID;
}
-static unsigned int IntSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+unsigned int MatchTypes(struct Type * source, struct Type * dest, struct __ecereNameSpace__ecere__sys__OldList * conversions, struct __ecereNameSpace__ecere__com__Class * owningClassSource, struct __ecereNameSpace__ecere__com__Class * owningClassDest, unsigned int doConversion, unsigned int enumBaseType, unsigned int acceptReversedParams, unsigned int isConversionExploration, unsigned int warnConst)
{
-int value2 = op2->__anon1.i;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt((int)(op1->__anon1.i <= value2));
-if(!exp->expType)
+if(source && dest)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+if(warnConst)
+CheckConstCompatibility(source, dest, 1);
+if(source->kind == 20 && dest->kind != 20)
+{
+struct Type * type = ProcessTemplateParameterType(source->__anon1.templateParameter);
-static unsigned int UIntSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(type)
+source = type;
+}
+if(dest->kind == 20 && source->kind != 20)
{
-unsigned int value2 = op2->__anon1.ui;
+struct Type * type = ProcessTemplateParameterType(dest->__anon1.templateParameter);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt((unsigned int)(op1->__anon1.ui <= value2));
-if(!exp->expType)
+if(type)
+dest = type;
+}
+if(dest->classObjectType == 2 && dest->kind != 11)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(source->classObjectType != 3)
+return 1;
+else
+{
+if((dest->__anon1._class && strcmp(dest->__anon1._class->string, "class")) || (source->__anon1._class && strcmp(source->__anon1._class->string, "class")))
+{
+return 1;
}
-return 0x1;
}
-
-static unsigned int Int64SmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+else
{
-long long value2 = op2->__anon1.i64;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64((long long)(op1->__anon1.i64 <= value2));
-if(!exp->expType)
+if(source->kind != 11 && source->classObjectType == 3)
+return 1;
+if(dest->kind != 11 && dest->classObjectType == 3 && source->classObjectType != 2)
+return 1;
+}
+if((dest->kind == 9 && source->kind == 9) || (dest->kind == 10 && source->kind == 10))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if((dest->__anon1.__anon1.enumName && source->__anon1.__anon1.enumName && !strcmp(dest->__anon1.__anon1.enumName, source->__anon1.__anon1.enumName)) || (source->__anon1.__anon1.members.first && source->__anon1.__anon1.members.first == dest->__anon1.__anon1.members.first))
+return 1;
}
-return 0x1;
+if(dest->kind == 14 && source->kind != 0)
+return 1;
+if(dest->kind == 13 && dest->__anon1.type->kind == 0 && ((source->kind == 8 && (!source->__anon1._class || !source->__anon1._class->__anon1.registered || source->__anon1._class->__anon1.registered->type == 1 || source->__anon1._class->__anon1.registered->type == 0 || source->__anon1._class->__anon1.registered->type == 5 || source->__anon1._class->__anon1.registered->type == 1000)) || source->kind == 19 || source->kind == 13 || source->kind == 12 || source->kind == 11 || source->kind == 21))
+return 1;
+if(!isConversionExploration && source->kind == 13 && source->__anon1.type->kind == 0 && ((dest->kind == 8 && (!dest->__anon1._class || !dest->__anon1._class->__anon1.registered || dest->__anon1._class->__anon1.registered->type == 1 || dest->__anon1._class->__anon1.registered->type == 0 || dest->__anon1._class->__anon1.registered->type == 5 || dest->__anon1._class->__anon1.registered->type == 1000)) || dest->kind == 19 || dest->kind == 13 || dest->kind == 12 || dest->kind == 11 || dest->kind == 21))
+return 1;
+if(((source->kind == 8 && dest->kind == 8) || (source->kind == 19 && dest->kind == 19)) && source->__anon1._class)
+{
+if(source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 3)
+{
+if(conversions != (((void *)0)))
+{
+if(source->__anon1._class->__anon1.registered == dest->__anon1._class->__anon1.registered)
+return 1;
}
-
-static unsigned int UInt64SmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else
{
-uint64 value2 = op2->__anon1.ui64;
+struct __ecereNameSpace__ecere__com__Class * sourceBase, * destBase;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64((uint64)(op1->__anon1.ui64 <= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+for(sourceBase = source->__anon1._class->__anon1.registered; sourceBase && sourceBase->base->type != 1000; sourceBase = sourceBase->base)
+;
+for(destBase = dest->__anon1._class->__anon1.registered; destBase && destBase->base->type != 1000; destBase = destBase->base)
+;
+if(sourceBase == destBase)
+return 1;
}
-return 0x1;
}
-
-static unsigned int ShortSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+else if(source->__anon1._class && dest->__anon1._class && (dest->classObjectType == source->classObjectType || !dest->classObjectType) && (enumBaseType || (!source->__anon1._class->__anon1.registered || source->__anon1._class->__anon1.registered->type != 4) || (!dest->__anon1._class->__anon1.registered || dest->__anon1._class->__anon1.registered->type != 4)) && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, dest->__anon1._class->__anon1.registered))
+return 1;
+else
{
-short value2 = op2->__anon1.s;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort((short)(op1->__anon1.s <= value2));
-if(!exp->expType)
+if(dest->__anon1._class && dest->__anon1._class->__anon1.registered && source->__anon1._class && source->__anon1._class->__anon1.registered && (dest->casted || (enumBaseType && dest->__anon1._class->__anon1.registered->type == 4 && (source->kind == 8 || source->__anon1._class->__anon1.registered->type != 4))))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(__ecereNameSpace__ecere__com__eClass_IsDerived(dest->__anon1._class->__anon1.registered, source->__anon1._class->__anon1.registered))
+{
+return 1;
}
-return 0x1;
}
-
-static unsigned int UShortSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+}
+}
+if(source->kind == 19 && dest->kind == 8 && dest->__anon1._class && !strcmp(dest->__anon1._class->string, "ecere::com::Class"))
+return 1;
+if(doConversion)
{
-unsigned short value2 = op2->__anon1.us;
+if(source->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort((unsigned short)(op1->__anon1.us <= value2));
-if(!exp->expType)
+for(_class = source->__anon1._class ? source->__anon1._class->__anon1.registered : (((void *)0)); _class; _class = _class->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__Property * convert;
-static unsigned int CharSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(convert = _class->conversions.first; convert; convert = convert->next)
{
-char value2 = op2->__anon1.c;
+if(convert->memberAccess == 1 || _class->module == privateModule)
+{
+struct Conversion * after = (conversions != (((void *)0))) ? conversions->last : (((void *)0));
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar((char)(op1->__anon1.c <= value2));
-if(!exp->expType)
+if(!convert->dataType)
+convert->dataType = ProcessTypeString(convert->dataTypeString, 0);
+if((!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), (convert->dataType->kind == 8 && !strcmp(convert->dataTypeString, "String")) ? 1 : 0, convert->dataType->kind == 8, 0, 1, warnConst))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(!conversions && !convert->Get)
+return 1;
+else if(conversions != (((void *)0)))
+{
+if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (dest->kind != 8 || dest->__anon1._class->__anon1.registered != _class->base))
+return 1;
+else
+{
+struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 1, conv);
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(conversions, after, conv);
+return 1;
+}
+}
+}
+}
}
-return 0x1;
}
+}
+if(dest->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class;
-static unsigned int UCharSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+for(_class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0)); _class; _class = _class->base)
{
-unsigned char value2 = op2->__anon1.uc;
+struct __ecereNameSpace__ecere__com__Property * convert;
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar((unsigned char)(op1->__anon1.uc <= value2));
-if(!exp->expType)
+for(convert = _class->conversions.first; convert; convert = convert->next)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+if(convert->memberAccess == 1 || _class->module == privateModule)
+{
+struct Type * constType = (((void *)0));
+unsigned int success = 0;
-static unsigned int FloatSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
+if(!convert->dataType)
+convert->dataType = ProcessTypeString(convert->dataTypeString, 0);
+if(warnConst && convert->dataType->kind == 13 && convert->dataType->__anon1.type && dest->constant)
{
-float value2 = op2->__anon1.f;
+struct Type * ptrType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintFloat((float)(op1->__anon1.f <= value2));
-if(!exp->expType)
+constType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->kind = 13, __ecereInstance1->refCount = 1, __ecereInstance1->__anon1.type = ptrType, __ecereInstance1;
+});
+CopyTypeInto(ptrType, convert->dataType->__anon1.type);
+ptrType->constant = 1;
+}
+if((constType || convert->dataType != dest) && MatchTypes(source, constType ? constType : convert->dataType, conversions, (((void *)0)), (((void *)0)), 1, 0, 0, 1, warnConst))
+{
+if(!conversions && !convert->Set)
+success = 1;
+else if(conversions != (((void *)0)))
+{
+if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (source->kind != 8 || source->__anon1._class->__anon1.registered != _class->base))
+success = 1;
+else
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv);
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(conversions, conv);
+success = 1;
}
-return 0x1;
}
-
-static unsigned int DoubleSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2)
-{
-double value2 = op2->__anon1.d;
-
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintDouble((double)(op1->__anon1.d <= value2));
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
+if(constType)
+FreeType(constType);
+if(success)
+return 1;
}
-
-static unsigned int IntCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt(op1->__anon1.i ? op2->__anon1.i : op3->__anon1.i);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-
-static unsigned int UIntCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
+if(enumBaseType && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt(op1->__anon1.ui ? op2->__anon1.ui : op3->__anon1.ui);
-if(!exp->expType)
+if(!dest->__anon1._class->__anon1.registered->dataType)
+dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0);
+if(dest->__anon1._class->__anon1.registered->dataType->kind == 8 || source->truth || dest->truth)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 1, dest->__anon1._class->__anon1.registered->dataType->kind == 8, 0, 0, warnConst))
+{
+return 1;
}
-return 0x1;
}
-
-static unsigned int Int64Cond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintInt64(op1->__anon1.i64 ? op2->__anon1.i64 : op3->__anon1.i64);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-
-static unsigned int UInt64Cond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
+if(source->kind == 8)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUInt64(op1->__anon1.ui64 ? op2->__anon1.ui64 : op3->__anon1.ui64);
-if(!exp->expType)
+struct __ecereNameSpace__ecere__com__Class * _class;
+
+for(_class = source->__anon1._class ? source->__anon1._class->__anon1.registered : (((void *)0)); _class; _class = _class->base)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct __ecereNameSpace__ecere__com__Property * convert;
-static unsigned int ShortCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
+for(convert = _class->conversions.first; convert; convert = convert->next)
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintShort(op1->__anon1.s ? op2->__anon1.s : op3->__anon1.s);
-if(!exp->expType)
+if(convert->memberAccess == 1 || _class->module == privateModule)
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
-}
-return 0x1;
-}
+struct Conversion * after = (conversions != (((void *)0))) ? conversions->last : (((void *)0));
-static unsigned int UShortCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
+if(!convert->dataType)
+convert->dataType = ProcessTypeString(convert->dataTypeString, 0);
+if(convert->dataType != source && (!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), convert->dataType->kind == 8, convert->dataType->kind == 8, 0, 1, warnConst))
{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUShort(op1->__anon1.us ? op2->__anon1.us : op3->__anon1.us);
-if(!exp->expType)
+if(!conversions && !convert->Get)
+return 1;
+else if(conversions != (((void *)0)))
{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
+if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (dest->kind != 8 || dest->__anon1._class->__anon1.registered != _class->base))
+return 1;
+else
+{
+struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 1, conv);
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(conversions, after, conv);
+return 1;
}
-return 0x1;
}
-
-static unsigned int CharCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintChar(op1->__anon1.c ? op2->__anon1.c : op3->__anon1.c);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-
-static unsigned int UCharCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3)
-{
-exp->type = 2;
-exp->__anon1.__anon2.string = PrintUChar(op1->__anon1.uc ? op2->__anon1.uc : op3->__anon1.uc);
-if(!exp->expType)
-{
-exp->expType = op1->type;
-if(op1->type)
-op1->type->refCount++;
}
-return 0x1;
}
-
-struct OpTable intOps =
+if(enumBaseType && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 4)
{
-IntAdd, IntSub, IntMul, IntDiv, IntMod, IntNeg, IntInc, IntDec, IntAsign, IntAddAsign, IntSubAsign, IntMulAsign, IntDivAsign, IntModAsign, IntBitAnd, IntBitOr, IntBitXor, IntLShift, IntRShift, IntBitNot, IntAndAsign, IntOrAsign, IntXorAsign, IntLShiftAsign, IntRShiftAsign, IntNot, IntEqu, IntNqu, IntAnd, IntOr, IntGrt, IntSma, IntGrtEqu, IntSmaEqu, IntCond
-};
-
-struct OpTable uintOps =
+if(!source->__anon1._class->__anon1.registered->dataType)
+source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0);
+if(!isConversionExploration || source->__anon1._class->__anon1.registered->dataType->kind == 8 || !strcmp(source->__anon1._class->__anon1.registered->name, "String"))
{
-UIntAdd, UIntSub, UIntMul, UIntDiv, UIntMod, UIntNeg, UIntInc, UIntDec, UIntAsign, UIntAddAsign, UIntSubAsign, UIntMulAsign, UIntDivAsign, UIntModAsign, UIntBitAnd, UIntBitOr, UIntBitXor, UIntLShift, UIntRShift, UIntBitNot, UIntAndAsign, UIntOrAsign, UIntXorAsign, UIntLShiftAsign, UIntRShiftAsign, UIntNot, UIntEqu, UIntNqu, UIntAnd, UIntOr, UIntGrt, UIntSma, UIntGrtEqu, UIntSmaEqu, UIntCond
-};
-
-struct OpTable int64Ops =
+if(MatchTypes(source->__anon1._class->__anon1.registered->dataType, dest, conversions, (((void *)0)), (((void *)0)), source->__anon1._class->__anon1.registered->dataType->kind == 8, source->__anon1._class->__anon1.registered->dataType->kind == 8, 0, 0, warnConst))
+return 1;
+else if(MatchTypes(dest, source->__anon1._class->__anon1.registered->dataType, (((void *)0)), (((void *)0)), (((void *)0)), 0, 0, 0, 0, warnConst))
+return 1;
+}
+}
+}
+}
+if(source->kind == 8 || source->kind == 19)
+;
+else if(dest->kind == source->kind && (dest->kind != 9 && dest->kind != 10 && dest->kind != 11 && dest->kind != 12 && dest->kind != 13 && dest->kind != 16))
+return 1;
+else if(dest->kind == 7 && source->kind == 6)
+return 1;
+else if(dest->kind == 2 && (source->kind == 1 || source->kind == 24))
+return 1;
+else if(dest->kind == 3 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 23))
+return 1;
+else if(dest->kind == 4 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 22 || source->kind == 23))
+return 1;
+else if(dest->kind == 22 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 23 || source->kind == 4))
+return 1;
+else if(dest->kind == 23 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 4 || source->kind == 22))
+return 1;
+else if(source->kind == 15 && (dest->kind == 3 || dest->kind == 2 || dest->kind == 1 || source->kind == 24 || dest->kind == 5 || dest->kind == 4 || dest->kind == 22 || dest->kind == 23))
+return 1;
+else if(dest->kind == 15 && !isConversionExploration && (source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 5 || source->kind == 4 || source->kind == 22 || source->kind == 23))
+return 1;
+else if((dest->kind == 11 || (dest->kind == 13 && dest->__anon1.type->kind == 11) || dest->kind == 16) && ((source->kind == 11 || (source->kind == 13 && source->__anon1.type->kind == 11) || source->kind == 16)))
{
-Int64Add, Int64Sub, Int64Mul, Int64Div, Int64Mod, Int64Neg, Int64Inc, Int64Dec, Int64Asign, Int64AddAsign, Int64SubAsign, Int64MulAsign, Int64DivAsign, Int64ModAsign, Int64BitAnd, Int64BitOr, Int64BitXor, Int64LShift, Int64RShift, Int64BitNot, Int64AndAsign, Int64OrAsign, Int64XorAsign, Int64LShiftAsign, Int64RShiftAsign, Int64Not, Int64Equ, Int64Nqu, Int64And, Int64Or, Int64Grt, Int64Sma, Int64GrtEqu, Int64SmaEqu, Int64Cond
-};
+struct Type * paramSource, * paramDest;
-struct OpTable uint64Ops =
+if(dest->kind == 16)
+owningClassDest = dest->__anon1.__anon3.methodClass ? dest->__anon1.__anon3.methodClass : dest->__anon1.__anon3.method->_class;
+if(source->kind == 16)
+owningClassSource = source->__anon1.__anon3.methodClass ? source->__anon1.__anon3.methodClass : source->__anon1.__anon3.method->_class;
+if(dest->kind == 13 && dest->__anon1.type->kind == 11)
+dest = dest->__anon1.type;
+if(source->kind == 13 && source->__anon1.type->kind == 11)
+source = source->__anon1.type;
+if(dest->kind == 16)
+dest = dest->__anon1.__anon3.method->dataType;
+if(source->kind == 16)
+source = source->__anon1.__anon3.method->dataType;
+paramSource = source->__anon1.__anon2.params.first;
+if(paramSource && paramSource->kind == 0)
+paramSource = (((void *)0));
+paramDest = dest->__anon1.__anon2.params.first;
+if(paramDest && paramDest->kind == 0)
+paramDest = (((void *)0));
+if((dest->__anon1.__anon2.staticMethod || (!dest->__anon1.__anon2.thisClass && !owningClassDest)) && !(source->__anon1.__anon2.staticMethod || (!source->__anon1.__anon2.thisClass && !owningClassSource)))
{
-UInt64Add, UInt64Sub, UInt64Mul, UInt64Div, UInt64Mod, UInt64Neg, UInt64Inc, UInt64Dec, UInt64Asign, UInt64AddAsign, UInt64SubAsign, UInt64MulAsign, UInt64DivAsign, UInt64ModAsign, UInt64BitAnd, UInt64BitOr, UInt64BitXor, UInt64LShift, UInt64RShift, UInt64BitNot, UInt64AndAsign, UInt64OrAsign, UInt64XorAsign, UInt64LShiftAsign, UInt64RShiftAsign, UInt64Not, UInt64Equ, UInt64Nqu, UInt64And, UInt64Or, UInt64Grt, UInt64Sma, UInt64GrtEqu, UInt64SmaEqu, UInt64Cond
-};
-
-struct OpTable shortOps =
+if(!paramDest || (!(paramDest->kind == 13 && paramDest->__anon1.type && paramDest->__anon1.type->kind == 0) && (paramDest->kind != 8 || !__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass ? source->__anon1.__anon2.thisClass->__anon1.registered : owningClassSource, paramDest->__anon1._class->__anon1.registered))))
{
-ShortAdd, ShortSub, ShortMul, ShortDiv, ShortMod, ShortNeg, ShortInc, ShortDec, ShortAsign, ShortAddAsign, ShortSubAsign, ShortMulAsign, ShortDivAsign, ShortModAsign, ShortBitAnd, ShortBitOr, ShortBitXor, ShortLShift, ShortRShift, ShortBitNot, ShortAndAsign, ShortOrAsign, ShortXorAsign, ShortLShiftAsign, ShortRShiftAsign, ShortNot, ShortEqu, ShortNqu, ShortAnd, ShortOr, ShortGrt, ShortSma, ShortGrtEqu, ShortSmaEqu, ShortCond
-};
-
-struct OpTable ushortOps =
+if(paramDest && paramDest->kind == 8)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), paramDest->__anon1._class->string);
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class should not take an object\n", (((void *)0))));
+return 0;
+}
+paramDest = paramDest->next;
+}
+else if(!dest->__anon1.__anon2.staticMethod && (dest->__anon1.__anon2.thisClass || owningClassDest))
{
-UShortAdd, UShortSub, UShortMul, UShortDiv, UShortMod, UShortNeg, UShortInc, UShortDec, UShortAsign, UShortAddAsign, UShortSubAsign, UShortMulAsign, UShortDivAsign, UShortModAsign, UShortBitAnd, UShortBitOr, UShortBitXor, UShortLShift, UShortRShift, UShortBitNot, UShortAndAsign, UShortOrAsign, UShortXorAsign, UShortLShiftAsign, UShortRShiftAsign, UShortNot, UShortEqu, UShortNqu, UShortAnd, UShortOr, UShortGrt, UShortSma, UShortGrtEqu, UShortSmaEqu, UShortCond
-};
-
-struct OpTable floatOps =
+if((source->__anon1.__anon2.staticMethod || (!source->__anon1.__anon2.thisClass && !owningClassSource)))
{
-FloatAdd, FloatSub, FloatMul, FloatDiv, (((void *)0)), FloatNeg, FloatInc, FloatDec, FloatAsign, FloatAddAsign, FloatSubAsign, FloatMulAsign, FloatDivAsign, (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), FloatEqu, FloatNqu, FloatAnd, FloatOr, FloatGrt, FloatSma, FloatGrtEqu, FloatSmaEqu
-};
-
-struct OpTable doubleOps =
+if(dest->__anon1.__anon2.thisClass)
{
-DoubleAdd, DoubleSub, DoubleMul, DoubleDiv, (((void *)0)), DoubleNeg, DoubleInc, DoubleDec, DoubleAsign, DoubleAddAsign, DoubleSubAsign, DoubleMulAsign, DoubleDivAsign, (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), (((void *)0)), DoubleEqu, DoubleNqu, DoubleAnd, DoubleOr, DoubleGrt, DoubleSma, DoubleGrtEqu, DoubleSmaEqu
-};
-
-struct OpTable charOps =
+if(!paramSource || paramSource->kind != 8 || !__ecereNameSpace__ecere__com__eClass_IsDerived(paramSource->__anon1._class->__anon1.registered, dest->__anon1.__anon2.thisClass->__anon1.registered))
{
-CharAdd, CharSub, CharMul, CharDiv, CharMod, CharNeg, CharInc, CharDec, CharAsign, CharAddAsign, CharSubAsign, CharMulAsign, CharDivAsign, CharModAsign, CharBitAnd, CharBitOr, CharBitXor, CharLShift, CharRShift, CharBitNot, CharAndAsign, CharOrAsign, CharXorAsign, CharLShiftAsign, CharRShiftAsign, CharNot, CharEqu, CharNqu, CharAnd, CharOr, CharGrt, CharSma, CharGrtEqu, CharSmaEqu, CharCond
-};
-
-struct OpTable ucharOps =
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), dest->__anon1.__anon2.thisClass->string);
+return 0;
+}
+}
+else
{
-UCharAdd, UCharSub, UCharMul, UCharDiv, UCharMod, UCharNeg, UCharInc, UCharDec, UCharAsign, UCharAddAsign, UCharSubAsign, UCharMulAsign, UCharDivAsign, UCharModAsign, UCharBitAnd, UCharBitOr, UCharBitXor, UCharLShift, UCharRShift, UCharBitNot, UCharAndAsign, UCharOrAsign, UCharXorAsign, UCharLShiftAsign, UCharRShiftAsign, UCharNot, UCharEqu, UCharNqu, UCharAnd, UCharOr, UCharGrt, UCharSma, UCharGrtEqu, UCharSmaEqu, UCharCond
-};
-
-void ReadString(char * output, char * string)
+if(!paramSource || paramSource->kind != 8 || (owningClassDest && !__ecereNameSpace__ecere__com__eClass_IsDerived(paramSource->__anon1._class->__anon1.registered, owningClassDest)))
{
-int len = strlen(string);
-int c, d = 0;
-unsigned int quoted = 0x0, escaped = 0x0;
-
-for(c = 0; c < len; c++)
+if(owningClassDest)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s expected to be derived from method class\n", (((void *)0))), owningClassDest->fullName);
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "overriding class expected to be derived from method class\n", (((void *)0))));
+return 0;
+}
+}
+paramSource = paramSource->next;
+}
+else
{
-char ch = string[c];
-
-if(escaped)
+if(dest->__anon1.__anon2.thisClass)
{
-switch(ch)
+if(!__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass ? source->__anon1.__anon2.thisClass->__anon1.registered : owningClassSource, dest->__anon1.__anon2.thisClass->__anon1.registered))
{
-case 'n':
-output[d] = '\n';
-break;
-case 't':
-output[d] = '\t';
-break;
-case 'a':
-output[d] = '\a';
-break;
-case 'b':
-output[d] = '\b';
-break;
-case 'f':
-output[d] = '\f';
-break;
-case 'r':
-output[d] = '\r';
-break;
-case 'v':
-output[d] = '\v';
-break;
-case '\\':
-output[d] = '\\';
-break;
-case '\"':
-output[d] = '\"';
-break;
-case '\'':
-output[d] = '\'';
-break;
-default:
-output[d] = ch;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), dest->__anon1.__anon2.thisClass->string);
+return 0;
}
-d++;
-escaped = 0x0;
}
else
{
-if(ch == '\"')
-quoted ^= 0x1;
-else if(quoted)
+if(source->__anon1.__anon2.thisClass && source->__anon1.__anon2.thisClass->__anon1.registered && owningClassDest && !__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass->__anon1.registered, owningClassDest))
{
-if(ch == '\\')
-escaped = 0x1;
-else
-output[d++] = ch;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s expected to be derived from method class\n", (((void *)0))), source->__anon1.__anon2.thisClass->__anon1.registered->fullName);
+return 0;
}
}
}
-output[d] = '\0';
}
+if(!MatchTypes(source->__anon1.__anon2.returnType, dest->__anon1.__anon2.returnType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst))
+{
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible return type for function\n", (((void *)0))));
+return 0;
+}
+else
+CheckConstCompatibility(dest->__anon1.__anon2.returnType, source->__anon1.__anon2.returnType, 1);
+for(; paramDest; paramDest = paramDest->next)
+{
+if(!paramSource)
+{
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough parameters\n", (((void *)0))));
+return 0;
+}
+{
+struct Type * paramDestType = paramDest;
+struct Type * paramSourceType = paramSource;
+struct Type * type = paramDestType;
-int UnescapeString(char * d, char * s, int len)
+if(paramDest->kind == 20 && paramDest->__anon1.templateParameter->type == 0 && owningClassSource && paramSource->kind != 20)
{
-int j = 0, k = 0;
-char ch;
+int id = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * sClass;
-while(j < len && (ch = s[j]))
+for(sClass = owningClassSource; sClass; sClass = sClass->base)
{
-switch(ch)
+id = 0;
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
{
-case '\\':
-switch((ch = s[++j]))
+if(curParam->type == 0 && !strcmp(type->__anon1.templateParameter->identifier->string, curParam->name))
{
-case 'n':
-d[k] = '\n';
-break;
-case 't':
-d[k] = '\t';
-break;
-case 'a':
-d[k] = '\a';
-break;
-case 'b':
-d[k] = '\b';
-break;
-case 'f':
-d[k] = '\f';
-break;
-case 'r':
-d[k] = '\r';
-break;
-case 'v':
-d[k] = '\v';
-break;
-case '\\':
-d[k] = '\\';
-break;
-case '\"':
-d[k] = '\"';
-break;
-case '\'':
-d[k] = '\'';
-break;
-default:
-d[k] = '\\';
-d[k] = ch;
+for(sClass = sClass->base; sClass; sClass = sClass->base)
+{
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+id += sClass->templateParams.count;
}
break;
-default:
-d[k] = ch;
}
-j++, k++;
+id++;
}
-d[k] = '\0';
-return k;
+if(curParam)
+break;
}
-
-char * OffsetEscapedString(char * s, int len, int offset)
+if(curParam)
{
-char ch;
-int j = 0, k = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = owningClassSource->templateArgs[id];
-while(j < len && k < offset && (ch = s[j]))
-{
-if(ch == '\\')
-++j;
-j++, k++;
+paramDestType = type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0);
}
-return (k == offset) ? s + j : (((void *)0));
}
-
-extern long long __ecereNameSpace__ecere__com___strtoi64(const char * string, const char * * endString, int base);
-
-extern uint64 __ecereNameSpace__ecere__com___strtoui64(const char * string, const char * * endString, int base);
-
-extern double strtod(const char * , char * * );
-
-extern float (* __ecereMethod_float_inf)(void);
-
-extern float (* __ecereMethod_float_nan)(void);
-
-extern double (* __ecereMethod_double_inf)(void);
-
-extern double (* __ecereMethod_double_nan)(void);
-
-struct Operand GetOperand(struct Expression * exp)
-{
-struct Operand op =
-{
-0, 0, 0,
-.__anon1 = {
-.c = 0
-},
+if(!MatchTypes(paramDestType, paramSourceType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst) && (!acceptReversedParams || !MatchTypes(paramSourceType, paramDestType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst)))
{
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-}
-};
-struct Type * type = exp->expType;
+char type[1024];
-if(type)
-{
-while(type->kind == 8 && type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 2 || type->__anon1._class->__anon1.registered->type == 3 || type->__anon1._class->__anon1.registered->type == 4))
-{
-if(!type->__anon1._class->__anon1.registered->dataType)
-type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-type = type->__anon1._class->__anon1.registered->dataType;
+type[0] = 0;
+PrintType(paramDest, type, 0, 1);
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible parameter %s (expected %s)\n", (((void *)0))), paramSource->name, type);
+if(paramDestType != paramDest)
+FreeType(paramDestType);
+return 0;
}
-if(exp->type == 3 && op.kind == 13)
-{
-op.__anon1.ui64 = (uint64)exp->__anon1.__anon2.string;
-op.kind = 13;
-op.ops = uint64Ops;
+if(paramDestType != paramDest)
+FreeType(paramDestType);
}
-else if(exp->isConstant && exp->type == 2)
+paramSource = paramSource->next;
+}
+if(paramSource)
{
-op.kind = type->kind;
-op.type = exp->expType;
-switch(op.kind)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many parameters\n", (((void *)0))));
+return 0;
+}
+return 1;
+}
+else if((dest->kind == 11 || (dest->kind == 13 && dest->__anon1.type->kind == 11) || dest->kind == 16) && (source->kind == 13 && source->__anon1.type->kind == 0))
{
-case 24:
-case 1:
+return 1;
+}
+else if((dest->kind == 13 || dest->kind == 12) && (source->kind == 12 || source->kind == 13))
{
-if(exp->__anon1.__anon1.constant[0] == '\'')
+if(!(dest->__anon1.type && dest->__anon1.type->kind == 13 && source->__anon1.type->kind == 8 && source->__anon1.type->__anon1._class && source->__anon1.type->__anon1._class->__anon1.registered && (source->__anon1.type->__anon1._class->__anon1.registered->type != 0 && source->__anon1.type->__anon1._class->__anon1.registered->type != 5) && !source->__anon1.type->byReference))
{
-op.__anon1.c = exp->__anon1.__anon1.constant[1];
-op.ops = charOps;
+ComputeTypeSize(source->__anon1.type);
+ComputeTypeSize(dest->__anon1.type);
+if(source->__anon1.type->size == dest->__anon1.type->size && MatchTypes(source->__anon1.type, dest->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst))
+return 1;
}
-else if(type->isSigned)
-{
-op.__anon1.c = (char)strtol(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = charOps;
}
-else
-{
-op.__anon1.uc = (unsigned char)strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = ucharOps;
}
-break;
+return 0;
}
-case 2:
-if(type->isSigned)
+
+void ComputeInstantiation(struct Expression * exp)
{
-op.__anon1.s = (short)strtol(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = shortOps;
-}
-else
+struct Instantiation * inst = exp->__anon1.instance;
+struct MembersInit * members;
+struct Symbol * classSym = inst->_class ? inst->_class->__anon1.__anon1.symbol : (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * _class = classSym ? classSym->__anon1.registered : (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256];
+int subMemberStackPos = 0;
+uint64 bits = 0;
+
+if(_class && (_class->type == 1 || _class->type == 0 || _class->type == 5))
{
-op.__anon1.us = (unsigned short)strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = ushortOps;
-}
-break;
-case 3:
-case 5:
-if(type->isSigned)
+if(inst->data)
+return ;
+if(_class->type == 0 || _class->type == 5)
{
-op.__anon1.i = strtol(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = intOps;
+inst->data = (unsigned char *)__ecereNameSpace__ecere__com__eInstance_New(_class);
+if(_class->type == 0)
+((struct __ecereNameSpace__ecere__com__Instance *)(char *)((struct __ecereNameSpace__ecere__com__Instance *)inst->data))->_refCount++;
}
else
-{
-op.__anon1.ui = strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = uintOps;
+inst->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
}
-op.kind = 3;
-break;
-case 4:
-if(type->isSigned)
+if(inst->members)
{
-op.__anon1.i64 = __ecereNameSpace__ecere__com___strtoi64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = int64Ops;
-}
-else
+for(members = (*inst->members).first; members; members = members->next)
{
-op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = uint64Ops;
-}
-op.kind = 4;
-break;
-case 22:
-if(type->isSigned)
+switch(members->type)
{
-op.__anon1.i64 = __ecereNameSpace__ecere__com___strtoi64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = int64Ops;
-}
-else
+case 0:
{
-op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = uint64Ops;
-}
-op.kind = 4;
-break;
-case 23:
-if(type->isSigned)
+if(members->__anon1.dataMembers)
{
-op.__anon1.i64 = __ecereNameSpace__ecere__com___strtoi64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = int64Ops;
+struct MemberInit * member;
+
+for(member = (*members->__anon1.dataMembers).first; member; member = member->next)
+{
+struct Identifier * ident = member->identifiers ? (*member->identifiers).first : (((void *)0));
+unsigned int found = 0;
+struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0));
+unsigned int dataMemberOffset;
+
+if(!ident)
+{
+__ecereNameSpace__ecere__com__eClass_FindNextMember(_class, &curClass, &curMember, subMemberStack, &subMemberStackPos);
+if(curMember)
+{
+if(curMember->isProperty)
+prop = (struct __ecereNameSpace__ecere__com__Property *)curMember;
+else
+{
+dataMember = curMember;
+__ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, dataMember->name, &dataMemberOffset, privateModule, (((void *)0)), (((void *)0)));
+if(_class->type == 0)
+dataMemberOffset += _class->base->structSize;
+}
+found = 1;
+}
}
else
{
-op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.ops = uint64Ops;
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, ident->string, privateModule);
+if(prop)
+{
+found = 1;
+if(prop->memberAccess == 1)
+{
+curMember = (struct __ecereNameSpace__ecere__com__DataMember *)prop;
+curClass = prop->_class;
}
-op.kind = 4;
-break;
-case 6:
-if(!strcmp(exp->__anon1.__anon1.constant, "inf"))
-op.__anon1.f = __ecereMethod_float_inf();
-else if(!strcmp(exp->__anon1.__anon1.constant, "-inf"))
-op.__anon1.f = -__ecereMethod_float_inf();
-else if(!strcmp(exp->__anon1.__anon1.constant, "nan"))
-op.__anon1.f = __ecereMethod_float_nan();
-else if(!strcmp(exp->__anon1.__anon1.constant, "-nan"))
-op.__anon1.f = -__ecereMethod_float_nan();
-else
-op.__anon1.f = (float)strtod(exp->__anon1.__anon1.constant, (((void *)0)));
-op.ops = floatOps;
-break;
-case 7:
-if(!strcmp(exp->__anon1.__anon1.constant, "inf"))
-op.__anon1.d = __ecereMethod_double_inf();
-else if(!strcmp(exp->__anon1.__anon1.constant, "-inf"))
-op.__anon1.d = -__ecereMethod_double_inf();
-else if(!strcmp(exp->__anon1.__anon1.constant, "nan"))
-op.__anon1.d = __ecereMethod_double_nan();
-else if(!strcmp(exp->__anon1.__anon1.constant, "-nan"))
-op.__anon1.d = -__ecereMethod_double_nan();
-else
-op.__anon1.d = (double)strtod(exp->__anon1.__anon1.constant, (((void *)0)));
-op.ops = doubleOps;
-break;
-case 12:
-case 13:
-case 8:
-op.__anon1.ui64 = __ecereNameSpace__ecere__com___strtoui64(exp->__anon1.__anon1.constant, (((void *)0)), 0);
-op.kind = 13;
-op.ops = uint64Ops;
-break;
}
+else
+{
+struct __ecereNameSpace__ecere__com__DataMember * _subMemberStack[256];
+int _subMemberStackPos = 0;
+
+dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, ident->string, &dataMemberOffset, privateModule, _subMemberStack, &_subMemberStackPos);
+if(dataMember)
+{
+found = 1;
+if(dataMember->memberAccess == 1)
+{
+curMember = dataMember;
+curClass = dataMember->_class;
+memcpy(subMemberStack, _subMemberStack, sizeof(struct __ecereNameSpace__ecere__com__DataMember *) * _subMemberStackPos);
+subMemberStackPos = _subMemberStackPos;
}
}
-return op;
}
-
-int __ecereVMethodID_class_OnGetString;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_int;
-
-static __attribute__((unused)) void UnusedFunction()
-{
-int a;
-
-((const char * (*)(struct __ecereNameSpace__ecere__com__Class *, const void *, char * tempString, void * fieldData, unsigned int * needClass))__ecereClass_int->_vTbl[__ecereVMethodID_class_OnGetString])(__ecereClass_int, &a, 0, 0, 0);
}
-
-extern int __ecereVMethodID_class_OnGetString;
-
-static void PopulateInstanceProcessMember(struct Instantiation * inst, struct __ecereNameSpace__ecere__sys__OldList * memberList, struct __ecereNameSpace__ecere__com__DataMember * parentDataMember, unsigned int offset)
+if(found && member->initializer && member->initializer->type == 0)
{
-struct __ecereNameSpace__ecere__com__DataMember * dataMember;
+struct Expression * value = member->initializer->__anon1.exp;
+struct Type * type = (((void *)0));
+unsigned int deepMember = 0;
-for(dataMember = parentDataMember->members.first; dataMember; dataMember = dataMember->next)
+if(prop)
{
-if(!dataMember->name && (dataMember->type == 2 || dataMember->type == 1))
-PopulateInstanceProcessMember(inst, memberList, dataMember, offset + dataMember->offset);
-else
+type = prop->dataType;
+}
+else if(dataMember)
{
-struct Expression * exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-struct MemberInit * member = MkMemberInit(MkListOne(MkIdentifier(dataMember->name)), MkInitializerAssignment(exp));
-struct Type * type;
-void * ptr = inst->data + dataMember->offset + offset;
-char * result = (((void *)0));
-
-exp->loc = member->loc = inst->loc;
-((struct Identifier *)(*member->identifiers).first)->loc = inst->loc;
if(!dataMember->dataType)
-dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0);
+dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0);
type = dataMember->dataType;
+}
+if(ident && ident->next)
+{
+deepMember = 1;
+for(ident = ident->next; ident && type; ident = ident->next)
+{
if(type->kind == 8)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class->type == 4)
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(type->__anon1._class->__anon1.registered, ident->string, privateModule);
+if(prop)
+type = prop->dataType;
+else
{
-struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-
-if(enumClass)
+dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(type->__anon1._class->__anon1.registered, ident->string, &dataMemberOffset, privateModule, (((void *)0)), (((void *)0)));
+if(dataMember)
+type = dataMember->dataType;
+}
+}
+else if(type->kind == 9 || type->kind == 10)
{
-struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
-struct __ecereNameSpace__ecere__sys__NamedLink * item;
+struct Type * memberType;
-for(item = e->values.first; item; item = item->next)
+for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
{
-if((int)item->data == *(int *)ptr)
+if(!strcmp(memberType->name, ident->string))
{
-result = item->name;
+type = memberType;
break;
}
}
-if(result)
-{
-exp->__anon1.__anon1.identifier = MkIdentifier(result);
-exp->type = 0;
-exp->destType = MkClassType(_class->fullName);
-ProcessExpressionType(exp);
}
}
}
-if(_class->type == 4 || _class->type == 3 || _class->type == 2)
+if(value)
+{
+FreeType(value->destType);
+value->destType = type;
+if(type)
+type->refCount++;
+ComputeExpression(value);
+}
+if(!deepMember && type && value && (_class->type == 1 || _class->type == 0 || _class->type == 5))
+{
+if(type->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+
+if(_class && (_class->type == 2 || _class->type == 3 || _class->type == 4))
{
if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
type = _class->dataType;
}
}
-if(!result)
+if(dataMember)
+{
+void * ptr = inst->data + dataMemberOffset;
+
+if(value->type == 2)
{
switch(type->kind)
{
-case 6:
+case 3:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintFloat(*(float *)ptr);
-exp->type = 2;
+GetInt(value, (int *)ptr);
break;
}
-case 7:
+case 4:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintDouble(*(double *)ptr);
-exp->type = 2;
+GetInt64(value, (long long *)ptr);
break;
}
-case 3:
+case 22:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt(*(int *)ptr);
-exp->type = 2;
+GetIntPtr(value, (intptr_t *)ptr);
break;
}
-case 4:
+case 23:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt64(*(long long *)ptr);
-exp->type = 2;
+GetIntSize(value, (ssize_t *)ptr);
break;
}
-case 22:
+case 6:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt64((long long)*(intptr_t *)ptr);
-exp->type = 2;
+GetFloat(value, (float *)ptr);
break;
}
-case 23:
+case 7:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt64((long long)*(intptr_t *)ptr);
-exp->type = 2;
+GetDouble(value, (double *)ptr);
break;
}
-default:
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Unhandled type populating instance\n", (((void *)0))));
}
}
-ListAdd(memberList, member);
+else if(value->type == 1)
+{
+if(type->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+
+if(_class->type == 1)
+{
+ComputeTypeSize(type);
+if(value->__anon1.instance->data)
+memcpy(ptr, value->__anon1.instance->data, type->size);
}
-if(parentDataMember->type == 1)
-break;
}
}
+}
+else if(prop && prop->Set != (void *)(intptr_t)1)
+{
+if(value->type == 1 && value->__anon1.instance->data)
+{
+if(type->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-extern struct MembersInit * MkMembersInitList(struct __ecereNameSpace__ecere__sys__OldList * dataMembers);
-
-void PopulateInstance(struct Instantiation * inst)
+if(_class && (_class->type != 0 || __ecereNameSpace__ecere__com__eClass_IsDerived(((struct __ecereNameSpace__ecere__com__Instance *)(char *)((struct __ecereNameSpace__ecere__com__Instance *)value->__anon1.instance->data))->_class, _class)))
{
-struct Symbol * classSym = inst->_class->__anon1.__anon1.symbol;
-struct __ecereNameSpace__ecere__com__Class * _class = classSym->__anon1.registered;
-struct __ecereNameSpace__ecere__com__DataMember * dataMember;
-struct __ecereNameSpace__ecere__sys__OldList * memberList = MkList();
+void (* Set)(void *, void *) = (void *)prop->Set;
-if(!inst->members)
-inst->members = MkListOne(MkMembersInitList(memberList));
-else
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*inst->members), MkMembersInitList(memberList));
-for(dataMember = _class->membersAndProperties.first; dataMember; dataMember = dataMember->next)
+Set(inst->data, value->__anon1.instance->data);
+PopulateInstance(inst);
+}
+}
+}
+else if(value->type == 2)
{
-if(!dataMember->isProperty)
+switch(type->kind)
{
-if(!dataMember->name && (dataMember->type == 2 || dataMember->type == 1))
-PopulateInstanceProcessMember(inst, memberList, dataMember, dataMember->offset);
-else
+case 7:
{
-struct Expression * exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-struct MemberInit * member = MkMemberInit(MkListOne(MkIdentifier(dataMember->name)), MkInitializerAssignment(exp));
-struct Type * type;
-void * ptr = inst->data + dataMember->offset;
-char * result = (((void *)0));
+void (* Set)(void *, double) = (void *)prop->Set;
-exp->loc = member->loc = inst->loc;
-((struct Identifier *)(*member->identifiers).first)->loc = inst->loc;
-if(!dataMember->dataType)
-dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0);
-type = dataMember->dataType;
-if(type->kind == 8)
+Set(inst->data, strtod(value->__anon1.__anon1.constant, (((void *)0))));
+break;
+}
+case 6:
+{
+void (* Set)(void *, float) = (void *)prop->Set;
+
+Set(inst->data, (float)(strtod(value->__anon1.__anon1.constant, (((void *)0)))));
+break;
+}
+case 3:
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+void (* Set)(void *, int) = (void *)prop->Set;
-if(_class->type == 4)
+Set(inst->data, strtol(value->__anon1.__anon1.constant, (((void *)0)), 0));
+break;
+}
+case 4:
{
-struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
+void (* Set)(void *, long long) = (void *)prop->Set;
-if(enumClass)
+Set(inst->data, __ecereNameSpace__ecere__com___strtoi64(value->__anon1.__anon1.constant, (((void *)0)), 0));
+break;
+}
+case 22:
{
-struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
-struct __ecereNameSpace__ecere__sys__NamedLink * item;
+void (* Set)(void *, intptr_t) = (void *)prop->Set;
-for(item = e->values.first; item; item = item->next)
-{
-if((int)item->data == *(int *)ptr)
+Set(inst->data, (intptr_t)__ecereNameSpace__ecere__com___strtoi64(value->__anon1.__anon1.constant, (((void *)0)), 0));
+break;
+}
+case 23:
{
-result = item->name;
+void (* Set)(void *, ssize_t) = (void *)prop->Set;
+
+Set(inst->data, (ssize_t)__ecereNameSpace__ecere__com___strtoi64(value->__anon1.__anon1.constant, (((void *)0)), 0));
break;
}
}
}
-if(result)
+else if(value->type == 3)
{
-exp->__anon1.__anon1.identifier = MkIdentifier(result);
-exp->type = 0;
-exp->destType = MkClassType(_class->fullName);
-ProcessExpressionType(exp);
+char temp[1024];
+
+ReadString(temp, value->__anon1.__anon2.string);
+((void (*)(void *, void *))(void *)prop->Set)(inst->data, temp);
}
}
-if(_class->type == 4 || _class->type == 3 || _class->type == 2)
+}
+else if(!deepMember && type && _class->type == 3)
+{
+if(prop)
+{
+if(value->type == 2)
+{
+if(type->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+
+if(_class->type == 3)
{
if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
type = _class->dataType;
}
}
-if(!result)
-{
switch(type->kind)
{
case 6:
{
-exp->__anon1.__anon1.constant = PrintFloat(*(float *)ptr);
+float fValue;
+float (* Set)(float) = (void *)prop->Set;
+
+GetFloat(member->initializer->__anon1.exp, &fValue);
+exp->__anon1.__anon1.constant = PrintFloat(Set(fValue));
exp->type = 2;
break;
}
case 7:
{
-exp->__anon1.__anon1.constant = PrintDouble(*(double *)ptr);
-exp->type = 2;
-break;
-}
-case 3:
-{
-exp->__anon1.__anon1.constant = PrintInt(*(int *)ptr);
-exp->type = 2;
-break;
-}
-case 4:
-{
-exp->__anon1.__anon1.constant = PrintInt64(*(long long *)ptr);
-exp->type = 2;
-break;
-}
-case 22:
-{
-exp->__anon1.__anon1.constant = PrintInt64((long long)*(intptr_t *)ptr);
+double dValue;
+double (* Set)(double) = (void *)prop->Set;
+
+GetDouble(member->initializer->__anon1.exp, &dValue);
+exp->__anon1.__anon1.constant = PrintDouble(Set(dValue));
exp->type = 2;
break;
}
-default:
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Unhandled type populating instance\n", (((void *)0))));
-}
-}
-ListAdd(memberList, member);
}
}
}
}
-
-extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, unsigned int * offset, struct __ecereNameSpace__ecere__com__Instance * module, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos);
-
-extern void FreeInstance(struct Instantiation * inst);
-
-void ComputeInstantiation(struct Expression * exp)
+else if(!deepMember && type && _class->type == 2)
{
-struct Instantiation * inst = exp->__anon1.instance;
-struct MembersInit * members;
-struct Symbol * classSym = inst->_class ? inst->_class->__anon1.__anon1.symbol : (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * _class = classSym ? classSym->__anon1.registered : (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256];
-int subMemberStackPos = 0;
-uint64 bits = 0;
-
-if(_class && (_class->type == 1 || _class->type == 0 || _class->type == 5))
+if(prop)
{
-if(inst->data)
-return ;
-if(_class->type == 0 || _class->type == 5)
+if(value->type == 1 && value->__anon1.instance->data)
{
-inst->data = (unsigned char *)__ecereNameSpace__ecere__com__eInstance_New(_class);
-if(_class->type == 0)
-((struct __ecereNameSpace__ecere__com__Instance *)(char *)((struct __ecereNameSpace__ecere__com__Instance *)inst->data))->_refCount++;
+unsigned int (* Set)(void *) = (void *)prop->Set;
+
+bits = Set(value->__anon1.instance->data);
}
-else
-inst->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+else if(value->type == 2)
+{
}
-if(inst->members)
+}
+else if(dataMember)
{
-for(members = (*inst->members).first; members; members = members->next)
+struct __ecereNameSpace__ecere__com__BitMember * bitMember = (struct __ecereNameSpace__ecere__com__BitMember *)dataMember;
+struct Type * type;
+uint64 part = 0;
+
+bits = (bits & ~bitMember->mask);
+if(!bitMember->dataType)
+bitMember->dataType = ProcessTypeString(bitMember->dataTypeString, 0);
+type = bitMember->dataType;
+if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
{
-switch(members->type)
+if(!type->__anon1._class->__anon1.registered->dataType)
+type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0);
+type = type->__anon1._class->__anon1.registered->dataType;
+}
+switch(type->kind)
{
-case 0:
+case 24:
+case 1:
{
-if(members->__anon1.dataMembers)
+unsigned char v;
+
+type->isSigned ? GetChar(value, (char *)&v) : GetUChar(value, &v);
+part = (uint64)v;
+break;
+}
+case 2:
{
-struct MemberInit * member;
+unsigned short v;
-for(member = (*members->__anon1.dataMembers).first; member; member = member->next)
+type->isSigned ? GetShort(value, (short *)&v) : GetUShort(value, &v);
+part = (uint64)v;
+break;
+}
+case 3:
+case 5:
{
-struct Identifier * ident = member->identifiers ? (*member->identifiers).first : (((void *)0));
-unsigned int found = 0x0;
-struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0));
-unsigned int dataMemberOffset;
+unsigned int v;
-if(!ident)
+type->isSigned ? GetInt(value, (int *)&v) : GetUInt(value, &v);
+part = (uint64)v;
+break;
+}
+case 4:
{
-__ecereNameSpace__ecere__com__eClass_FindNextMember(_class, &curClass, &curMember, subMemberStack, &subMemberStackPos);
-if(curMember)
+uint64 v;
+
+type->isSigned ? GetInt64(value, (long long *)&v) : GetUInt64(value, &v);
+part = v;
+break;
+}
+case 22:
{
-if(curMember->isProperty)
-prop = (struct __ecereNameSpace__ecere__com__Property *)curMember;
-else
+uintptr_t v;
+
+type->isSigned ? GetIntPtr(value, (intptr_t *)&v) : GetUIntPtr(value, &v);
+part = (uint64)v;
+break;
+}
+case 23:
{
-dataMember = curMember;
-__ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, dataMember->name, &dataMemberOffset, privateModule, (((void *)0)), (((void *)0)));
-if(_class->type == 0)
-dataMemberOffset += _class->base->structSize;
+size_t v;
+
+type->isSigned ? GetIntSize(value, (ssize_t *)&v) : GetUIntSize(value, &v);
+part = (uint64)v;
+break;
}
-found = 0x1;
}
+bits |= part << bitMember->pos;
}
-else
-{
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, ident->string, privateModule);
-if(prop)
-{
-found = 0x1;
-if(prop->memberAccess == 1)
-{
-curMember = (struct __ecereNameSpace__ecere__com__DataMember *)prop;
-curClass = prop->_class;
}
}
else
{
-struct __ecereNameSpace__ecere__com__DataMember * _subMemberStack[256];
-int _subMemberStackPos = 0;
-
-dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, ident->string, &dataMemberOffset, privateModule, _subMemberStack, &_subMemberStackPos);
-if(dataMember)
-{
-found = 0x1;
-if(dataMember->memberAccess == 1)
+if(_class && _class->type == 3)
{
-curMember = dataMember;
-curClass = dataMember->_class;
-memcpy(subMemberStack, _subMemberStack, sizeof(struct __ecereNameSpace__ecere__com__DataMember *) * _subMemberStackPos);
-subMemberStackPos = _subMemberStackPos;
+ComputeExpression(member->initializer->__anon1.exp);
+exp->__anon1.__anon1.constant = member->initializer->__anon1.exp->__anon1.__anon1.constant;
+exp->type = 2;
+member->initializer->__anon1.exp->__anon1.__anon1.constant = (((void *)0));
}
}
}
}
-if(found && member->initializer && member->initializer->type == 0)
-{
-struct Expression * value = member->initializer->__anon1.exp;
-struct Type * type = (((void *)0));
-unsigned int deepMember = 0x0;
-
-if(prop)
-{
-type = prop->dataType;
+break;
}
-else if(dataMember)
+}
+}
+}
+if(_class && _class->type == 2)
{
-if(!dataMember->dataType)
-dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0);
-type = dataMember->dataType;
+exp->__anon1.__anon1.constant = PrintHexUInt(bits);
+exp->type = 2;
}
-if(ident && ident->next)
+if(exp->type != 1)
{
-deepMember = 0x1;
-for(ident = ident->next; ident && type; ident = ident->next)
+FreeInstance(inst);
+}
+}
+
+void CallOperator(struct Expression * exp, struct Expression * exp1, struct Expression * exp2, struct Operand * op1, struct Operand * op2)
{
-if(type->kind == 8)
+if(exp->__anon1.op.op == SIZEOF)
{
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(type->__anon1._class->__anon1.registered, ident->string, privateModule);
-if(prop)
-type = prop->dataType;
+FreeExpContents(exp);
+exp->type = 2;
+exp->__anon1.__anon1.constant = PrintUInt(ComputeTypeSize(op1->type));
+}
else
{
-dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(type->__anon1._class->__anon1.registered, ident->string, &dataMemberOffset, privateModule, (((void *)0)), (((void *)0)));
-if(dataMember)
-type = dataMember->dataType;
-}
-}
-else if(type->kind == 9 || type->kind == 10)
+if(!exp->__anon1.op.exp1)
{
-struct Type * memberType;
-
-for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
+switch(exp->__anon1.op.op)
{
-if(!strcmp(memberType->name, ident->string))
+case '+':
{
-type = memberType;
+struct Expression * exp2 = exp->__anon1.op.exp2;
+
+exp->__anon1.op.exp2 = (((void *)0));
+FreeExpContents(exp);
+FreeType(exp->expType);
+FreeType(exp->destType);
+*exp = *exp2;
+((exp2 ? __extension__ ({
+void * __ecerePtrToDelete = (exp2);
+
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), exp2 = 0);
break;
}
+case '-':
+if(op1->ops.Neg)
+{
+FreeExpContents(exp);
+op1->ops.Neg(exp, op1);
}
+break;
+case '~':
+if(op1->ops.BitNot)
+{
+FreeExpContents(exp);
+op1->ops.BitNot(exp, op1);
}
+break;
+case '!':
+if(op1->ops.Not)
+{
+FreeExpContents(exp);
+op1->ops.Not(exp, op1);
}
+break;
}
-if(value)
-{
-FreeType(value->destType);
-value->destType = type;
-if(type)
-type->refCount++;
-ComputeExpression(value);
}
-if(!deepMember && type && value && (_class->type == 1 || _class->type == 0 || _class->type == 5))
-{
-if(type->kind == 8)
+else
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class->type == 2 || _class->type == 3 || _class->type == 4)
+if(op1 && op2 && op1->type && op2->type && op1->kind != op2->kind)
{
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-type = _class->dataType;
-}
+if(Promote(op2, op1->kind, op1->type->isSigned))
+op2->kind = op1->kind, op2->ops = op1->ops;
+else if(Promote(op1, op2->kind, op2->type->isSigned))
+op1->kind = op2->kind, op1->ops = op2->ops;
}
-if(dataMember)
-{
-void * ptr = inst->data + dataMemberOffset;
-
-if(value->type == 2)
+switch(exp->__anon1.op.op)
{
-switch(type->kind)
+case '+':
+if(op1->ops.Add)
{
-case 3:
+FreeExpContents(exp);
+op1->ops.Add(exp, op1, op2);
+}
+break;
+case '-':
+if(op1->ops.Sub)
{
-GetInt(value, (int *)ptr);
+FreeExpContents(exp);
+op1->ops.Sub(exp, op1, op2);
+}
break;
+case '*':
+if(op1->ops.Mul)
+{
+FreeExpContents(exp);
+op1->ops.Mul(exp, op1, op2);
}
-case 4:
+break;
+case '/':
+if(op1->ops.Div)
{
-GetInt64(value, (long long *)ptr);
+FreeExpContents(exp);
+op1->ops.Div(exp, op1, op2);
+}
break;
+case '%':
+if(op1->ops.Mod)
+{
+FreeExpContents(exp);
+op1->ops.Mod(exp, op1, op2);
}
-case 22:
+break;
+case '&':
+if(exp->__anon1.op.exp2)
{
-GetIntPtr(value, (intptr_t *)ptr);
+if(op1->ops.BitAnd)
+{
+FreeExpContents(exp);
+op1->ops.BitAnd(exp, op1, op2);
+}
+}
break;
+case '|':
+if(op1->ops.BitOr)
+{
+FreeExpContents(exp);
+op1->ops.BitOr(exp, op1, op2);
}
-case 23:
+break;
+case '^':
+if(op1->ops.BitXor)
{
-GetIntSize(value, (ssize_t *)ptr);
+FreeExpContents(exp);
+op1->ops.BitXor(exp, op1, op2);
+}
break;
+case LEFT_OP:
+if(op1->ops.LShift)
+{
+FreeExpContents(exp);
+op1->ops.LShift(exp, op1, op2);
}
-case 6:
+break;
+case RIGHT_OP:
+if(op1->ops.RShift)
{
-GetFloat(value, (float *)ptr);
+FreeExpContents(exp);
+op1->ops.RShift(exp, op1, op2);
+}
break;
+case EQ_OP:
+if(op1->ops.Equ)
+{
+FreeExpContents(exp);
+op1->ops.Equ(exp, op1, op2);
}
-case 7:
+break;
+case NE_OP:
+if(op1->ops.Nqu)
{
-GetDouble(value, (double *)ptr);
+FreeExpContents(exp);
+op1->ops.Nqu(exp, op1, op2);
+}
break;
+case AND_OP:
+if(op1->ops.And)
+{
+FreeExpContents(exp);
+op1->ops.And(exp, op1, op2);
}
+break;
+case OR_OP:
+if(op1->ops.Or)
+{
+FreeExpContents(exp);
+op1->ops.Or(exp, op1, op2);
}
+break;
+case '>':
+if(op1->ops.Grt)
+{
+FreeExpContents(exp);
+op1->ops.Grt(exp, op1, op2);
}
-else if(value->type == 1)
+break;
+case '<':
+if(op1->ops.Sma)
{
-if(type->kind == 8)
+FreeExpContents(exp);
+op1->ops.Sma(exp, op1, op2);
+}
+break;
+case GE_OP:
+if(op1->ops.GrtEqu)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class->type == 1)
+FreeExpContents(exp);
+op1->ops.GrtEqu(exp, op1, op2);
+}
+break;
+case LE_OP:
+if(op1->ops.SmaEqu)
{
-ComputeTypeSize(type);
-if(value->__anon1.instance->data)
-memcpy(ptr, value->__anon1.instance->data, type->size);
+FreeExpContents(exp);
+op1->ops.SmaEqu(exp, op1, op2);
+}
+break;
}
}
}
}
-else if(prop)
+
+void ApplyAnyObjectLogic(struct Expression * e)
{
-if(value->type == 1 && value->__anon1.instance->data)
+struct Type * destType = e->destType;
+
+if(destType && (destType->classObjectType == 3))
{
-if(type->kind == 8)
+if(e && e->expType)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+struct Type * type = e->expType;
+struct __ecereNameSpace__ecere__com__Class * _class = (((void *)0));
-if(_class && (_class->type != 0 || __ecereNameSpace__ecere__com__eClass_IsDerived(((struct __ecereNameSpace__ecere__com__Instance *)(char *)((struct __ecereNameSpace__ecere__com__Instance *)value->__anon1.instance->data))->_class, _class)))
+if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
{
-void (* Set)(void *, void *) = (void *)prop->Set;
-
-Set(inst->data, value->__anon1.instance->data);
-PopulateInstance(inst);
-}
+_class = type->__anon1._class->__anon1.registered;
}
+else if(type->kind == 19)
+{
+_class = FindClass("ecere::com::Class")->__anon1.registered;
}
-else if(value->type == 2)
+else
{
-switch(type->kind)
+char string[1024] = "";
+struct Symbol * classSym;
+
+PrintTypeNoConst(type, string, 0, 1);
+classSym = FindClass(string);
+if(classSym)
+_class = classSym->__anon1.registered;
+}
+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 != 8 || !type->__anon1._class || !type->__anon1._class->__anon1.registered || type->__anon1._class->__anon1.registered->type == 1))) || destType->byReference)))
{
-case 7:
+if(!_class || strcmp(_class->fullName, "char *"))
{
-void (* Set)(void *, double) = (void *)prop->Set;
+struct Expression * checkedExp = e, * newExp;
-Set(inst->data, strtod(value->__anon1.__anon1.constant, (((void *)0))));
-break;
+while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->__anon1.list) || checkedExp->type == 11)
+{
+if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
+{
+if(checkedExp->type == 23)
+{
+checkedExp = (*((struct Statement *)(*checkedExp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
}
-case 6:
+else
+checkedExp = (*checkedExp->__anon1.list).last;
+}
+else if(checkedExp->type == 11)
+checkedExp = checkedExp->__anon1.cast.exp;
+}
+if(checkedExp && checkedExp->type == 4 && checkedExp->__anon1.op.op == '*' && !checkedExp->__anon1.op.exp1)
{
-void (* Set)(void *, float) = (void *)prop->Set;
+newExp = checkedExp->__anon1.op.exp2;
+checkedExp->__anon1.op.exp2 = (((void *)0));
+FreeExpContents(checkedExp);
+if(e->expType && e->expType->passAsTemplate)
+{
+char size[100];
-Set(inst->data, (float)(strtod(value->__anon1.__anon1.constant, (((void *)0)))));
-break;
+ComputeTypeSize(e->expType);
+sprintf(size, "%d", e->expType->size);
+newExp = MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), newExp), '+', MkExpCall(MkExpIdentifier(MkIdentifier("__ENDIAN_PAD")), MkListOne(MkExpConstant(size))))));
}
-case 3:
+ReplaceExpContents(checkedExp, newExp);
+e->byReference = 1;
+}
+else if(!e->byReference || (_class && _class->type == 5))
{
-void (* Set)(void *, int) = (void *)prop->Set;
+struct Expression * checkedExp;
-Set(inst->data, strtol(value->__anon1.__anon1.constant, (((void *)0)), 0));
-break;
-}
-case 4:
{
-void (* Set)(void *, long long) = (void *)prop->Set;
+unsigned int hasAddress = e->type == 0 || (e->type == 8 && e->__anon1.member.memberType == 3) || (e->type == 9 && e->__anon1.member.memberType == 3) || (e->type == 4 && !e->__anon1.op.exp1 && e->__anon1.op.op == '*') || e->type == 6;
-Set(inst->data, __ecereNameSpace__ecere__com___strtoi64(value->__anon1.__anon1.constant, (((void *)0)), 0));
-break;
-}
-case 22:
+if(_class && _class->type != 5 && _class->type != 0 && _class->type != 1 && !hasAddress)
{
-void (* Set)(void *, intptr_t) = (void *)prop->Set;
+struct Context * context = PushContext();
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+char typeString[1024];
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-Set(inst->data, (intptr_t)__ecereNameSpace__ecere__com___strtoi64(value->__anon1.__anon1.constant, (((void *)0)), 0));
-break;
-}
-case 23:
+typeString[0] = '\0';
+*newExp = *e;
+newExp->prev = (((void *)0));
+newExp->next = (((void *)0));
+newExp->expType = (((void *)0));
+PrintTypeNoConst(e->expType, typeString, 0, 1);
+decl = SpecDeclFromString(typeString, specs, (((void *)0)));
+newExp->destType = ProcessType(specs, decl);
+curContext = context;
+if(curCompound)
{
-void (* Set)(void *, ssize_t) = (void *)prop->Set;
+char name[100];
+struct __ecereNameSpace__ecere__sys__OldList * stmts = MkList();
-Set(inst->data, (ssize_t)__ecereNameSpace__ecere__com___strtoi64(value->__anon1.__anon1.constant, (((void *)0)), 0));
-break;
-}
-}
+e->type = 23;
+sprintf(name, "__internalValue%03X", internalValueCounter++);
+if(!curCompound->__anon1.compound.declarations)
+curCompound->__anon1.compound.declarations = MkList();
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*curCompound->__anon1.compound.declarations), (((void *)0)), MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(name)), (((void *)0))))));
+ListAdd(stmts, MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier(name)), '=', newExp))));
+ListAdd(stmts, MkExpressionStmt(MkListOne(MkExpIdentifier(MkIdentifier(name)))));
+e->__anon1.compound = MkCompoundStmt((((void *)0)), stmts);
}
-else if(value->type == 3)
+else
+printf("libec: compiler error, curCompound is null in ApplyAnyObjectLogic\n");
{
-char temp[1024];
+struct Type * type = e->destType;
-ReadString(temp, value->__anon1.__anon2.string);
-((void (*)(void *, void *))(void *)prop->Set)(inst->data, temp);
+e->destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(e->destType, type);
+e->destType->refCount = 1;
+e->destType->classObjectType = 0;
+FreeType(type);
}
+e->__anon1.compound->__anon1.compound.context = context;
+PopContext(context);
+curContext = context->parent;
}
}
-else if(!deepMember && type && _class->type == 3)
-{
-if(prop)
-{
-if(value->type == 2)
+checkedExp = e;
+while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->__anon1.list) || checkedExp->type == 11)
{
-if(type->kind == 8)
+if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class->type == 3)
+if(checkedExp->type == 23)
{
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-type = _class->dataType;
+checkedExp = (*((struct Statement *)(*checkedExp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
}
+else
+checkedExp = (*checkedExp->__anon1.list).last;
}
-switch(type->kind)
-{
-case 6:
-{
-float fValue;
-float (* Set)(float) = (void *)prop->Set;
-
-GetFloat(member->initializer->__anon1.exp, &fValue);
-exp->__anon1.__anon1.constant = PrintFloat(Set(fValue));
-exp->type = 2;
-break;
+else if(checkedExp->type == 11)
+checkedExp = checkedExp->__anon1.cast.exp;
}
-case 7:
{
-double dValue;
-double (* Set)(double) = (void *)prop->Set;
+struct Expression * operand = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-GetDouble(member->initializer->__anon1.exp, &dValue);
-exp->__anon1.__anon1.constant = PrintDouble(Set(dValue));
-exp->type = 2;
-break;
+*operand = *checkedExp;
+__ecereMethod_Expression_Clear(checkedExp);
+checkedExp->destType = ProcessTypeString("void *", 0);
+checkedExp->expType = checkedExp->destType;
+checkedExp->destType->refCount++;
+checkedExp->type = 4;
+checkedExp->__anon1.op.op = '&';
+checkedExp->__anon1.op.exp1 = (((void *)0));
+checkedExp->__anon1.op.exp2 = operand;
}
}
}
}
}
-else if(!deepMember && type && _class->type == 2)
-{
-if(prop)
-{
-if(value->type == 1 && value->__anon1.instance->data)
-{
-unsigned int (* Set)(void *) = (void *)prop->Set;
-
-bits = Set(value->__anon1.instance->data);
}
-else if(value->type == 2)
{
}
-}
-else if(dataMember)
+if((!destType || destType->kind == 14 || destType->kind == 0) && e->expType && (e->expType->classObjectType == 3 || e->expType->classObjectType == 2) && (e->expType->byReference || (e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && (e->expType->__anon1._class->__anon1.registered->type == 2 || e->expType->__anon1._class->__anon1.registered->type == 4 || e->expType->__anon1._class->__anon1.registered->type == 3))))
{
-struct __ecereNameSpace__ecere__com__BitMember * bitMember = (struct __ecereNameSpace__ecere__com__BitMember *)dataMember;
-struct Type * type;
-uint64 part;
-
-bits = (bits & ~bitMember->mask);
-if(!bitMember->dataType)
-bitMember->dataType = ProcessTypeString(bitMember->dataTypeString, 0x0);
-type = bitMember->dataType;
-if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
+if(e->expType->classObjectType && destType && destType->classObjectType)
{
-if(!type->__anon1._class->__anon1.registered->dataType)
-type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-type = type->__anon1._class->__anon1.registered->dataType;
+return ;
}
-switch(type->kind)
-{
-case 24:
-case 1:
+else
{
-unsigned char v;
+struct Expression * thisExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-type->isSigned ? GetChar(value, (char *)&v) : GetUChar(value, &v);
-part = (uint64)v;
-break;
-}
-case 2:
+*thisExp = *e;
+thisExp->prev = (((void *)0));
+thisExp->next = (((void *)0));
+__ecereMethod_Expression_Clear(e);
+e->type = 5;
+e->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', thisExp->type == 0 ? thisExp : MkExpBrackets(MkListOne(thisExp))));
+if(thisExp->expType->kind == 8 && thisExp->expType->__anon1._class && thisExp->expType->__anon1._class->__anon1.registered && thisExp->expType->__anon1._class->__anon1.registered->type == 5)
+((struct Expression *)(*e->__anon1.list).first)->byReference = 1;
{
-unsigned short v;
-
-type->isSigned ? GetShort(value, (short *)&v) : GetUShort(value, &v);
-part = (uint64)v;
-break;
-}
-case 3:
-case 5:
+e->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(e->expType, thisExp->expType);
+e->expType->byReference = 0;
+e->expType->refCount = 1;
+if(e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && (e->expType->__anon1._class->__anon1.registered->type == 2 || e->expType->__anon1._class->__anon1.registered->type == 4 || e->expType->__anon1._class->__anon1.registered->type == 3))
{
-unsigned int v;
-
-type->isSigned ? GetInt(value, (int *)&v) : GetUInt(value, &v);
-part = (uint64)v;
-break;
+e->expType->classObjectType = 0;
}
-case 4:
-{
-uint64 v;
-
-type->isSigned ? GetInt64(value, (long long *)&v) : GetUInt64(value, &v);
-part = v;
-break;
}
-case 22:
+}
+}
+else if(destType && e->expType && (e->expType->classObjectType == 3 || e->expType->classObjectType == 2) && !destType->classObjectType && destType->kind != 0)
{
-uintptr_t v;
-
-type->isSigned ? GetIntPtr(value, (intptr_t *)&v) : GetUIntPtr(value, &v);
-part = (uint64)v;
-break;
+if(destType->kind == 14)
+{
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Unspecified type\n", (((void *)0))));
}
-case 23:
+else if(!(destType->truth && e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && e->expType->__anon1._class->__anon1.registered->type == 1))
{
-size_t v;
+unsigned int byReference = e->expType->byReference;
+struct Expression * thisExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+char typeString[1024];
+struct Type * type;
+int backupClassObjectType;
+unsigned int backupByReference;
-type->isSigned ? GetIntSize(value, (ssize_t *)&v) : GetUIntSize(value, &v);
-part = (uint64)v;
-break;
-}
-}
-bits |= part << bitMember->pos;
-}
-}
-}
+if(e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && strcmp(e->expType->__anon1._class->__anon1.registered->name, "class"))
+type = e->expType;
else
+type = destType;
+backupClassObjectType = type->classObjectType;
+backupByReference = type->byReference;
+type->classObjectType = 0;
+type->byReference = 0;
+typeString[0] = '\0';
+PrintType(type, typeString, 0, 1);
+decl = SpecDeclFromString(typeString, specs, (((void *)0)));
+type->classObjectType = backupClassObjectType;
+type->byReference = backupByReference;
+*thisExp = *e;
+thisExp->prev = (((void *)0));
+thisExp->next = (((void *)0));
+__ecereMethod_Expression_Clear(e);
+if((type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 1000 || type->__anon1._class->__anon1.registered->type == 2 || type->__anon1._class->__anon1.registered->type == 4 || type->__anon1._class->__anon1.registered->type == 3)) || (type->kind != 13 && type->kind != 22 && type->kind != 12 && type->kind != 8) || (!destType->byReference && byReference && (destType->kind != 13 || type->kind != 13)))
{
-if(_class && _class->type == 3)
+unsigned int passAsTemplate = thisExp->destType->passAsTemplate;
+struct Type * t;
+
+destType->refCount++;
+e->type = 4;
+e->__anon1.op.op = '*';
+e->__anon1.op.exp1 = (((void *)0));
+e->__anon1.op.exp2 = MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), thisExp);
+t = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(t, thisExp->destType);
+t->passAsTemplate = 0;
+FreeType(thisExp->destType);
+thisExp->destType = t;
+t = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(t, destType);
+t->passAsTemplate = passAsTemplate;
+FreeType(destType);
+destType = t;
+destType->refCount = 0;
+e->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(e->expType, type);
+if(type->passAsTemplate)
{
-ComputeExpression(member->initializer->__anon1.exp);
-exp->__anon1.__anon1.constant = member->initializer->__anon1.exp->__anon1.__anon1.constant;
-exp->type = 2;
-member->initializer->__anon1.exp->__anon1.__anon1.constant = (((void *)0));
-}
-}
-}
+e->expType->classObjectType = 0;
+e->expType->passAsTemplate = 0;
}
-break;
+e->expType->byReference = 0;
+e->expType->refCount = 1;
}
+else
+{
+e->type = 11;
+e->__anon1.cast.typeName = MkTypeName(specs, decl);
+e->__anon1.cast.exp = thisExp;
+e->byReference = 1;
+e->expType = type;
+type->refCount++;
}
+if(e->destType)
+FreeType(e->destType);
+e->destType = destType;
+destType->refCount++;
}
}
-if(_class && _class->type == 2)
-{
-exp->__anon1.__anon1.constant = PrintHexUInt(bits);
-exp->type = 2;
}
-if(exp->type != 1)
+
+void ComputeModuleClasses(struct __ecereNameSpace__ecere__com__Instance * module)
{
-FreeInstance(inst);
-}
+struct __ecereNameSpace__ecere__com__Class * _class;
+struct __ecereNameSpace__ecere__sys__OldLink * subModule;
+
+for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->modules.first; subModule; subModule = subModule->next)
+ComputeModuleClasses(subModule->data);
+for(_class = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->classes.first; _class; _class = _class->next)
+ComputeClassMembers(_class, 0);
}
-static unsigned int Promote(struct Operand * op, int kind, unsigned int isSigned)
+int ComputeTypeSize(struct Type * type)
{
-unsigned int result = 0x0;
+unsigned int size = type ? type->size : 0;
-switch(kind)
+if(!size && type && !type->computing)
{
-case 2:
-if(op->kind == 1 || op->kind == 15 || op->kind == 24)
-result = isSigned ? GetOpShort(op, &op->__anon1.s) : GetOpUShort(op, &op->__anon1.us);
+type->computing = 1;
+switch(type->kind)
+{
+case 24:
+type->alignment = size = sizeof(char);
+break;
+case 1:
+type->alignment = size = sizeof(char);
break;
case 3:
-case 5:
-if(op->kind == 1 || op->kind == 2 || op->kind == 15 || op->kind == 24)
-result = isSigned ? GetOpInt(op, &op->__anon1.i) : GetOpUInt(op, &op->__anon1.ui);
+type->alignment = size = sizeof(int);
break;
case 4:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 7 || op->kind == 13 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
-result = isSigned ? GetOpInt64(op, &op->__anon1.i64) : GetOpUInt64(op, &op->__anon1.ui64);
+type->alignment = size = sizeof(long long);
break;
-case 6:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
-result = GetOpFloat(op, &op->__anon1.f);
+case 22:
+type->alignment = size = targetBits / 8;
+type->pointerAlignment = 1;
break;
-case 7:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
-result = GetOpDouble(op, &op->__anon1.d);
+case 23:
+type->alignment = size = targetBits / 8;
+type->pointerAlignment = 1;
break;
-case 13:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 7 || op->kind == 13 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
-result = GetOpUIntPtr(op, &op->__anon1.ui64);
+case 5:
+type->alignment = size = sizeof(long);
break;
-case 15:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 4 || op->kind == 5 || op->kind == 6 || op->kind == 7 || op->kind == 13 || op->kind == 15 || op->kind == 22 || op->kind == 23 || op->kind == 24)
-result = isSigned ? GetOpInt(op, &op->__anon1.i) : GetOpUInt(op, &op->__anon1.ui);
+case 2:
+type->alignment = size = sizeof(short);
break;
-case 22:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 5 || op->kind == 15 || op->kind == 24)
-result = isSigned ? GetOpIntPtr(op, &op->__anon1.i64) : GetOpUIntPtr(op, &op->__anon1.ui64);
+case 6:
+type->alignment = size = sizeof(float);
break;
-case 23:
-if(op->kind == 1 || op->kind == 2 || op->kind == 3 || op->kind == 5 || op->kind == 15 || op->kind == 24)
-result = isSigned ? GetOpIntSize(op, &op->__anon1.i64) : GetOpUIntSize(op, &op->__anon1.ui64);
+case 7:
+type->alignment = size = sizeof(double);
break;
-}
-return result;
-}
+case 8:
+{
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class ? type->__anon1._class->__anon1.registered : (((void *)0));
-void CallOperator(struct Expression * exp, struct Expression * exp1, struct Expression * exp2, struct Operand * op1, struct Operand * op2)
+if(_class && _class->type == 1)
{
-if(exp->__anon1.op.op == SIZEOF)
+ComputeClassMembers(_class, 0);
+type->alignment = _class->structAlignment;
+type->pointerAlignment = (unsigned int)_class->pointerAlignment;
+size = _class->structSize;
+if(type->alignment && size % type->alignment)
+size += type->alignment - (size % type->alignment);
+}
+else if(_class && (_class->type == 3 || _class->type == 4 || _class->type == 2))
{
-FreeExpContents(exp);
-exp->type = 2;
-exp->__anon1.__anon1.constant = PrintUInt(ComputeTypeSize(op1->type));
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+size = type->alignment = ComputeTypeSize(_class->dataType);
}
else
{
-if(!exp->__anon1.op.exp1)
-{
-switch(exp->__anon1.op.op)
+size = type->alignment = targetBits / 8;
+type->pointerAlignment = 1;
+}
+break;
+}
+case 13:
+case 19:
+size = type->alignment = targetBits / 8;
+type->pointerAlignment = 1;
+break;
+case 12:
+if(type->__anon1.__anon4.arraySizeExp)
{
-case '+':
+ProcessExpressionType(type->__anon1.__anon4.arraySizeExp);
+ComputeExpression(type->__anon1.__anon4.arraySizeExp);
+if(!type->__anon1.__anon4.arraySizeExp->isConstant || (type->__anon1.__anon4.arraySizeExp->expType->kind != 3 && type->__anon1.__anon4.arraySizeExp->expType->kind != 2 && type->__anon1.__anon4.arraySizeExp->expType->kind != 1 && type->__anon1.__anon4.arraySizeExp->expType->kind != 5 && type->__anon1.__anon4.arraySizeExp->expType->kind != 4 && type->__anon1.__anon4.arraySizeExp->expType->kind != 23 && type->__anon1.__anon4.arraySizeExp->expType->kind != 22 && type->__anon1.__anon4.arraySizeExp->expType->kind != 15 && (type->__anon1.__anon4.arraySizeExp->expType->kind != 8 || !type->__anon1.__anon4.arraySizeExp->expType->__anon1._class->__anon1.registered || type->__anon1.__anon4.arraySizeExp->expType->__anon1._class->__anon1.registered->type != 4)))
{
-struct Expression * exp2 = exp->__anon1.op.exp2;
+struct Location oldLoc = yylloc;
+char expression[10240];
-exp->__anon1.op.exp2 = (((void *)0));
-FreeExpContents(exp);
-FreeType(exp->expType);
-FreeType(exp->destType);
-*exp = *exp2;
-((exp2 ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)exp2) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(exp2)) : 0), exp2 = 0);
-break;
+expression[0] = '\0';
+type->__anon1.__anon4.arraySizeExp->expType = (((void *)0));
+yylloc = type->__anon1.__anon4.arraySizeExp->loc;
+if(inCompiler)
+PrintExpression(type->__anon1.__anon4.arraySizeExp, expression);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Array size not constant int (%s)\n", (((void *)0))), expression);
+yylloc = oldLoc;
}
-case '-':
-if(op1->ops.Neg)
-{
-FreeExpContents(exp);
-op1->ops.Neg(exp, op1);
+GetInt(type->__anon1.__anon4.arraySizeExp, &type->__anon1.__anon4.arraySize);
}
-break;
-case '~':
-if(op1->ops.BitNot)
+else if(type->__anon1.__anon4.enumClass)
{
-FreeExpContents(exp);
-op1->ops.BitNot(exp, op1);
-}
-break;
-case '!':
-if(op1->ops.Not)
+if(type->__anon1.__anon4.enumClass && type->__anon1.__anon4.enumClass->__anon1.registered && type->__anon1.__anon4.enumClass->__anon1.registered->type == 4)
{
-FreeExpContents(exp);
-op1->ops.Not(exp, op1);
-}
-break;
+type->__anon1.__anon4.arraySize = (int)__ecereNameSpace__ecere__com__eClass_GetProperty(type->__anon1.__anon4.enumClass->__anon1.registered, "enumSize");
}
+else
+type->__anon1.__anon4.arraySize = 0;
}
else
{
-if(op1 && op2 && op1->type && op2->type && op1->kind != op2->kind)
-{
-if(Promote(op2, op1->kind, op1->type->isSigned))
-op2->kind = op1->kind, op2->ops = op1->ops;
-else if(Promote(op1, op2->kind, op2->type->isSigned))
-op1->kind = op2->kind, op1->ops = op2->ops;
+type->__anon1.__anon4.arraySize = 0;
}
-switch(exp->__anon1.op.op)
-{
-case '+':
-if(op1->ops.Add)
+size = ComputeTypeSize(type->__anon1.type) * type->__anon1.__anon4.arraySize;
+if(type->__anon1.type)
{
-FreeExpContents(exp);
-op1->ops.Add(exp, op1, op2);
+type->alignment = type->__anon1.type->alignment;
+type->pointerAlignment = type->__anon1.type->pointerAlignment;
}
break;
-case '-':
-if(op1->ops.Sub)
+case 9:
{
-FreeExpContents(exp);
-op1->ops.Sub(exp, op1, op2);
-}
-break;
-case '*':
-if(op1->ops.Mul)
+if(!type->__anon1.__anon1.members.first && type->__anon1.__anon1.enumName)
{
-FreeExpContents(exp);
-op1->ops.Mul(exp, op1, op2);
-}
-break;
-case '/':
-if(op1->ops.Div)
+struct Symbol * symbol = FindStruct(curContext, type->__anon1.__anon1.enumName);
+
+if(symbol && symbol->type)
{
-FreeExpContents(exp);
-op1->ops.Div(exp, op1, op2);
+ComputeTypeSize(symbol->type);
+size = symbol->type->size;
}
-break;
-case '%':
-if(op1->ops.Mod)
-{
-FreeExpContents(exp);
-op1->ops.Mod(exp, op1, op2);
}
-break;
-case '&':
-if(exp->__anon1.op.exp2)
+else
{
-if(op1->ops.BitAnd)
+struct Type * member;
+
+for(member = type->__anon1.__anon1.members.first; member; member = member->next)
{
-FreeExpContents(exp);
-op1->ops.BitAnd(exp, op1, op2);
+int __simpleStruct0, __simpleStruct1;
+unsigned int addSize = ComputeTypeSize(member);
+
+member->offset = size;
+if(member->alignment && size % member->alignment)
+member->offset += member->alignment - (size % member->alignment);
+size = member->offset;
+if(member->pointerAlignment && type->size <= 4)
+type->pointerAlignment = 1;
+else if(!member->pointerAlignment && member->alignment >= 8)
+type->pointerAlignment = 0;
+type->alignment = (__simpleStruct0 = type->alignment, __simpleStruct1 = member->alignment, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1);
+size += addSize;
}
+if(type->alignment && size % type->alignment)
+size += type->alignment - (size % type->alignment);
}
break;
-case '|':
-if(op1->ops.BitOr)
-{
-FreeExpContents(exp);
-op1->ops.BitOr(exp, op1, op2);
}
-break;
-case '^':
-if(op1->ops.BitXor)
+case 10:
{
-FreeExpContents(exp);
-op1->ops.BitXor(exp, op1, op2);
-}
-break;
-case LEFT_OP:
-if(op1->ops.LShift)
+if(!type->__anon1.__anon1.members.first && type->__anon1.__anon1.enumName)
{
-FreeExpContents(exp);
-op1->ops.LShift(exp, op1, op2);
-}
-break;
-case RIGHT_OP:
-if(op1->ops.RShift)
+struct Symbol * symbol = FindStruct(curContext, type->__anon1.__anon1.enumName);
+
+if(symbol && symbol->type)
{
-FreeExpContents(exp);
-op1->ops.RShift(exp, op1, op2);
+ComputeTypeSize(symbol->type);
+size = symbol->type->size;
+type->alignment = symbol->type->alignment;
}
-break;
-case EQ_OP:
-if(op1->ops.Equ)
-{
-FreeExpContents(exp);
-op1->ops.Equ(exp, op1, op2);
}
-break;
-case NE_OP:
-if(op1->ops.Nqu)
+else
{
-FreeExpContents(exp);
-op1->ops.Nqu(exp, op1, op2);
-}
-break;
-case AND_OP:
-if(op1->ops.And)
+struct Type * member;
+
+for(member = type->__anon1.__anon1.members.first; member; member = member->next)
{
-FreeExpContents(exp);
-op1->ops.And(exp, op1, op2);
+int __simpleStruct0, __simpleStruct1;
+unsigned int addSize = ComputeTypeSize(member);
+
+member->offset = size;
+if(member->alignment && size % member->alignment)
+member->offset += member->alignment - (size % member->alignment);
+size = member->offset;
+if(member->pointerAlignment && type->size <= 4)
+type->pointerAlignment = 1;
+else if(!member->pointerAlignment && member->alignment >= 8)
+type->pointerAlignment = 0;
+type->alignment = (__simpleStruct0 = type->alignment, __simpleStruct1 = member->alignment, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1);
+size = ((size > addSize) ? size : addSize);
}
-break;
-case OR_OP:
-if(op1->ops.Or)
-{
-FreeExpContents(exp);
-op1->ops.Or(exp, op1, op2);
+if(type->alignment && size % type->alignment)
+size += type->alignment - (size % type->alignment);
}
break;
-case '>':
-if(op1->ops.Grt)
-{
-FreeExpContents(exp);
-op1->ops.Grt(exp, op1, op2);
}
-break;
-case '<':
-if(op1->ops.Sma)
+case 20:
{
-FreeExpContents(exp);
-op1->ops.Sma(exp, op1, op2);
-}
-break;
-case GE_OP:
-if(op1->ops.GrtEqu)
+struct TemplateParameter * param = type->__anon1.templateParameter;
+struct Type * baseType = ProcessTemplateParameterType(param);
+
+if(baseType)
{
-FreeExpContents(exp);
-op1->ops.GrtEqu(exp, op1, op2);
+size = ComputeTypeSize(baseType);
+type->alignment = baseType->alignment;
+type->pointerAlignment = baseType->pointerAlignment;
}
+else
+type->alignment = size = sizeof(uint64);
break;
-case LE_OP:
-if(op1->ops.SmaEqu)
+}
+case 15:
{
-FreeExpContents(exp);
-op1->ops.SmaEqu(exp, op1, op2);
+type->alignment = size = sizeof(enum
+{
+test
+});
+break;
}
+case 21:
+{
+type->alignment = size = targetBits / 8;
+type->pointerAlignment = 1;
break;
}
}
+type->size = size;
+type->computing = 0;
}
+return size;
}
-void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
-
-extern struct Expression * MkExpIdentifier(struct Identifier * id);
-
-void ComputeExpression(struct Expression * exp)
+struct External * _DeclareStruct(struct External * neededBy, const char * name, unsigned int skipNoHead, unsigned int needDereference, unsigned int fwdDecl)
{
-char expString[10240];
+struct External * external = (((void *)0));
+struct Symbol * classSym = FindClass(name);
+struct __ecereNameSpace__ecere__sys__OldList * curDeclarations = (((void *)0));
-expString[0] = '\0';
-switch(exp->type)
+if(!inCompiler || !classSym)
+return (((void *)0));
+if(classSym->__anon1.registered && (classSym->__anon1.registered->type == 2 || classSym->__anon1.registered->type == 3 || classSym->__anon1.registered->type == 4))
+return (((void *)0));
+if(!classSym->__anon1.registered || (classSym->__anon1.registered->type == 0 && classSym->__anon1.registered->structSize && classSym->__anon1.registered->base && classSym->__anon1.registered->base->base))
+_DeclareStruct(neededBy, "ecere::com::Instance", 0, 1, fwdDecl);
+external = classSym->__anon2.__anon1.structExternal;
+if(external && external->__anon1.declaration)
{
-case 1:
+struct Specifier * spec;
+
+for(spec = external->__anon1.declaration->__anon1.__anon1.specifiers ? (*external->__anon1.declaration->__anon1.__anon1.specifiers).first : (((void *)0)); spec; spec = spec->next)
+if(spec->type == 3 || spec->type == 4)
{
-ComputeInstantiation(exp);
+curDeclarations = spec->__anon1.__anon2.definitions;
break;
}
-case 4:
-{
-struct Expression * exp1, * exp2 = (((void *)0));
-struct Operand op1 =
+}
+if(classSym->__anon1.registered && !classSym->declaring && classSym->imported && (!classSym->declaredStructSym || (classSym->__anon1.registered->type == 5 && !skipNoHead && external && !curDeclarations)))
{
-0, 0, 0,
-.__anon1 = {
-.c = 0
-},
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
+struct __ecereNameSpace__ecere__sys__OldList * declarations = (((void *)0));
+char structName[1024];
+unsigned int addedPadding = 0;
+struct Specifier * curSpec = (((void *)0));
+
+classSym->declaring++;
+if(strchr(classSym->string, '<'))
{
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+if(classSym->__anon1.registered->templateClass)
+external = _DeclareStruct(neededBy, classSym->__anon1.registered->templateClass->fullName, skipNoHead, needDereference, fwdDecl);
+classSym->declaring--;
+return external;
}
-};
-struct Operand op2 =
+structName[0] = 0;
+FullClassNameCat(structName, name, 0);
+classSym->declaredStructSym = 1;
+if(!external || (classSym->__anon1.registered->type == 5 && !skipNoHead && !curDeclarations))
{
-0, 0, 0,
-.__anon1 = {
-.c = 0
-},
+unsigned int add = 0;
+
+if(!external)
{
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+external = MkExternalDeclaration((((void *)0)));
+classSym->__anon2.__anon1.structExternal = external;
+external->symbol = classSym;
+add = 1;
}
-};
-
-if(exp->__anon1.op.exp2)
+if(!skipNoHead)
{
-struct Expression * e = exp->__anon1.op.exp2;
-
-while((e->type == 5 || e->type == 32 || e->type == 23) && e->__anon1.list)
+declarations = MkList();
+AddMembers(external, declarations, classSym->__anon1.registered, 0, (((void *)0)), classSym->__anon1.registered, &addedPadding);
+}
+if(external->__anon1.declaration)
{
-if(e->type == 5 || e->type == 32 || e->type == 23)
+struct Specifier * spec;
+
+for(spec = external->__anon1.declaration->__anon1.__anon1.specifiers ? (*external->__anon1.declaration->__anon1.__anon1.specifiers).first : (((void *)0)); spec; spec = spec->next)
+if(spec->type == 3 || spec->type == 4)
{
-if(e->type == 23)
-e = (*((struct Statement *)(*e->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
-else
-e = (*e->__anon1.list).last;
+curSpec = spec;
+curDeclarations = spec->__anon1.__anon2.definitions;
+break;
}
}
-if(exp->__anon1.op.op == 261 && e && e->expType)
+if(declarations && (!(*declarations).count || ((*declarations).count == 1 && addedPadding)))
{
-if(e->type == 3 && e->__anon1.__anon2.string)
+FreeList(declarations, (void *)(FreeClassDef));
+declarations = (((void *)0));
+}
+if(classSym->__anon1.registered->type != 5 && !declarations)
{
-char * string = e->__anon1.__anon2.string;
-int len = strlen(string);
-char * tmp = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (len - 2 + 1));
-
-len = UnescapeString(tmp, string + 1, len - 2);
-(__ecereNameSpace__ecere__com__eSystem_Delete(tmp), tmp = 0);
-FreeExpContents(exp);
-exp->type = 2;
-exp->__anon1.__anon1.constant = PrintUInt(len + 1);
+FreeExternal(external);
+external = (((void *)0));
+classSym->__anon2.__anon1.structExternal = (((void *)0));
}
else
{
-struct Type * type = e->expType;
-
-type->refCount++;
-FreeExpContents(exp);
-exp->type = 2;
-exp->__anon1.__anon1.constant = PrintUInt(ComputeTypeSize(type));
-FreeType(type);
+if(curSpec)
+curSpec->__anon1.__anon2.definitions = declarations;
+else
+{
+specifiers = MkList();
+declarators = MkList();
+ListAdd(specifiers, MkStructOrUnion(3, MkIdentifier(structName), declarations));
+external->__anon1.declaration = MkDeclaration(specifiers, declarators);
}
-break;
+if(add)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external);
}
-else
-ComputeExpression(exp->__anon1.op.exp2);
}
-if(exp->__anon1.op.exp1)
+classSym->declaring--;
+}
+else if(!classSym->declaredStructSym && classSym->__anon2.__anon1.structExternal)
{
-ComputeExpression(exp->__anon1.op.exp1);
-exp1 = exp->__anon1.op.exp1;
-exp2 = exp->__anon1.op.exp2;
-op1 = GetOperand(exp1);
-if(op1.type)
-op1.type->refCount++;
-if(exp2)
+classSym->declaredStructSym = 1;
+if(classSym->__anon1.registered)
+DeclareMembers(classSym->__anon2.__anon1.structExternal, classSym->__anon1.registered, 0);
+if(classSym->__anon2.__anon1.structExternal->__anon1.declaration && classSym->__anon2.__anon1.structExternal->__anon1.declaration->__anon1.__anon1.specifiers)
{
-op2 = GetOperand(exp2);
-if(op2.type)
-op2.type->refCount++;
+struct Specifier * spec;
+
+for(spec = (*classSym->__anon2.__anon1.structExternal->__anon1.declaration->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
+{
+if(spec->__anon1.__anon2.definitions)
+IdentifyAnonStructs(spec->__anon1.__anon2.definitions);
}
}
-else
-{
-exp1 = exp->__anon1.op.exp2;
-op1 = GetOperand(exp1);
-if(op1.type)
-op1.type->refCount++;
}
-CallOperator(exp, exp1, exp2, &op1, &op2);
-if(op1.type)
-FreeType(op1.type);
-if(op2.type)
-FreeType(op2.type);
-break;
+if(inCompiler && neededBy && (external || !classSym->imported))
+{
+if(!external)
+{
+classSym->__anon2.__anon1.structExternal = external = MkExternalDeclaration((((void *)0)));
+external->symbol = classSym;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external);
}
-case 5:
-case 32:
+if(reachedPass15 && !external->__anon1.declaration && classSym->__anon1.registered && classSym->__anon1.registered->type == 5)
{
-struct Expression * e, * n;
+char structName[1024];
+struct __ecereNameSpace__ecere__sys__OldList * specifiers, * declarators;
-for(e = (*exp->__anon1.list).first; e; e = n)
-{
-n = e->next;
-if(!n)
+structName[0] = 0;
+FullClassNameCat(structName, name, 0);
+specifiers = MkList();
+declarators = MkList();
+ListAdd(specifiers, MkStructOrUnion(3, MkIdentifier(structName), (((void *)0))));
+external->__anon1.declaration = MkDeclaration(specifiers, declarators);
+}
+if(fwdDecl)
{
-struct __ecereNameSpace__ecere__sys__OldList * list = exp->__anon1.list;
-struct Expression * prev = exp->prev;
-struct Expression * next = exp->next;
+struct External * e = external->fwdDecl ? external->fwdDecl : external;
-ComputeExpression(e);
-FreeType(exp->expType);
-FreeType(exp->destType);
-*exp = *e;
-exp->prev = prev;
-exp->next = next;
-((e ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)e) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(e)) : 0), e = 0);
-(__ecereNameSpace__ecere__com__eSystem_Delete(list), list = 0);
+if(((struct __ecereNameSpace__ecere__com__LinkList *)(((char *)e->incoming + 0 + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->count)
+__ecereMethod_External_CreateUniqueEdge(neededBy, e, !needDereference && !external->fwdDecl);
}
else
+__ecereMethod_External_CreateUniqueEdge(neededBy, external, !needDereference);
+}
+return external;
+}
+
+void ProcessMemberInitData(struct MemberInit * member, struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos)
{
-FreeExpression(e);
+struct Identifier * ident = member->identifiers ? (*member->identifiers).first : (((void *)0));
+unsigned int found = 0;
+struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0));
+struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
+unsigned int freeType = 0;
+
+yylloc = member->loc;
+if(!ident)
+{
+if(curMember)
+{
+__ecereNameSpace__ecere__com__eClass_FindNextMember(_class, curClass, curMember, subMemberStack, subMemberStackPos);
+if(*curMember)
+{
+found = 1;
+dataMember = *curMember;
}
}
-break;
}
-case 8:
+else
{
-struct Expression * memberExp = exp->__anon1.member.exp;
-struct Identifier * memberID = exp->__anon1.member.member;
-struct Type * type;
+struct __ecereNameSpace__ecere__com__DataMember * thisMember = (struct __ecereNameSpace__ecere__com__DataMember *)__ecereNameSpace__ecere__com__eClass_FindProperty(_class, ident->string, privateModule);
+struct __ecereNameSpace__ecere__com__DataMember * _subMemberStack[256];
+int _subMemberStackPos = 0;
-ComputeExpression(exp->__anon1.member.exp);
-type = exp->__anon1.member.exp->expType;
-if(type)
+if(!thisMember)
+thisMember = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, ident->string, privateModule, _subMemberStack, &_subMemberStackPos);
+if(thisMember)
{
-struct __ecereNameSpace__ecere__com__Class * _class = (exp->__anon1.member.member && exp->__anon1.member.member->classSym) ? exp->__anon1.member.member->classSym->__anon1.registered : (((type->kind == 8 || type->kind == 19) && type->__anon1._class) ? type->__anon1._class->__anon1.registered : (((void *)0)));
-struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * convertTo = (((void *)0));
-
-if(type->kind == 19 && exp->__anon1.member.exp->type == 24)
-_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::com::Class");
-if(!_class)
+dataMember = thisMember;
+if(curMember && thisMember->memberAccess == 1)
{
-char string[256];
-struct Symbol * classSym;
-
-string[0] = '\0';
-PrintTypeNoConst(type, string, 0x0, 0x1);
-classSym = FindClass(string);
-_class = classSym ? classSym->__anon1.registered : (((void *)0));
+*curMember = thisMember;
+*curClass = thisMember->_class;
+memcpy(subMemberStack, _subMemberStack, sizeof(struct __ecereNameSpace__ecere__com__DataMember *) * _subMemberStackPos);
+*subMemberStackPos = _subMemberStackPos;
+}
+found = 1;
}
-if(exp->__anon1.member.member)
+else
{
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, exp->__anon1.member.member->string, privateModule);
-if(!prop)
-member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, exp->__anon1.member.member->string, privateModule, (((void *)0)), (((void *)0)));
+method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, ident->string, privateModule);
+if(method && method->type == 1)
+found = 1;
+else
+method = (((void *)0));
}
-if(!prop && !member && _class && exp->__anon1.member.member)
-{
-struct Symbol * classSym = FindClass(exp->__anon1.member.member->string);
-
-convertTo = _class;
-_class = classSym ? classSym->__anon1.registered : (((void *)0));
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, convertTo->fullName, privateModule);
}
-if(prop)
-{
-if(prop->compiled)
+if(found)
{
-struct Type * type = prop->dataType;
+struct Type * type = (((void *)0));
-if(_class->type == 3)
+if(dataMember)
{
-if(type->kind == 8)
+if(!dataMember->dataType && dataMember->dataTypeString)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+struct Context * context = SetupTemplatesContext(_class);
-if(_class->type == 3)
-{
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-type = _class->dataType;
+dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0);
+FinishTemplatesContext(context);
}
+type = dataMember->dataType;
}
-switch(type->kind)
+else if(method)
{
-case 6:
+if(!method->dataType)
+ProcessMethodType(method);
+type = method->dataType;
+}
+if(ident && ident->next)
{
-float value;
-float (* Get)(float) = (void *)prop->Get;
-
-GetFloat(exp->__anon1.member.exp, &value);
-exp->__anon1.__anon1.constant = PrintFloat(Get ? Get(value) : value);
-exp->type = 2;
-break;
+for(ident = ident->next; ident && type; ident = ident->next)
+{
+if(type->kind == 8)
+{
+dataMember = (struct __ecereNameSpace__ecere__com__DataMember *)__ecereNameSpace__ecere__com__eClass_FindProperty(type->__anon1._class->__anon1.registered, ident->string, privateModule);
+if(!dataMember)
+dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMember(type->__anon1._class->__anon1.registered, ident->string, privateModule, (((void *)0)), (((void *)0)));
+if(dataMember)
+type = dataMember->dataType;
}
-case 7:
+else if(type->kind == 9 || type->kind == 10)
{
-double value;
-double (* Get)(double);
+struct Type * memberType;
-GetDouble(exp->__anon1.member.exp, &value);
-if(convertTo)
-Get = (void *)prop->Set;
-else
-Get = (void *)prop->Get;
-exp->__anon1.__anon1.constant = PrintDouble(Get ? Get(value) : value);
-exp->type = 2;
+for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
+{
+if(!strcmp(memberType->name, ident->string))
+{
+type = memberType;
break;
}
}
}
-else
-{
-if(convertTo)
+}
+}
+if(type && type->kind == 20 && type->__anon1.templateParameter->type == 0 && _class->templateArgs)
{
-struct Expression * value = exp->__anon1.member.exp;
-struct Type * type;
+int id = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * sClass;
-if(!prop->dataType)
-ProcessPropertyType(prop);
-type = prop->dataType;
-if(!type)
-{
-}
-else if(_class->type == 1)
+for(sClass = _class; sClass; sClass = sClass->base)
{
-switch(type->kind)
+id = 0;
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
{
-case 8:
+if(curParam->type == 0 && !strcmp(type->__anon1.templateParameter->identifier->string, curParam->name))
{
-struct __ecereNameSpace__ecere__com__Class * propertyClass = type->__anon1._class->__anon1.registered;
-
-if(propertyClass->type == 1 && value->type == 1)
+for(sClass = sClass->base; sClass; sClass = sClass->base)
{
-void (* Set)(void *, void *) = (void *)prop->Set;
-
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-Set(exp->__anon1.instance->data, value->__anon1.instance->data);
-PopulateInstance(exp->__anon1.instance);
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+id += sClass->templateParams.count;
}
break;
}
-case 3:
-{
-int intValue;
-void (* Set)(void *, int) = (void *)prop->Set;
-
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-GetInt(value, &intValue);
-Set(exp->__anon1.instance->data, intValue);
-PopulateInstance(exp->__anon1.instance);
-break;
+id++;
}
-case 4:
-{
-long long intValue;
-void (* Set)(void *, long long) = (void *)prop->Set;
-
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-GetInt64(value, &intValue);
-Set(exp->__anon1.instance->data, intValue);
-PopulateInstance(exp->__anon1.instance);
+if(curParam)
break;
}
-case 22:
+if(curParam)
{
-intptr_t intValue;
-void (* Set)(void *, intptr_t) = (void *)prop->Set;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = _class->templateArgs[id];
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-GetIntPtr(value, &intValue);
-Set(exp->__anon1.instance->data, intValue);
-PopulateInstance(exp->__anon1.instance);
-break;
-}
-case 23:
+if(arg.__anon1.__anon1.dataTypeString)
{
-ssize_t intValue;
-void (* Set)(void *, ssize_t) = (void *)prop->Set;
+unsigned int constant = type->constant;
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-GetIntSize(value, &intValue);
-Set(exp->__anon1.instance->data, intValue);
-PopulateInstance(exp->__anon1.instance);
-break;
-}
-case 6:
+type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0);
+if(type->kind == 8 && constant)
+type->constant = 1;
+else if(type->kind == 13)
{
-float floatValue;
-void (* Set)(void *, float) = (void *)prop->Set;
+struct Type * t = type->__anon1.type;
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-GetFloat(value, &floatValue);
-Set(exp->__anon1.instance->data, floatValue);
-PopulateInstance(exp->__anon1.instance);
-break;
+while(t->kind == 13)
+t = t->__anon1.type;
+if(constant)
+t->constant = constant;
}
-case 7:
+freeType = 1;
+if(type && _class->templateClass)
+type->passAsTemplate = 1;
+if(type)
{
-double doubleValue;
-void (* Set)(void *, double) = (void *)prop->Set;
-
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-GetDouble(value, &doubleValue);
-Set(exp->__anon1.instance->data, doubleValue);
-PopulateInstance(exp->__anon1.instance);
-break;
}
}
}
-else if(_class->type == 2)
+}
+if(type && type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered && strchr(type->__anon1._class->__anon1.registered->fullName, '<'))
{
-switch(type->kind)
+struct __ecereNameSpace__ecere__com__Class * expClass = type->__anon1._class->__anon1.registered;
+struct __ecereNameSpace__ecere__com__Class * cClass = (((void *)0));
+int paramCount = 0;
+int lastParam = -1;
+char templateString[1024];
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
+
+sprintf(templateString, "%s<", expClass->templateClass->fullName);
+for(cClass = expClass; cClass; cClass = cClass->base)
+{
+int p = 0;
+
+if(cClass->templateClass)
+cClass = cClass->templateClass;
+for(param = cClass->templateParams.first; param; param = param->next)
+{
+int id = p;
+struct __ecereNameSpace__ecere__com__Class * sClass;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg;
+
+for(sClass = cClass->base; sClass; sClass = sClass->base)
+{
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+id += sClass->templateParams.count;
+}
+arg = expClass->templateArgs[id];
+for(sClass = _class; sClass; sClass = sClass->base)
+{
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * cParam;
+int p = 0;
+struct __ecereNameSpace__ecere__com__Class * nextClass;
+
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+for(nextClass = sClass->base; nextClass; nextClass = nextClass->base)
+{
+if(nextClass->templateClass)
+nextClass = nextClass->templateClass;
+p += nextClass->templateParams.count;
+}
+for(cParam = sClass->templateParams.first; cParam; cParam = cParam->next, p++)
{
-case 8:
+if(cParam->type == 0 && arg.__anon1.__anon1.dataTypeString && !strcmp(cParam->name, arg.__anon1.__anon1.dataTypeString))
{
-struct __ecereNameSpace__ecere__com__Class * propertyClass = type->__anon1._class->__anon1.registered;
-
-if(propertyClass->type == 1 && value->__anon1.instance->data)
+if(_class->templateArgs && arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
{
-unsigned int (* Set)(void *) = (void *)prop->Set;
-unsigned int bits = Set(value->__anon1.instance->data);
-
-exp->__anon1.__anon1.constant = PrintHexUInt(bits);
-exp->type = 2;
+arg.__anon1.__anon1.dataTypeString = _class->templateArgs[p].__anon1.__anon1.dataTypeString;
+arg.__anon1.__anon1.dataTypeClass = _class->templateArgs[p].__anon1.__anon1.dataTypeClass;
break;
}
-else if(_class->type == 2)
-{
-unsigned int value;
-unsigned int (* Set)(unsigned int) = (void *)prop->Set;
-unsigned int bits;
-
-GetUInt(exp->__anon1.member.exp, &value);
-bits = Set(value);
-exp->__anon1.__anon1.constant = PrintHexUInt(bits);
-exp->type = 2;
-}
}
}
}
-}
-else
-{
-if(_class->type == 2)
{
-unsigned int value;
+char argument[256];
-GetUInt(exp->__anon1.member.exp, &value);
-switch(type->kind)
-{
-case 8:
+argument[0] = '\0';
+switch(param->type)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class->type == 1)
+case 2:
{
-void (* Get)(unsigned int, void *) = (void *)prop->Get;
+char expString[1024];
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
+struct Expression * exp;
+char * string = PrintHexUInt64(arg.__anon1.expression.__anon1.ui64);
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-Get(value, exp->__anon1.instance->data);
-PopulateInstance(exp->__anon1.instance);
+exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
+(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
+ProcessExpressionType(exp);
+ComputeExpression(exp);
+expString[0] = '\0';
+PrintExpression(exp, expString);
+strcat(argument, expString);
+FreeExpression(exp);
+break;
}
-else if(_class->type == 2)
+case 1:
{
-unsigned int (* Get)(unsigned int) = (void *)prop->Get;
-uint64 bits = Get(value);
-
-exp->__anon1.__anon1.constant = PrintHexUInt64(bits);
-exp->type = 2;
-}
+strcat(argument, arg.__anon1.__anon2.__anon1.member->name);
break;
}
+case 0:
+{
+if(arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
+strcat(argument, arg.__anon1.__anon1.dataTypeString);
+break;
}
}
-else if(_class->type == 1)
-{
-unsigned char * value = (exp->__anon1.member.exp->type == 1) ? exp->__anon1.member.exp->__anon1.instance->data : (((void *)0));
-
-switch(type->kind)
-{
-case 8:
+if(argument[0])
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class->type == 1 && value)
+if(paramCount)
+strcat(templateString, ", ");
+if(lastParam != p - 1)
{
-void (* Get)(void *, void *) = (void *)prop->Get;
-
-exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
-exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
-exp->__anon1.instance->loc = exp->loc;
-exp->type = 1;
-Get(value, exp->__anon1.instance->data);
-PopulateInstance(exp->__anon1.instance);
+strcat(templateString, param->name);
+strcat(templateString, " = ");
}
-break;
+strcat(templateString, argument);
+paramCount++;
+lastParam = p;
}
+p++;
}
}
}
+{
+int len = strlen(templateString);
+
+if(templateString[len - 1] == '<')
+len--;
+else
+{
+if(templateString[len - 1] == '>')
+templateString[len++] = ' ';
+templateString[len++] = '>';
}
+templateString[len++] = '\0';
}
-else
{
-exp->isConstant = 0x0;
+struct Context * context = SetupTemplatesContext(_class);
+
+if(freeType)
+FreeType(type);
+type = ProcessTypeString(templateString, 0);
+freeType = 1;
+FinishTemplatesContext(context);
}
}
-else if(member)
+if(method && member->initializer && member->initializer->type == 0 && member->initializer->__anon1.exp)
+{
+ProcessExpressionType(member->initializer->__anon1.exp);
+if(!member->initializer->__anon1.exp->expType)
{
+if(inCompiler)
+{
+char expString[10240];
+
+expString[0] = '\0';
+PrintExpression(member->initializer->__anon1.exp, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved symbol used as an instance method %s\n", (((void *)0))), expString);
}
}
-if(exp->type != 8)
+else if(!MatchTypes(member->initializer->__anon1.exp->expType, type, (((void *)0)), (((void *)0)), _class, 1, 1, 0, 0, 1))
{
-FreeExpression(memberExp);
-FreeIdentifier(memberID);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible instance method %s\n", (((void *)0))), ident->string);
}
-break;
}
-case 10:
+else if(member->initializer)
{
-struct Type * type = ProcessType(exp->__anon1.typeName->qualifiers, exp->__anon1.typeName->declarator);
-
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUInt(ComputeTypeSize(type));
-exp->type = 2;
+ProcessInitializer(member->initializer, type);
+}
+if(freeType)
FreeType(type);
-break;
}
-case 15:
-{
-struct Symbol * classSym = exp->__anon1._class->__anon1.__anon1.symbol;
-
-if(classSym && classSym->__anon1.registered)
+else
{
-if(classSym->__anon1.registered->fixed)
+if(_class && _class->type == 3)
{
-FreeSpecifier(exp->__anon1._class);
-exp->__anon1.__anon1.constant = PrintUInt(classSym->__anon1.registered->templateClass ? classSym->__anon1.registered->templateClass->structSize : classSym->__anon1.registered->structSize);
-exp->type = 2;
-}
-else
+if(member->initializer)
{
-char className[1024];
+struct Type * type = MkClassType(_class->fullName);
-strcpy(className, "__ecereClass_");
-FullClassNameCat(className, classSym->string, 0x1);
-DeclareClass(classSym, className);
-FreeExpContents(exp);
-exp->type = 9;
-exp->__anon1.member.exp = MkExpIdentifier(MkIdentifier(className));
-exp->__anon1.member.member = MkIdentifier("structSize");
-}
+ProcessInitializer(member->initializer, type);
+FreeType(type);
}
-break;
}
-case 11:
+else
{
-struct Type * type;
-struct Expression * e = exp;
-
-if(exp->type == 11)
+if(member->initializer)
{
-if(exp->__anon1.cast.exp)
-ComputeExpression(exp->__anon1.cast.exp);
-e = exp->__anon1.cast.exp;
+ProcessInitializer(member->initializer, (((void *)0)));
}
-if(e && exp->expType)
+if(ident)
{
-type = exp->expType;
-if(type->kind == 8)
+if(method)
{
-struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-
-if(_class && (_class->type == 3 || _class->type == 2))
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find virtual method %s in class %s\n", (((void *)0))), ident->string, _class->fullName);
+}
+else if(_class)
{
-if(!_class->dataType)
-_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0);
-type = _class->dataType;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find member %s in class %s\n", (((void *)0))), ident->string, _class->fullName);
+if(inCompiler)
+__ecereNameSpace__ecere__com__eClass_AddDataMember(_class, ident->string, "int", 0, 0, 1);
}
}
-switch(type->kind)
+else if(_class)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many initializers for instantiation of class %s\n", (((void *)0))), _class->fullName);
+}
+}
+}
+
+unsigned int MatchWithEnums_NameSpace(struct __ecereNameSpace__ecere__com__NameSpace * nameSpace, struct Expression * sourceExp, struct Type * dest, char * string, struct __ecereNameSpace__ecere__sys__OldList * conversions)
{
-case 24:
-case 1:
-if(type->isSigned)
+struct __ecereNameSpace__ecere__com__BTNamedLink * link;
+
+for(link = (struct __ecereNameSpace__ecere__com__BTNamedLink *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->classes); link; link = (struct __ecereNameSpace__ecere__com__BTNamedLink *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)link)))
{
-char value = (char)0;
+struct __ecereNameSpace__ecere__com__Class * _class = link->data;
-if(GetChar(e, &value))
+if(_class->type == 4)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintChar(value);
-exp->type = 2;
-}
-}
-else
+struct __ecereNameSpace__ecere__sys__OldList converts =
{
-unsigned char value = (unsigned char)0;
+0, 0, 0, 0, 0
+};
+struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-if(GetUChar(e, &value))
-{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUChar(value);
-exp->type = 2;
-}
-}
-break;
-case 2:
-if(type->isSigned)
+type->kind = 8;
+if(!_class->symbol)
+_class->symbol = FindClass(_class->fullName);
+type->__anon1._class = _class->symbol;
+if(MatchTypes(type, dest, &converts, (((void *)0)), (((void *)0)), dest->kind != 8 || !dest->__anon1._class || strcmp(dest->__anon1._class->string, "bool"), 0, 0, 0, 0))
{
-short value = (short)0;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * value;
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-if(GetShort(e, &value))
+if(enumClass)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintShort(value);
-exp->type = 2;
-}
-}
-else
+struct __ecereNameSpace__ecere__com__Class * baseClass;
+
+for(baseClass = _class; baseClass && baseClass->type == 4; baseClass = baseClass->base)
{
-unsigned short value = (unsigned short)0;
+struct __ecereNameSpace__ecere__com__EnumClassData * e = (baseClass ? ((void *)(((char *)baseClass->data) + enumClass->offsetClass)) : (((void *)0)));
-if(GetUShort(e, &value))
+for(value = e->values.first; value; value = value->next)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUShort(value);
-exp->type = 2;
-}
-}
+if(!strcmp(value->name, string))
break;
-case 3:
-if(type->isSigned)
+}
+if(value)
{
-int value = 0;
-
-if(GetInt(e, &value))
+FreeType(sourceExp->expType);
+sourceExp->isConstant = 1;
+sourceExp->expType = MkClassType(baseClass->fullName);
+if(inCompiler || inPreCompiler || inDebugger)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt(value);
-exp->type = 2;
-}
-}
+char constant[256];
+
+FreeExpContents(sourceExp);
+sourceExp->type = 2;
+if(!strcmp(baseClass->dataTypeString, "int") || !strcmp(baseClass->dataTypeString, "int64") || !strcmp(baseClass->dataTypeString, "short") || !strcmp(baseClass->dataTypeString, "char"))
+sprintf(constant, ((__runtimePlatform == 1) ? "%I64d" : "%lld"), value->data);
else
+sprintf(constant, ((__runtimePlatform == 1) ? "0x%I64XLL" : "0x%llXLL"), value->data);
+sourceExp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
+}
+while(converts.first)
{
-unsigned int value = 0;
+struct Conversion * convert = converts.first;
-if(GetUInt(e, &value))
-{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUInt(value);
-exp->type = 2;
-}
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(&converts, convert);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(conversions, convert);
}
-break;
-case 4:
-if(type->isSigned)
-{
-long long value = 0;
+((type ? __extension__ ({
+void * __ecerePtrToDelete = (type);
-if(GetInt64(e, &value))
-{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt64(value);
-exp->type = 2;
+__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), type = 0);
+return 1;
}
}
-else
-{
-uint64 value = 0;
-
-if(GetUInt64(e, &value))
-{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUInt64(value);
-exp->type = 2;
}
}
-break;
-case 22:
-if(type->isSigned)
-{
-intptr_t value = 0;
+if(converts.first)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(&converts, (void *)(FreeConvert));
+((type ? __extension__ ({
+void * __ecerePtrToDelete = (type);
-if(GetIntPtr(e, &value))
-{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt64((long long)value);
-exp->type = 2;
+__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), type = 0);
}
}
-else
-{
-uintptr_t value = 0;
+for(nameSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->nameSpaces); nameSpace != (((void *)0)); nameSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)nameSpace)))
+if(MatchWithEnums_NameSpace(nameSpace, sourceExp, dest, string, conversions))
+return 1;
+return 0;
+}
-if(GetUIntPtr(e, &value))
+void ComputeExpression(struct Expression * exp)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUInt64((uint64)value);
-exp->type = 2;
-}
-}
-break;
-case 23:
-if(type->isSigned)
+switch(exp->type)
{
-ssize_t value = 0;
-
-if(GetIntSize(e, &value))
+case 0:
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintInt64((long long)value);
-exp->type = 2;
-}
-}
-else
+struct Identifier * id = exp->__anon1.__anon1.identifier;
+
+if(id && exp->isConstant && !inCompiler && !inPreCompiler && !inDebugger)
{
-size_t value = 0;
+struct __ecereNameSpace__ecere__com__Class * c = (exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class) ? exp->expType->__anon1._class->__anon1.registered : (((void *)0));
-if(GetUIntSize(e, &value))
+if(c && c->type == 4)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintUInt64((uint64)value);
-exp->type = 2;
-}
-}
-break;
-case 6:
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
+
+if(enumClass)
{
-float value = 0;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * value;
+struct __ecereNameSpace__ecere__com__EnumClassData * e = (c ? ((void *)(((char *)c->data) + enumClass->offsetClass)) : (((void *)0)));
-if(GetFloat(e, &value))
+for(value = e->values.first; value; value = value->next)
{
-FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintFloat(value);
-exp->type = 2;
-}
+if(!strcmp(value->name, id->string))
break;
}
-case 7:
+if(value)
{
-double value = 0;
+const char * dts = c->dataTypeString;
-if(GetDouble(e, &value))
-{
FreeExpContents(exp);
-exp->__anon1.__anon1.constant = PrintDouble(value);
exp->type = 2;
+exp->__anon1.__anon1.constant = (dts && (!strcmp(dts, "int") || !strcmp(dts, "int64") || !strcmp(dts, "short") || !strcmp(dts, "char"))) ? PrintInt64(value->data) : PrintUInt64(value->data);
}
-break;
}
}
}
break;
}
-case 12:
+case 1:
+{
+ComputeInstantiation(exp);
+break;
+}
+case 4:
{
+struct Expression * exp1, * exp2 = (((void *)0));
struct Operand op1 =
{
0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
};
-struct Operand op3 =
-{
-0, 0, 0,
-.__anon1 = {
-.c = 0
-},
-{
-0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-}
-};
-
-if(exp->__anon1.cond.exp)
-ComputeExpression((*exp->__anon1.cond.exp).last);
-if(exp->__anon1.cond.elseExp)
-ComputeExpression(exp->__anon1.cond.elseExp);
-if(exp->__anon1.cond.cond)
-ComputeExpression(exp->__anon1.cond.cond);
-op1 = GetOperand(exp->__anon1.cond.cond);
-if(op1.type)
-op1.type->refCount++;
-op2 = GetOperand((*exp->__anon1.cond.exp).last);
-if(op2.type)
-op2.type->refCount++;
-op3 = GetOperand(exp->__anon1.cond.elseExp);
-if(op3.type)
-op3.type->refCount++;
-if(op1.ops.Cond)
-{
-FreeExpContents(exp);
-op1.ops.Cond(exp, &op1, &op2, &op3);
-}
-if(op1.type)
-FreeType(op1.type);
-if(op2.type)
-FreeType(op2.type);
-if(op3.type)
-FreeType(op3.type);
-break;
-}
-}
-}
-
-void ApplyAnyObjectLogic(struct Expression * e);
-
-static unsigned int CheckExpressionType(struct Expression * exp, struct Type * destType, unsigned int skipUnitBla, unsigned int warnConst)
-{
-unsigned int result = 0x1;
-
-if(destType)
-{
-struct __ecereNameSpace__ecere__sys__OldList converts =
-{
-0, 0, 0, 0, 0
-};
-struct Conversion * convert;
-
-if(destType->kind == 0)
-return 0x0;
-if(!MatchTypeExpression(exp, destType, &converts, skipUnitBla, warnConst))
-result = 0x0;
-if(converts.count)
-{
-for(convert = converts.first; convert; convert = convert->next)
-{
-unsigned int empty = !(convert->isGet ? (void *)convert->convert->Get : (void *)convert->convert->Set);
-if(!empty)
+if(exp->__anon1.op.exp2)
{
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-int objectType = exp->expType ? exp->expType->classObjectType : 0;
+struct Expression * e = exp->__anon1.op.exp2;
-*newExp = *exp;
-newExp->prev = (((void *)0));
-newExp->next = (((void *)0));
-newExp->destType = (((void *)0));
-if(convert->isGet)
-{
-exp->type = 8;
-exp->addedThis = 0x1;
-exp->__anon1.member.exp = newExp;
-FreeType(exp->__anon1.member.exp->expType);
-exp->__anon1.member.exp->expType = MkClassType(convert->convert->_class->fullName);
-exp->__anon1.member.exp->expType->classObjectType = objectType;
-exp->__anon1.member.member = MkIdentifier(convert->convert->dataTypeString);
-exp->__anon1.member.memberType = 1;
-exp->expType = convert->resultType ? convert->resultType : convert->convert->dataType;
-exp->needCast = 0x1;
-if(exp->expType)
-exp->expType->refCount++;
-ApplyAnyObjectLogic(exp->__anon1.member.exp);
-}
-else
-{
-{
-exp->type = 8;
-exp->addedThis = 0x1;
-exp->__anon1.member.exp = newExp;
-if(newExp->expType && newExp->expType->kind == 8 && newExp->expType->__anon1._class && newExp->expType->__anon1._class->__anon1.registered && newExp->expType->__anon1._class->__anon1.registered->type == 5)
-{
-newExp->byReference = 0x1;
-}
-FreeType(exp->__anon1.member.exp->expType);
-exp->__anon1.member.exp->expType = (((void *)0));
-if(convert->convert->dataType)
-{
-exp->__anon1.member.exp->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-CopyTypeInto(exp->__anon1.member.exp->expType, convert->convert->dataType);
-exp->__anon1.member.exp->expType->refCount = 1;
-exp->__anon1.member.exp->expType->classObjectType = objectType;
-ApplyAnyObjectLogic(exp->__anon1.member.exp);
-}
-exp->__anon1.member.member = MkIdentifier(convert->convert->_class->fullName);
-exp->__anon1.member.memberType = 4;
-exp->expType = convert->resultType ? convert->resultType : MkClassType(convert->convert->_class->fullName);
-exp->needCast = 0x1;
-if(convert->resultType)
-convert->resultType->refCount++;
-}
-}
-}
-else
+while((e->type == 5 || e->type == 32 || e->type == 23) && e->__anon1.list)
{
-FreeType(exp->expType);
-if(convert->isGet)
+if(e->type == 5 || e->type == 32 || e->type == 23)
{
-exp->expType = convert->resultType ? convert->resultType : convert->convert->dataType;
-if(exp->destType->casted)
-exp->needCast = 0x1;
-if(exp->expType)
-exp->expType->refCount++;
-}
+if(e->type == 23)
+e = (*((struct Statement *)(*e->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
else
-{
-exp->expType = convert->resultType ? convert->resultType : MkClassType(convert->convert->_class->fullName);
-if(exp->destType->casted)
-exp->needCast = 0x1;
-if(convert->resultType)
-convert->resultType->refCount++;
-}
-}
+e = (*e->__anon1.list).last;
}
-if(exp->isConstant && inCompiler)
-ComputeExpression(exp);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(&converts, FreeConvert);
}
-if(!result && exp->expType && converts.count)
+if(exp->__anon1.op.op == 261 && e && e->expType)
+{
+if(e->type == 3 && e->__anon1.__anon2.string)
{
-result = MatchTypes(exp->expType, exp->destType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst);
+char * string = e->__anon1.__anon2.string;
+int len = strlen(string);
+char * tmp = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (len - 2 + 1));
+
+len = UnescapeString(tmp, string + 1, len - 2);
+(__ecereNameSpace__ecere__com__eSystem_Delete(tmp), tmp = 0);
+FreeExpContents(exp);
+exp->type = 2;
+exp->__anon1.__anon1.constant = PrintUInt(len + 1);
}
-if(!result && exp->expType && exp->destType)
+else
{
-if((exp->destType->kind == 8 && exp->expType->kind == 13 && exp->expType->__anon1.type->kind == 8 && exp->expType->__anon1.type->__anon1._class == exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && exp->destType->__anon1._class->__anon1.registered->type == 1) || (exp->expType->kind == 8 && exp->destType->kind == 13 && exp->destType->__anon1.type->kind == 8 && exp->destType->__anon1.type->__anon1._class == exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1))
-result = 0x1;
+struct Type * type = e->expType;
+
+type->refCount++;
+FreeExpContents(exp);
+exp->type = 2;
+exp->__anon1.__anon1.constant = PrintUInt(ComputeTypeSize(type));
+FreeType(type);
}
+break;
}
-return result;
+else
+ComputeExpression(exp->__anon1.op.exp2);
}
-
-extern struct Expression * GetNonBracketsExp(struct Expression * exp);
-
-extern struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements);
-
-extern struct Statement * MkExpressionStmt(struct __ecereNameSpace__ecere__sys__OldList * expressions);
-
-extern struct Expression * MkExpMember(struct Expression * expression, struct Identifier * member);
-
-void CheckTemplateTypes(struct Expression * exp)
-{
-struct Expression * nbExp = GetNonBracketsExp(exp);
-
-if(exp->destType && exp->destType->passAsTemplate && exp->expType && exp->expType->kind != 20 && !exp->expType->passAsTemplate && (nbExp == exp || nbExp->type != 11))
-{
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-struct Context * context;
-
-*newExp = *exp;
-if(exp->destType)
-exp->destType->refCount++;
-if(exp->expType)
-exp->expType->refCount++;
-newExp->prev = (((void *)0));
-newExp->next = (((void *)0));
-switch(exp->expType->kind)
+if(exp->__anon1.op.exp1)
{
-case 7:
-if(exp->destType->classObjectType)
+ComputeExpression(exp->__anon1.op.exp1);
+exp1 = exp->__anon1.op.exp1;
+exp2 = exp->__anon1.op.exp2;
+op1 = GetOperand(exp1);
+if(op1.type)
+op1.type->refCount++;
+if(exp2)
{
-if(exp->destType)
-exp->destType->refCount--;
-if(exp->expType)
-exp->expType->refCount--;
-((newExp ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)newExp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(newExp)) : 0), newExp = 0);
+op2 = GetOperand(exp2);
+if(op2.type)
+op2.type->refCount++;
+}
}
else
{
-struct __ecereNameSpace__ecere__sys__OldList * specs;
-struct __ecereNameSpace__ecere__sys__OldList * unionDefs = MkList();
-struct __ecereNameSpace__ecere__sys__OldList * statements = MkList();
-
-context = PushContext();
-ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(DOUBLE)), MkListOne(MkDeclaratorIdentifier(MkIdentifier("d"))), (((void *)0)))));
-ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifierName("uint64")), MkListOne(MkDeclaratorIdentifier(MkIdentifier("i"))), (((void *)0)))));
-specs = MkListOne(MkStructOrUnion(4, (((void *)0)), unionDefs));
-exp->type = 23;
-exp->__anon1.compound = MkCompoundStmt(MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_union")), (((void *)0)))))), statements);
-ListAdd(statements, MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("d")), '=', newExp))));
-ListAdd(statements, MkExpressionStmt(MkListOne(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("i")))));
-exp->__anon1.compound->__anon1.compound.context = context;
-PopContext(context);
+exp1 = exp->__anon1.op.exp2;
+op1 = GetOperand(exp1);
+if(op1.type)
+op1.type->refCount++;
}
+CallOperator(exp, exp1, exp2, &op1, &op2);
+if(op1.type)
+FreeType(op1.type);
+if(op2.type)
+FreeType(op2.type);
break;
-default:
-exp->type = 11;
-exp->__anon1.cast.typeName = MkTypeName(MkListOne(MkSpecifierName("uint64")), (((void *)0)));
-exp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp));
-exp->needCast = 0x1;
-break;
-}
}
-else if(exp->expType && exp->expType->passAsTemplate && exp->destType && ((unsigned int)((exp->usage & 0x1) >> 0)) && exp->destType->kind != 20 && !exp->destType->passAsTemplate)
+case 5:
+case 32:
{
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-struct Context * context;
+struct Expression * e, * n;
-*newExp = *exp;
-if(exp->destType)
-exp->destType->refCount++;
-if(exp->expType)
-exp->expType->refCount++;
-newExp->prev = (((void *)0));
-newExp->next = (((void *)0));
-switch(exp->expType->kind)
+for(e = (*exp->__anon1.list).first; e; e = n)
{
-case 7:
-if(exp->destType->classObjectType)
+n = e->next;
+if(!n)
{
-if(exp->destType)
-exp->destType->refCount--;
-if(exp->expType)
-exp->expType->refCount--;
-((newExp ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)newExp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(newExp)) : 0), newExp = 0);
+struct __ecereNameSpace__ecere__sys__OldList * list = exp->__anon1.list;
+struct Expression * prev = exp->prev;
+struct Expression * next = exp->next;
+
+if(exp->expType && exp->expType->kind == 8 && (!e->expType || e->expType->kind != 8))
+{
+FreeType(e->expType);
+e->expType = exp->expType;
+e->expType->refCount++;
+}
+ComputeExpression(e);
+FreeType(exp->expType);
+FreeType(exp->destType);
+*exp = *e;
+exp->prev = prev;
+exp->next = next;
+((e ? __extension__ ({
+void * __ecerePtrToDelete = (e);
+
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), e = 0);
+(__ecereNameSpace__ecere__com__eSystem_Delete(list), list = 0);
}
else
{
-struct __ecereNameSpace__ecere__sys__OldList * specs;
-struct __ecereNameSpace__ecere__sys__OldList * unionDefs = MkList();
-struct __ecereNameSpace__ecere__sys__OldList * statements = MkList();
-
-context = PushContext();
-ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(DOUBLE)), MkListOne(MkDeclaratorIdentifier(MkIdentifier("d"))), (((void *)0)))));
-ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifierName("uint64")), MkListOne(MkDeclaratorIdentifier(MkIdentifier("i"))), (((void *)0)))));
-specs = MkListOne(MkStructOrUnion(4, (((void *)0)), unionDefs));
-exp->type = 23;
-exp->__anon1.compound = MkCompoundStmt(MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_union")), (((void *)0)))))), statements);
-ListAdd(statements, MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("i")), '=', newExp))));
-ListAdd(statements, MkExpressionStmt(MkListOne(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("d")))));
-exp->__anon1.compound->__anon1.compound.context = context;
-PopContext(context);
+FreeExpression(e);
+}
}
break;
+}
case 8:
{
-if(exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1)
+struct Expression * memberExp = exp->__anon1.member.exp;
+struct Identifier * memberID = exp->__anon1.member.member;
+struct Type * type;
+
+ComputeExpression(exp->__anon1.member.exp);
+type = exp->__anon1.member.exp->expType;
+if(type)
{
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp->expType->__anon1._class->string)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), newExp)));
-ProcessExpressionType((*exp->__anon1.list).first);
-break;
+struct __ecereNameSpace__ecere__com__Class * _class = (exp->__anon1.member.member && exp->__anon1.member.member->classSym) ? exp->__anon1.member.member->classSym->__anon1.registered : (((type->kind == 8 || type->kind == 19) && type->__anon1._class) ? type->__anon1._class->__anon1.registered : (((void *)0)));
+struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * convertTo = (((void *)0));
+
+if(type->kind == 19 && exp->__anon1.member.exp->type == 24)
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::com::Class");
+if(!_class)
+{
+char string[256];
+struct Symbol * classSym;
+
+string[0] = '\0';
+PrintTypeNoConst(type, string, 0, 1);
+classSym = FindClass(string);
+_class = classSym ? classSym->__anon1.registered : (((void *)0));
}
-else
+if(exp->__anon1.member.member)
{
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp->expType->__anon1._class->string)), (((void *)0))), newExp));
-exp->needTemplateCast = 2;
-newExp->needCast = 0x1;
-newExp->needTemplateCast = 2;
-ProcessExpressionType((*exp->__anon1.list).first);
-break;
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, exp->__anon1.member.member->string, privateModule);
+if(!prop)
+member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, exp->__anon1.member.member->string, privateModule, (((void *)0)), (((void *)0)));
}
+if(!prop && !member && _class && exp->__anon1.member.member)
+{
+struct Symbol * classSym = FindClass(exp->__anon1.member.member->string);
+
+convertTo = _class;
+_class = classSym ? classSym->__anon1.registered : (((void *)0));
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, convertTo->fullName, privateModule);
}
-default:
+if(prop)
{
-if(exp->expType->kind == 20)
+if(prop->compiled)
{
-struct Type * type = ProcessTemplateParameterType(exp->expType->__anon1.templateParameter);
+struct Type * type = prop->dataType;
-if(type)
+if(_class->type == 3)
{
-FreeType(exp->destType);
-FreeType(exp->expType);
-((newExp ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)newExp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(newExp)) : 0), newExp = 0);
-break;
+if(type->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+
+if(_class->type == 3)
+{
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+type = _class->dataType;
}
}
-if(newExp->type == 8 && newExp->__anon1.member.memberType == 3)
+switch(type->kind)
{
-exp->type = 4;
-exp->__anon1.op.op = '*';
-exp->__anon1.op.exp1 = (((void *)0));
-exp->__anon1.op.exp2 = MkExpCast(MkTypeName(MkListOne(MkSpecifierName("uint64")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(MkExpOp((((void *)0)), '&', newExp))));
-}
-else
+case 6:
{
-char typeString[1024];
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+float value;
+float (* Get)(float) = (void *)prop->Get;
-typeString[0] = '\0';
-PrintType(exp->expType, typeString, 0x0, 0x0);
-decl = SpecDeclFromString(typeString, specs, (((void *)0)));
-exp->type = 11;
-exp->__anon1.cast.typeName = MkTypeName(specs, decl);
-exp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp));
-exp->__anon1.cast.exp->needCast = 0x1;
+GetFloat(exp->__anon1.member.exp, &value);
+exp->__anon1.__anon1.constant = PrintFloat(Get ? Get(value) : value);
+exp->type = 2;
+break;
}
+case 7:
+{
+double value;
+double (* Get)(double);
+
+GetDouble(exp->__anon1.member.exp, &value);
+if(convertTo)
+Get = (void *)prop->Set;
+else
+Get = (void *)prop->Get;
+exp->__anon1.__anon1.constant = PrintDouble(Get ? Get(value) : value);
+exp->type = 2;
break;
}
}
}
-}
-
-extern int strncmp(const char * , const char * , size_t n);
-
-struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindPrefix(struct __ecereNameSpace__ecere__sys__BinaryTree * this, const char * key);
-
-static struct Symbol * ScanWithNameSpace(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, const char * nameSpace, const char * name)
+else
{
-int nsLen = strlen(nameSpace);
-struct Symbol * symbol;
-
-for(symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindPrefix(tree, nameSpace); symbol; symbol = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)symbol)))
+if(convertTo)
{
-char * s = symbol->string;
+struct Expression * value = exp->__anon1.member.exp;
+struct Type * type;
-if(!strncmp(s, nameSpace, nsLen))
+if(!prop->dataType)
+ProcessPropertyType(prop);
+type = prop->dataType;
+if(!type)
{
-int c;
-char * namePart;
+}
+else if(_class->type == 1)
+{
+switch(type->kind)
+{
+case 8:
+{
+struct __ecereNameSpace__ecere__com__Class * propertyClass = type->__anon1._class->__anon1.registered;
-for(c = strlen(s) - 1; c >= 0; c--)
-if(s[c] == ':')
-break;
-namePart = s + c + 1;
-if(!strcmp(namePart, name))
+if(propertyClass->type == 1 && value->type == 1)
{
-return symbol;
-}
+void (* Set)(void *, void *) = (void *)prop->Set;
+
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+Set(exp->__anon1.instance->data, value->__anon1.instance->data);
+PopulateInstance(exp->__anon1.instance);
}
-else
break;
}
-return (((void *)0));
-}
+case 3:
+{
+int intValue;
+void (* Set)(void *, int) = (void *)prop->Set;
-static struct Symbol * FindWithNameSpace(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, const char * name)
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+GetInt(value, &intValue);
+Set(exp->__anon1.instance->data, intValue);
+PopulateInstance(exp->__anon1.instance);
+break;
+}
+case 4:
{
-int c;
-char nameSpace[1024];
-const char * namePart;
-unsigned int gotColon = 0x0;
+long long intValue;
+void (* Set)(void *, long long) = (void *)prop->Set;
-nameSpace[0] = '\0';
-for(c = strlen(name) - 1; c >= 0; c--)
-if(name[c] == ':')
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+GetInt64(value, &intValue);
+Set(exp->__anon1.instance->data, intValue);
+PopulateInstance(exp->__anon1.instance);
+break;
+}
+case 22:
{
-gotColon = 0x1;
+intptr_t intValue;
+void (* Set)(void *, intptr_t) = (void *)prop->Set;
+
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+GetIntPtr(value, &intValue);
+Set(exp->__anon1.instance->data, intValue);
+PopulateInstance(exp->__anon1.instance);
break;
}
-namePart = name + c + 1;
-while(c >= 0 && name[c] == ':')
-c--;
-if(c >= 0)
+case 23:
{
-struct Symbol * symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(tree, name);
+ssize_t intValue;
+void (* Set)(void *, ssize_t) = (void *)prop->Set;
-if(symbol)
-return symbol;
-memcpy(nameSpace, name, c + 1);
-nameSpace[c + 1] = (char)0;
-return ScanWithNameSpace(tree, nameSpace, namePart);
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+GetIntSize(value, &intValue);
+Set(exp->__anon1.instance->data, intValue);
+PopulateInstance(exp->__anon1.instance);
+break;
}
-else if(gotColon)
+case 6:
{
-struct Symbol * symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(tree, namePart);
+float floatValue;
+void (* Set)(void *, float) = (void *)prop->Set;
-return symbol;
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+GetFloat(value, &floatValue);
+Set(exp->__anon1.instance->data, floatValue);
+PopulateInstance(exp->__anon1.instance);
+break;
}
-else
+case 7:
{
-struct Symbol * symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(tree, namePart);
+double doubleValue;
+void (* Set)(void *, double) = (void *)prop->Set;
-if(symbol)
-return symbol;
-return ScanWithNameSpace(tree, "", namePart);
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+GetDouble(value, &doubleValue);
+Set(exp->__anon1.instance->data, doubleValue);
+PopulateInstance(exp->__anon1.instance);
+break;
}
-return (((void *)0));
}
-
-static void ProcessDeclaration(struct Declaration * decl);
-
-struct Symbol * FindSymbol(const char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace)
+}
+else if(_class->type == 2)
{
-struct Context * ctx;
-struct Symbol * symbol = (((void *)0));
-
-for(ctx = startContext; ctx && !symbol; ctx = ctx->parent)
+switch(type->kind)
{
-if(ctx == globalContext && !globalNameSpace && ctx->hasNameSpace)
+case 8:
{
-symbol = (((void *)0));
-if(thisNameSpace)
+struct __ecereNameSpace__ecere__com__Class * propertyClass = type->__anon1._class->__anon1.registered;
+
+if(propertyClass->type == 1 && value->__anon1.instance->data)
{
-char curName[1024];
+unsigned int (* Set)(void *) = (void *)prop->Set;
+unsigned int bits = Set(value->__anon1.instance->data);
-strcpy(curName, thisNameSpace);
-strcat(curName, "::");
-strcat(curName, name);
-symbol = FindWithNameSpace(isStruct ? &ctx->structSymbols : &ctx->symbols, curName);
-}
-if(!symbol)
-symbol = FindWithNameSpace(isStruct ? &ctx->structSymbols : &ctx->symbols, name);
-}
-else
-symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString((isStruct ? &ctx->structSymbols : &ctx->symbols), name);
-if(symbol || ctx == endContext)
+exp->__anon1.__anon1.constant = PrintHexUInt(bits);
+exp->type = 2;
break;
}
-if(inCompiler && curExternal && symbol && ctx == globalContext && curExternal->symbol && symbol->id > curExternal->symbol->idCode && symbol->__anon2.__anon1.pointerExternal)
-{
-if(symbol->__anon2.__anon1.pointerExternal->type == 0)
+else if(_class->type == 2)
{
-struct FunctionDefinition * function = symbol->__anon2.__anon1.pointerExternal->__anon1.function;
-struct Context * tmpContext = curContext;
+unsigned int value;
+unsigned int (* Set)(unsigned int) = (void *)prop->Set;
+unsigned int bits;
-curContext = (((void *)0));
-symbol->__anon2.__anon1.pointerExternal = MkExternalDeclaration(MkDeclaration(CopyList(function->specifiers, CopySpecifier), MkListOne(MkInitDeclarator(CopyDeclarator(function->declarator), (((void *)0))))));
-curContext = tmpContext;
-symbol->__anon2.__anon1.pointerExternal->symbol = symbol;
-DeclareType(symbol->type, 0x1, 0x1);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, symbol->__anon2.__anon1.pointerExternal);
-symbol->id = curExternal->symbol->idCode;
+GetUInt(exp->__anon1.member.exp, &value);
+bits = Set(value);
+exp->__anon1.__anon1.constant = PrintHexUInt(bits);
+exp->type = 2;
}
-else if(symbol->__anon2.__anon1.pointerExternal->type == 1 && curExternal->symbol->idCode < symbol->__anon2.__anon1.pointerExternal->symbol->id)
-{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Move((&*ast), symbol->__anon2.__anon1.pointerExternal, curExternal->prev);
-symbol->id = curExternal->symbol->idCode;
}
}
-return symbol;
}
-
-static void GetTypeSpecs(struct Type * type, struct __ecereNameSpace__ecere__sys__OldList * specs)
+}
+else
{
-if(!type->isSigned && type->kind != 22 && type->kind != 23)
-ListAdd(specs, MkSpecifier(UNSIGNED));
+if(_class->type == 2)
+{
+unsigned int value;
+
+GetUInt(exp->__anon1.member.exp, &value);
switch(type->kind)
{
case 8:
{
-if(type->__anon1._class->__anon1.registered)
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+
+if(_class->type == 1)
{
-if(!type->__anon1._class->__anon1.registered->dataType)
-type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-GetTypeSpecs(type->__anon1._class->__anon1.registered->dataType, specs);
-}
-break;
+void (* Get)(unsigned int, void *) = (void *)prop->Get;
+
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+Get(value, exp->__anon1.instance->data);
+PopulateInstance(exp->__anon1.instance);
+}
+else if(_class->type == 2)
+{
+unsigned int (* Get)(unsigned int) = (void *)prop->Get;
+uint64 bits = Get(value);
+
+exp->__anon1.__anon1.constant = PrintHexUInt64(bits);
+exp->type = 2;
}
-case 7:
-ListAdd(specs, MkSpecifier(DOUBLE));
-break;
-case 6:
-ListAdd(specs, MkSpecifier(FLOAT));
-break;
-case 1:
-ListAdd(specs, MkSpecifier(CHAR));
-break;
-case 24:
-ListAdd(specs, MkSpecifier(_BOOL));
-break;
-case 2:
-ListAdd(specs, MkSpecifier(SHORT));
-break;
-case 4:
-ListAdd(specs, MkSpecifier(INT64));
-break;
-case 22:
-ListAdd(specs, MkSpecifierName(type->isSigned ? "intptr" : "uintptr"));
-break;
-case 23:
-ListAdd(specs, MkSpecifierName(type->isSigned ? "intsize" : "uintsize"));
-break;
-case 3:
-default:
-ListAdd(specs, MkSpecifier(INT));
break;
}
}
-
-static void PrintArraySize(struct Type * arrayType, char * string)
-{
-char size[256];
-
-size[0] = '\0';
-strcat(size, "[");
-if(arrayType->__anon1.__anon4.enumClass)
-strcat(size, arrayType->__anon1.__anon4.enumClass->string);
-else if(arrayType->__anon1.__anon4.arraySizeExp)
-PrintExpression(arrayType->__anon1.__anon4.arraySizeExp, size);
-strcat(size, "]");
-strcat(string, size);
}
-
-static void PrintTypeSpecs(struct Type * type, char * string, unsigned int fullName, unsigned int printConst)
-{
-if(type)
+else if(_class->type == 1)
{
-if(printConst && type->constant)
-strcat(string, "const ");
+unsigned char * value = (exp->__anon1.member.exp->type == 1) ? exp->__anon1.member.exp->__anon1.instance->data : (((void *)0));
+
switch(type->kind)
{
case 8:
{
-struct Symbol * c = type->__anon1._class;
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
-if(type->classObjectType == 2)
-strcat(string, "typed_object");
-else if(type->classObjectType == 3)
-strcat(string, "any_object");
-else
+if(_class->type == 1 && value)
{
-if(c && c->string)
-strcat(string, (fullName || !c->__anon1.registered) ? c->string : c->__anon1.registered->name);
+void (* Get)(void *, void *) = (void *)prop->Get;
+
+exp->__anon1.instance = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+exp->__anon1.instance->data = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(unsigned char) * (_class->structSize));
+exp->__anon1.instance->_class = MkSpecifierName(_class->fullName);
+exp->__anon1.instance->loc = exp->loc;
+exp->type = 1;
+Get(value, exp->__anon1.instance->data);
+PopulateInstance(exp->__anon1.instance);
}
-if(type->byReference)
-strcat(string, " &");
break;
}
-case 0:
-strcat(string, "void");
-break;
-case 3:
-strcat(string, type->isSigned ? "int" : "uint");
-break;
-case 4:
-strcat(string, type->isSigned ? "int64" : "uint64");
-break;
-case 22:
-strcat(string, type->isSigned ? "intptr" : "uintptr");
-break;
-case 23:
-strcat(string, type->isSigned ? "intsize" : "uintsize");
-break;
-case 1:
-strcat(string, type->isSigned ? "char" : "byte");
-break;
-case 24:
-strcat(string, "_Bool");
-break;
-case 2:
-strcat(string, type->isSigned ? "short" : "uint16");
-break;
-case 6:
-strcat(string, "float");
-break;
-case 7:
-strcat(string, "double");
-break;
-case 9:
-if(type->__anon1.__anon1.enumName)
-{
-strcat(string, "struct ");
-strcat(string, type->__anon1.__anon1.enumName);
}
-else if(type->typeName)
-strcat(string, type->typeName);
-else
-{
-struct Type * member;
-
-strcat(string, "struct { ");
-for(member = type->__anon1.__anon1.members.first; member; member = member->next)
-{
-PrintType(member, string, 0x1, fullName);
-strcat(string, "; ");
}
-strcat(string, "}");
}
-break;
-case 10:
-if(type->__anon1.__anon1.enumName)
-{
-strcat(string, "union ");
-strcat(string, type->__anon1.__anon1.enumName);
}
-else if(type->typeName)
-strcat(string, type->typeName);
+}
else
{
-strcat(string, "union ");
-strcat(string, "(unnamed)");
+exp->isConstant = 0;
}
-break;
-case 15:
-if(type->__anon1.__anon1.enumName)
+}
+else if(member)
{
-strcat(string, "enum ");
-strcat(string, type->__anon1.__anon1.enumName);
}
-else if(type->typeName)
-strcat(string, type->typeName);
-else
-strcat(string, "int");
-break;
-case 14:
-strcat(string, "...");
-break;
-case 19:
-strcat(string, "subclass(");
-strcat(string, type->__anon1._class ? type->__anon1._class->string : "int");
-strcat(string, ")");
-break;
-case 20:
-strcat(string, type->__anon1.templateParameter->identifier->string);
-break;
-case 21:
-strcat(string, "thisclass");
-break;
-case 17:
-strcat(string, "__builtin_va_list");
-break;
}
+if(exp->type != 8)
+{
+FreeExpression(memberExp);
+FreeIdentifier(memberID);
}
+break;
}
+case 10:
+{
+struct Type * type = ProcessType(exp->__anon1.typeName->qualifiers, exp->__anon1.typeName->declarator);
-extern char * __ecereNameSpace__ecere__sys__RSearchString(const char * buffer, const char * subStr, int maxLen, unsigned int matchCase, unsigned int matchWord);
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUInt(ComputeTypeSize(type));
+exp->type = 2;
+FreeType(type);
+break;
+}
+case 15:
+{
+struct Symbol * classSym = exp->__anon1._class->__anon1.__anon1.symbol;
-static void PrintName(struct Type * type, char * string, unsigned int fullName)
+if(classSym && classSym->__anon1.registered)
{
-if(type->name && type->name[0])
+if(classSym->__anon1.registered->fixed)
{
-if(fullName)
-strcat(string, type->name);
+FreeSpecifier(exp->__anon1._class);
+exp->__anon1.__anon1.constant = PrintUInt(classSym->__anon1.registered->templateClass ? classSym->__anon1.registered->templateClass->structSize : classSym->__anon1.registered->structSize);
+exp->type = 2;
+}
else
{
-char * name = __ecereNameSpace__ecere__sys__RSearchString(type->name, "::", strlen(type->name), 0x1, 0x0);
+char className[1024];
-if(name)
-name += 2;
-else
-name = type->name;
-strcat(string, name);
+strcpy(className, "__ecereClass_");
+FullClassNameCat(className, classSym->string, 1);
+DeclareClass(curExternal, classSym, className);
+FreeExpContents(exp);
+exp->type = 9;
+exp->__anon1.member.exp = MkExpIdentifier(MkIdentifier(className));
+exp->__anon1.member.member = MkIdentifier("structSize");
}
}
+break;
}
-
-static void PrintAttribs(struct Type * type, char * string)
+case 11:
{
-if(type)
+struct Type * type;
+struct Expression * e = exp;
+
+if(exp->type == 11)
{
-if(type->dllExport)
-strcat(string, "dllexport ");
-if(type->attrStdcall)
-strcat(string, "stdcall ");
-}
+if(exp->__anon1.cast.exp)
+ComputeExpression(exp->__anon1.cast.exp);
+e = exp->__anon1.cast.exp;
}
-
-static void PrePrintType(struct Type * type, char * string, unsigned int fullName, struct Type * parentType, unsigned int printConst)
+if(e && exp->expType)
{
-if(type->kind == 12 || type->kind == 13 || type->kind == 11 || type->kind == 16)
+type = exp->expType;
+if(type->kind == 8)
{
-if((type->kind == 11 || type->kind == 16) && (!parentType || parentType->kind != 13))
-PrintAttribs(type, string);
-if(printConst && type->constant && (type->kind == 11 || type->kind == 16))
-strcat(string, " const");
-PrePrintType(type->kind == 16 ? type->__anon1.__anon3.method->dataType : type->__anon1.type, string, fullName, type, printConst);
-if(type->kind == 13 && (type->__anon1.type->kind == 12 || type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16))
-strcat(string, " (");
-if(type->kind == 13)
+struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__anon1.registered;
+
+if(_class && (_class->type == 3 || _class->type == 2))
{
-if(type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16)
-PrintAttribs(type->__anon1.type, string);
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+type = _class->dataType;
}
-if(type->kind == 13)
+}
+switch(type->kind)
{
-if(type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16 || type->__anon1.type->kind == 12)
-strcat(string, "*");
-else
-strcat(string, " *");
+case 24:
+case 1:
+if(type->isSigned)
+{
+char value = 0;
+
+if(GetChar(e, &value))
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintChar(value);
+exp->type = 2;
}
-if(printConst && type->constant && type->kind == 13)
-strcat(string, " const");
}
else
-PrintTypeSpecs(type, string, fullName, printConst);
-}
-
-static void PostPrintType(struct Type * type, char * string, unsigned int fullName)
-{
-if(type->kind == 13 && (type->__anon1.type->kind == 12 || type->__anon1.type->kind == 11 || type->__anon1.type->kind == 16))
-strcat(string, ")");
-if(type->kind == 12)
-PrintArraySize(type, string);
-else if(type->kind == 11)
{
-struct Type * param;
+unsigned char value = 0;
-strcat(string, "(");
-for(param = type->__anon1.__anon2.params.first; param; param = param->next)
+if(GetUChar(e, &value))
{
-PrintType(param, string, 0x1, fullName);
-if(param->next)
-strcat(string, ", ");
-}
-strcat(string, ")");
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUChar(value);
+exp->type = 2;
}
-if(type->kind == 12 || type->kind == 13 || type->kind == 11 || type->kind == 16)
-PostPrintType(type->kind == 16 ? type->__anon1.__anon3.method->dataType : type->__anon1.type, string, fullName);
}
+break;
+case 2:
+if(type->isSigned)
+{
+short value = 0;
-static void _PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName, unsigned int printConst)
+if(GetShort(e, &value))
{
-PrePrintType(type, string, fullName, (((void *)0)), printConst);
-if(type->__anon1.__anon2.thisClass || (printName && type->name && type->name[0]))
-strcat(string, " ");
-if((type->__anon1.__anon2.thisClass || type->__anon1.__anon2.staticMethod))
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintShort(value);
+exp->type = 2;
+}
+}
+else
{
-struct Symbol * _class = type->__anon1.__anon2.thisClass;
+unsigned short value = 0;
-if((type->classObjectType == 2 || type->classObjectType == 1) || (_class && !strcmp(_class->string, "class")))
+if(GetUShort(e, &value))
{
-if(type->classObjectType == 1)
-strcat(string, "class");
-else
-strcat(string, type->byReference ? "typed_object&" : "typed_object");
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUShort(value);
+exp->type = 2;
}
-else if(_class && _class->string)
+}
+break;
+case 3:
+if(type->isSigned)
{
-char * s = _class->string;
+int value = 0;
-if(fullName)
-strcat(string, s);
+if(GetInt(e, &value))
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt(value);
+exp->type = 2;
+}
+}
else
{
-char * name = __ecereNameSpace__ecere__sys__RSearchString(s, "::", strlen(s), 0x1, 0x0);
+unsigned int value = 0;
-if(name)
-name += 2;
-else
-name = s;
-strcat(string, name);
-}
+if(GetUInt(e, &value))
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUInt(value);
+exp->type = 2;
}
-strcat(string, "::");
}
-if(printName && type->name)
-PrintName(type, string, fullName);
-PostPrintType(type, string, fullName);
-if(type->bitFieldCount)
+break;
+case 4:
+if(type->isSigned)
{
-char count[100];
+long long value = 0;
-sprintf(count, ":%d", type->bitFieldCount);
-strcat(string, count);
+if(GetInt64(e, &value))
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt64(value);
+exp->type = 2;
}
}
+else
+{
+uint64 value = 0;
-void PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName)
+if(GetUInt64(e, &value))
{
-_PrintType(type, string, printName, fullName, 0x1);
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUInt64(value);
+exp->type = 2;
+}
}
+break;
+case 22:
+if(type->isSigned)
+{
+intptr_t value = 0;
-void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName)
+if(GetIntPtr(e, &value))
{
-_PrintType(type, string, printName, fullName, 0x0);
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt64((long long)value);
+exp->type = 2;
}
-
-static struct Type * FindMember(struct Type * type, char * string)
+}
+else
{
-struct Type * memberType;
+uintptr_t value = 0;
-for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
+if(GetUIntPtr(e, &value))
{
-if(!memberType->name)
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUInt64((uint64)value);
+exp->type = 2;
+}
+}
+break;
+case 23:
+if(type->isSigned)
{
-struct Type * subType = FindMember(memberType, string);
+ssize_t value = 0;
-if(subType)
-return subType;
-}
-else if(!strcmp(memberType->name, string))
-return memberType;
+if(GetIntSize(e, &value))
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintInt64((long long)value);
+exp->type = 2;
}
-return (((void *)0));
}
-
-struct Type * FindMemberAndOffset(struct Type * type, char * string, unsigned int * offset)
+else
{
-struct Type * memberType;
+size_t value = 0;
-for(memberType = type->__anon1.__anon1.members.first; memberType; memberType = memberType->next)
+if(GetUIntSize(e, &value))
{
-if(!memberType->name)
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintUInt64((uint64)value);
+exp->type = 2;
+}
+}
+break;
+case 6:
{
-struct Type * subType = FindMember(memberType, string);
+float value = 0;
-if(subType)
+if(GetFloat(e, &value))
{
-*offset += memberType->offset;
-return subType;
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintFloat(value);
+exp->type = 2;
}
+break;
}
-else if(!strcmp(memberType->name, string))
+case 7:
{
-*offset += memberType->offset;
-return memberType;
+double value = 0;
+
+if(GetDouble(e, &value))
+{
+FreeExpContents(exp);
+exp->__anon1.__anon1.constant = PrintDouble(value);
+exp->type = 2;
}
+break;
}
-return (((void *)0));
}
-
-extern unsigned int parseError;
-
-unsigned int GetParseError()
-{
-return parseError;
}
-
-extern struct __ecereNameSpace__ecere__com__Instance * fileInput;
-
-int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Write;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__File;
-
-struct Expression * ParseExpressionString(char * expression)
-{
-parseError = 0x0;
-fileInput = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
-((int (*)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
-
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write])(fileInput, expression, 1, strlen(expression));
-((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
-
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(fileInput, 0, 0);
-echoOn = 0x0;
-parsedExpression = (((void *)0));
-resetScanner();
-expression_yyparse();
-(__ecereNameSpace__ecere__com__eInstance_DecRef(fileInput), fileInput = 0);
-return parsedExpression;
+break;
}
-
-extern char * QMkString(const char * source);
-
-static unsigned int ResolveIdWithClass(struct Expression * exp, struct __ecereNameSpace__ecere__com__Class * _class, unsigned int skipIDClassCheck)
+case 12:
{
-struct Identifier * id = exp->__anon1.__anon1.identifier;
-struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
-struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
-struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0));
-
-if(_class && _class->type == 4)
+struct Operand op1 =
{
-struct __ecereNameSpace__ecere__sys__NamedLink * value = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-
-if(enumClass)
+0, 0, 0,
+.__anon1 = {
+.c = 0
+},
{
-struct __ecereNameSpace__ecere__com__Class * baseClass;
-
-for(baseClass = _class; baseClass && baseClass->type == 4; baseClass = baseClass->base)
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+}
+};
+struct Operand op2 =
{
-struct __ecereNameSpace__ecere__com__EnumClassData * e = (baseClass ? ((void *)(((char *)baseClass->data) + enumClass->offsetClass)) : (((void *)0)));
-
-for(value = e->values.first; value; value = value->next)
+0, 0, 0,
+.__anon1 = {
+.c = 0
+},
{
-if(!strcmp(value->name, id->string))
-break;
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
}
-if(value)
+};
+struct Operand op3 =
{
-char constant[256];
+0, 0, 0,
+.__anon1 = {
+.c = 0
+},
+{
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+}
+};
+if(exp->__anon1.cond.exp)
+ComputeExpression((*exp->__anon1.cond.exp).last);
+if(exp->__anon1.cond.elseExp)
+ComputeExpression(exp->__anon1.cond.elseExp);
+if(exp->__anon1.cond.cond)
+ComputeExpression(exp->__anon1.cond.cond);
+op1 = GetOperand(exp->__anon1.cond.cond);
+if(op1.type)
+op1.type->refCount++;
+op2 = GetOperand((*exp->__anon1.cond.exp).last);
+if(op2.type)
+op2.type->refCount++;
+op3 = GetOperand(exp->__anon1.cond.elseExp);
+if(op3.type)
+op3.type->refCount++;
+if(op1.ops.Cond)
+{
FreeExpContents(exp);
-exp->type = 2;
-exp->isConstant = 0x1;
-if(!strcmp(baseClass->dataTypeString, "int"))
-sprintf(constant, "%d", (int)value->data);
-else
-sprintf(constant, "0x%X", (int)value->data);
-exp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
-exp->expType = MkClassType(baseClass->fullName);
+op1.ops.Cond(exp, &op1, &op2, &op3);
+}
+if(op1.type)
+FreeType(op1.type);
+if(op2.type)
+FreeType(op2.type);
+if(op3.type)
+FreeType(op3.type);
break;
}
}
}
-if(value)
-return 0x1;
-}
-if((method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule)))
+
+unsigned int MatchWithEnums_Module(struct __ecereNameSpace__ecere__com__Instance * mainModule, struct Expression * sourceExp, struct Type * dest, char * string, struct __ecereNameSpace__ecere__sys__OldList * conversions)
{
-ProcessMethodType(method);
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct __ecereNameSpace__ecere__com__Instance * module;
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 16, __ecereInstance1->__anon1.__anon3.method = method, __ecereInstance1->__anon1.__anon3.methodClass = (skipIDClassCheck || (id && id->_class)) ? _class : (((void *)0)), __ecereInstance1;
-});
-return 0x1;
-}
-else if((prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule)))
+if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application + sizeof(struct __ecereNameSpace__ecere__com__Module) + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->systemNameSpace, sourceExp, dest, string, conversions))
+return 1;
+if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->privateNameSpace, sourceExp, dest, string, conversions))
+return 1;
+if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->publicNameSpace, sourceExp, dest, string, conversions))
+return 1;
+for(module = ((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application + sizeof(struct __ecereNameSpace__ecere__com__Module) + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->allModules.first; module; module = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->next)
{
-if(!prop->dataType)
-ProcessPropertyType(prop);
-exp->expType = prop->dataType;
-if(prop->dataType)
-prop->dataType->refCount++;
-return 0x1;
+if(ModuleVisibility(mainModule, module) && MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->publicNameSpace, sourceExp, dest, string, conversions))
+return 1;
}
-else if((member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)))))
-{
-if(!member->dataType)
-member->dataType = ProcessTypeString(member->dataTypeString, 0x0);
-exp->expType = member->dataType;
-if(member->dataType)
-member->dataType->refCount++;
-return 0x1;
+return 0;
}
-else if((classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(_class, id->string)))
-{
-if(!classProp->dataType)
-classProp->dataType = ProcessTypeString(classProp->dataTypeString, 0x0);
-if(classProp->constant)
+
+unsigned int MatchTypeExpression(struct Expression * sourceExp, struct Type * dest, struct __ecereNameSpace__ecere__sys__OldList * conversions, unsigned int skipUnitBla, unsigned int warnConst)
{
-FreeExpContents(exp);
-exp->isConstant = 0x1;
-if(classProp->dataType->kind == 13 && classProp->dataType->__anon1.type->kind == 1)
+struct Type * source;
+struct Type * realDest = dest;
+struct Type * backupSourceExpType = (((void *)0));
+struct Expression * nbExp = GetNonBracketsExp(sourceExp);
+struct Expression * computedExp = nbExp;
+
+dest->refCount++;
+if(sourceExp->isConstant && sourceExp->type != 2 && sourceExp->type != 0 && sourceExp->type != 11 && dest->kind == 8 && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4)
{
-exp->type = 3;
-exp->__anon1.__anon1.constant = QMkString((char *)classProp->Get(_class));
+computedExp = CopyExpression(nbExp);
+ComputeExpression(computedExp);
}
-else
+source = sourceExp->expType;
+if(dest->kind == 13 && sourceExp->type == 2 && !strtoul(sourceExp->__anon1.__anon1.constant, (((void *)0)), 0))
{
-char constant[256];
-
-exp->type = 2;
-sprintf(constant, "%d", (int)classProp->Get(_class));
-exp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant);
+if(computedExp != nbExp)
+{
+FreeExpression(computedExp);
+computedExp = nbExp;
}
+FreeType(dest);
+return 1;
}
-else
+if(!skipUnitBla && source && dest && source->kind == 8 && dest->kind == 8)
+{
+if(source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 3)
+{
+struct __ecereNameSpace__ecere__com__Class * sourceBase, * destBase;
+
+for(sourceBase = source->__anon1._class->__anon1.registered; sourceBase && sourceBase->base && sourceBase->base->type != 1000; sourceBase = sourceBase->base)
+;
+for(destBase = dest->__anon1._class->__anon1.registered; destBase && destBase->base && destBase->base->type != 1000; destBase = destBase->base)
+;
+if(sourceBase == destBase)
+{
+if(computedExp != nbExp)
{
+FreeExpression(computedExp);
+computedExp = nbExp;
}
-exp->expType = classProp->dataType;
-if(classProp->dataType)
-classProp->dataType->refCount++;
-return 0x1;
+FreeType(dest);
+return 1;
}
-return 0x0;
}
-
-static struct GlobalData * ScanGlobalData(struct __ecereNameSpace__ecere__com__NameSpace * nameSpace, char * name)
+}
+if(source)
{
-struct __ecereNameSpace__ecere__sys__BinaryTree * tree = &nameSpace->functions;
-struct GlobalData * data = (struct GlobalData *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString((&*tree), name);
-struct __ecereNameSpace__ecere__com__NameSpace * child;
+struct __ecereNameSpace__ecere__sys__OldList * specs;
+unsigned int flag = 0;
+long long value = (((int)0x7fffffff));
-if(!data)
-{
-for(child = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->nameSpaces); child; child = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)child)))
+source->refCount++;
+if(computedExp->type == 2)
{
-data = ScanGlobalData(child, name);
-if(data)
-break;
+if(source->isSigned)
+value = strtoll(computedExp->__anon1.__anon1.constant, (((void *)0)), 0);
+else
+value = strtoull(computedExp->__anon1.__anon1.constant, (((void *)0)), 0);
}
+else if(computedExp->type == 4 && computedExp->__anon1.op.op == '-' && !computedExp->__anon1.op.exp1 && computedExp->__anon1.op.exp2 && computedExp->__anon1.op.exp2->type == 2)
+{
+if(source->isSigned)
+value = -strtoll(computedExp->__anon1.op.exp2->__anon1.__anon1.constant, (((void *)0)), 0);
+else
+value = -strtoull(computedExp->__anon1.op.exp2->__anon1.__anon1.constant, (((void *)0)), 0);
}
-return data;
+if(computedExp != nbExp)
+{
+FreeExpression(computedExp);
+computedExp = nbExp;
}
+if(dest->kind != 8 && source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && !strcmp(source->__anon1._class->__anon1.registered->fullName, "unichar"))
+{
+FreeType(source);
+source = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-extern struct __ecereNameSpace__ecere__com__NameSpace * globalData;
-
-extern char * strncpy(char * , const char * , size_t n);
+__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0, __ecereInstance1->refCount = 1, __ecereInstance1;
+});
+}
+if(dest->kind == 8)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0));
-static struct GlobalData * FindGlobalData(char * name)
+if(_class && _class->type == 3)
{
-int start = 0, c;
-struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
+if(source->kind != 8)
+{
+struct Type * tempType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Type * tempDest, * tempSource;
-nameSpace = globalData;
-for(c = 0; name[c]; c++)
+for(; _class->base->type != 1000; _class = _class->base)
+;
+tempSource = dest;
+tempDest = tempType;
+tempType->kind = 8;
+if(!_class->symbol)
+_class->symbol = FindClass(_class->fullName);
+tempType->__anon1._class = _class->symbol;
+tempType->truth = dest->truth;
+if(tempType->__anon1._class)
+MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst);
+backupSourceExpType = sourceExp->expType;
+if(dest->passAsTemplate)
{
-if(name[c] == '.' || (name[c] == ':' && name[c + 1] == ':'))
+sourceExp->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(sourceExp->expType, dest);
+sourceExp->expType->passAsTemplate = 0;
+}
+else
{
-struct __ecereNameSpace__ecere__com__NameSpace * newSpace;
-char * spaceName = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (c - start + 1));
+sourceExp->expType = dest;
+dest->refCount++;
+}
+flag = 1;
+((tempType ? __extension__ ({
+void * __ecerePtrToDelete = (tempType);
-strncpy(spaceName, name + start, c - start);
-spaceName[c - start] = '\0';
-newSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&(*nameSpace).nameSpaces, spaceName);
-(__ecereNameSpace__ecere__com__eSystem_Delete(spaceName), spaceName = 0);
-if(!newSpace)
-return (((void *)0));
-nameSpace = newSpace;
-if(name[c] == ':')
-c++;
-start = c + 1;
+__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), tempType = 0);
}
}
-if(c - start)
+if(_class && _class->type == 2 && source->kind != 8)
{
-return ScanGlobalData(nameSpace, name + start);
+if(!dest->__anon1._class->__anon1.registered->dataType)
+dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0);
+if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst))
+{
+FreeType(source);
+FreeType(sourceExp->expType);
+source = sourceExp->expType = MkClassType(dest->__anon1._class->string);
+source->refCount++;
}
-return (((void *)0));
}
-
-static int definedExpStackPos;
-
-static void * definedExpStack[512];
-
-void ReplaceExpContents(struct Expression * checkedExp, struct Expression * newExp)
+if(_class && !strcmp(_class->fullName, "ecere::com::Class") && source->kind == 13 && source->__anon1.type && source->__anon1.type->kind == 1 && sourceExp->type == 3)
{
-struct Expression * prev = checkedExp->prev, * next = checkedExp->next;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl;
+char string[1024];
-FreeExpContents(checkedExp);
-FreeType(checkedExp->expType);
-FreeType(checkedExp->destType);
-*checkedExp = *newExp;
-((newExp ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)newExp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(newExp)) : 0), newExp = 0);
-checkedExp->prev = prev;
-checkedExp->next = next;
+ReadString(string, sourceExp->__anon1.__anon2.string);
+decl = SpecDeclFromString(string, specs, (((void *)0)));
+FreeExpContents(sourceExp);
+FreeType(sourceExp->expType);
+sourceExp->type = 24;
+sourceExp->__anon1._classExp.specifiers = specs;
+sourceExp->__anon1._classExp.decl = decl;
+sourceExp->expType = dest;
+dest->refCount++;
+FreeType(source);
+FreeType(dest);
+if(backupSourceExpType)
+FreeType(backupSourceExpType);
+return 1;
}
-
-extern struct Expression * MkExpCall(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * arguments);
-
-extern int printf(const char * , ...);
-
-void __ecereMethod_Expression_Clear();
-
-void ApplyAnyObjectLogic(struct Expression * e)
+}
+else if(source->kind == 8)
{
-struct Type * destType = e->destType;
+struct __ecereNameSpace__ecere__com__Class * _class = source->__anon1._class ? source->__anon1._class->__anon1.registered : (((void *)0));
-if(destType && (destType->classObjectType == 3))
+if(_class && (_class->type == 3 || _class->type == 2))
{
-if(e && e->expType)
+if(dest->kind != 8)
{
-struct Type * type = e->expType;
-struct __ecereNameSpace__ecere__com__Class * _class = (((void *)0));
+struct Type * tempType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Type * tempDest, * tempSource;
-if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
-{
-_class = type->__anon1._class->__anon1.registered;
-}
-else if(type->kind == 19)
+if(!source->__anon1._class->__anon1.registered->dataType)
+source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0);
+for(; _class->base->type != 1000; _class = _class->base)
+;
+tempDest = source;
+tempSource = tempType;
+tempType->kind = 8;
+tempType->__anon1._class = FindClass(_class->fullName);
+tempType->truth = source->truth;
+tempType->classObjectType = source->classObjectType;
+if(tempType->__anon1._class)
+MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst);
+if(conversions && conversions->last)
{
-_class = FindClass("ecere::com::Class")->__anon1.registered;
+((struct Conversion *)conversions->last)->resultType = dest;
+dest->refCount++;
}
-else
+FreeType(sourceExp->expType);
+sourceExp->expType = MkClassType(_class->fullName);
+sourceExp->expType->truth = source->truth;
+sourceExp->expType->classObjectType = source->classObjectType;
+if(!sourceExp->destType)
{
-char string[1024] = "";
-struct Symbol * classSym;
-
-PrintTypeNoConst(type, string, 0x0, 0x1);
-classSym = FindClass(string);
-if(classSym)
-_class = classSym->__anon1.registered;
+FreeType(sourceExp->destType);
+sourceExp->destType = sourceExp->expType;
+if(sourceExp->expType)
+sourceExp->expType->refCount++;
}
-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 != 8 || !type->__anon1._class || !type->__anon1._class->__anon1.registered || type->__anon1._class->__anon1.registered->type == 1))) || destType->byReference)))
-{
-if(!_class || strcmp(_class->fullName, "char *"))
-{
-struct Expression * checkedExp = e, * newExp;
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+FreeType(dest);
+dest = MkClassType(source->__anon1._class->string);
+dest->truth = source->truth;
+dest->classObjectType = source->classObjectType;
+FreeType(source);
+source = _class->dataType;
+source->refCount++;
+((tempType ? __extension__ ({
+void * __ecerePtrToDelete = (tempType);
-while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->__anon1.list) || checkedExp->type == 11)
-{
-if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
-{
-if(checkedExp->type == 23)
-{
-checkedExp = (*((struct Statement *)(*checkedExp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
+__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), tempType = 0);
}
-else
-checkedExp = (*checkedExp->__anon1.list).last;
}
-else if(checkedExp->type == 11)
-checkedExp = checkedExp->__anon1.cast.exp;
}
-if(checkedExp && checkedExp->type == 4 && checkedExp->__anon1.op.op == '*' && !checkedExp->__anon1.op.exp1)
+if(!flag)
{
-newExp = checkedExp->__anon1.op.exp2;
-checkedExp->__anon1.op.exp2 = (((void *)0));
-FreeExpContents(checkedExp);
-if(e->expType && e->expType->passAsTemplate)
+if(MatchTypes(source, dest, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst))
{
-char size[100];
-
-ComputeTypeSize(e->expType);
-sprintf(size, "%d", e->expType->size);
-newExp = MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), newExp), '+', MkExpCall(MkExpIdentifier(MkIdentifier("__ENDIAN_PAD")), MkListOne(MkExpConstant(size))))));
+FreeType(source);
+FreeType(dest);
+return 1;
}
-ReplaceExpContents(checkedExp, newExp);
-e->byReference = 0x1;
}
-else if(!e->byReference || (_class && _class->type == 5))
+if(dest->kind == 8)
{
-struct Expression * checkedExp;
+struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0));
+unsigned int fittingValue = 0;
+if(_class && _class->type == 4)
{
-unsigned int hasAddress = e->type == 0 || (e->type == 8 && e->__anon1.member.memberType == 3) || (e->type == 9 && e->__anon1.member.memberType == 3) || (e->type == 4 && !e->__anon1.op.exp1 && e->__anon1.op.op == '*') || e->type == 6;
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
+struct __ecereNameSpace__ecere__com__EnumClassData * c = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
-if(_class && _class->type != 5 && _class->type != 0 && _class->type != 1 && !hasAddress)
+if(c && value >= 0 && value <= c->largest)
+fittingValue = 1;
+}
+if(_class && !dest->truth && (_class->type == 3 || fittingValue || (_class->type != 1 && !value && source->kind == 3) || _class->type == 2))
{
-struct Context * context = PushContext();
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-char typeString[1024];
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-
-typeString[0] = '\0';
-*newExp = *e;
-newExp->prev = (((void *)0));
-newExp->next = (((void *)0));
-newExp->expType = (((void *)0));
-PrintTypeNoConst(e->expType, typeString, 0x0, 0x1);
-decl = SpecDeclFromString(typeString, specs, (((void *)0)));
-newExp->destType = ProcessType(specs, decl);
-curContext = context;
-if(curCompound)
+if(_class->type == 0 || _class->type == 5)
{
-char name[100];
-struct __ecereNameSpace__ecere__sys__OldList * stmts = MkList();
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-e->type = 23;
-sprintf(name, "__internalValue%03X", internalValueCounter++);
-if(!curCompound->__anon1.compound.declarations)
-curCompound->__anon1.compound.declarations = MkList();
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*curCompound->__anon1.compound.declarations), (((void *)0)), MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(name)), (((void *)0))))));
-ListAdd(stmts, MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier(name)), '=', newExp))));
-ListAdd(stmts, MkExpressionStmt(MkListOne(MkExpIdentifier(MkIdentifier(name)))));
-e->__anon1.compound = MkCompoundStmt((((void *)0)), stmts);
-}
-else
-printf("libec: compiler error, curCompound is null in ApplyAnyObjectLogic\n");
+*newExp = *sourceExp;
+if(sourceExp->destType)
+sourceExp->destType->refCount++;
+if(sourceExp->expType)
+sourceExp->expType->refCount++;
+sourceExp->type = 11;
+sourceExp->__anon1.cast.typeName = MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0))));
+sourceExp->__anon1.cast.exp = newExp;
+FreeType(sourceExp->expType);
+sourceExp->expType = (((void *)0));
+ProcessExpressionType(sourceExp);
+if(!inCompiler)
{
-struct Type * type = e->destType;
-
-e->destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-CopyTypeInto(e->destType, type);
-e->destType->refCount = 1;
-e->destType->classObjectType = 0;
-FreeType(type);
+FreeType(sourceExp->expType);
+sourceExp->expType = dest;
}
-e->__anon1.compound->__anon1.compound.context = context;
-PopContext(context);
-curContext = context->parent;
+FreeType(source);
+if(inCompiler)
+FreeType(dest);
+if(backupSourceExpType)
+FreeType(backupSourceExpType);
+return 1;
}
+if(!_class->dataType)
+_class->dataType = ProcessTypeString(_class->dataTypeString, 0);
+FreeType(dest);
+dest = _class->dataType;
+dest->refCount++;
}
-checkedExp = e;
-while(((checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23) && checkedExp->__anon1.list) || checkedExp->type == 11)
+if(dest->kind == 7 && (source->kind == 7 || source->kind == 6 || dest->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24))
{
-if(checkedExp->type == 5 || checkedExp->type == 32 || checkedExp->type == 23)
+specs = MkListOne(MkSpecifier(DOUBLE));
+}
+else if(dest->kind == 6 && (source->kind == 6 || dest->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 7))
{
-if(checkedExp->type == 23)
+specs = MkListOne(MkSpecifier(FLOAT));
+}
+else if(dest->kind == 4 && (source->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 6 || source->kind == 7))
{
-checkedExp = (*((struct Statement *)(*checkedExp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(INT64));
}
-else
-checkedExp = (*checkedExp->__anon1.list).last;
+else if(dest->kind == 3 && (source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 6 || source->kind == 7))
+{
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(INT));
}
-else if(checkedExp->type == 11)
-checkedExp = checkedExp->__anon1.cast.exp;
+else if(dest->kind == 2 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 6 || source->kind == 7))
+{
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(SHORT));
}
+else if(dest->kind == 1 && (source->kind == 1 || source->kind == 24 || source->kind == 2 || source->kind == 3 || source->kind == 6 || source->kind == 7))
{
-struct Expression * operand = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-
-*operand = *checkedExp;
-checkedExp->destType = (((void *)0));
-checkedExp->expType = (((void *)0));
-__ecereMethod_Expression_Clear(checkedExp);
-checkedExp->type = 4;
-checkedExp->__anon1.op.op = '&';
-checkedExp->__anon1.op.exp1 = (((void *)0));
-checkedExp->__anon1.op.exp2 = operand;
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(CHAR));
}
+else
+{
+FreeType(source);
+FreeType(dest);
+if(backupSourceExpType)
+{
+if(sourceExp->expType)
+FreeType(sourceExp->expType);
+sourceExp->expType = backupSourceExpType;
}
+return 0;
}
}
+else if(dest->kind == 7 && (source->kind == 7 || source->kind == 6 || source->kind == 4 || source->kind == 3 || source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1))
+{
+specs = MkListOne(MkSpecifier(DOUBLE));
}
+else if(dest->kind == 6 && (source->kind == 6 || source->kind == 15 || source->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 24 || source->kind == 1))
+{
+specs = MkListOne(MkSpecifier(FLOAT));
}
+else if(dest->kind == 24 && (source->kind == 24 || source->kind == 1 || source->kind == 15 || source->kind == 2 || source->kind == 3) && (value == 1 || value == 0))
{
+specs = MkList();
+ListAdd(specs, MkSpecifier(BOOL));
}
-if((!destType || destType->kind == 14 || destType->kind == 0) && e->expType && (e->expType->classObjectType == 3 || e->expType->classObjectType == 2) && (e->expType->byReference || (e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && (e->expType->__anon1._class->__anon1.registered->type == 2 || e->expType->__anon1._class->__anon1.registered->type == 4 || e->expType->__anon1._class->__anon1.registered->type == 3))))
+else if(dest->kind == 1 && (source->kind == 24 || source->kind == 1 || source->kind == 15 || source->kind == 2 || source->kind == 3) && (dest->isSigned ? (value >= -128 && value <= 127) : (value >= 0 && value <= 255)))
{
-if(e->expType->classObjectType && destType && destType->classObjectType)
+if(source->kind == 3)
{
-return ;
+FreeType(dest);
+FreeType(source);
+if(backupSourceExpType)
+FreeType(backupSourceExpType);
+return 1;
}
else
{
-struct Expression * thisExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-
-*thisExp = *e;
-thisExp->prev = (((void *)0));
-thisExp->next = (((void *)0));
-__ecereMethod_Expression_Clear(e);
-e->type = 5;
-e->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', thisExp->type == 0 ? thisExp : MkExpBrackets(MkListOne(thisExp))));
-if(thisExp->expType->kind == 8 && thisExp->expType->__anon1._class && thisExp->expType->__anon1._class->__anon1.registered && thisExp->expType->__anon1._class->__anon1.registered->type == 5)
-((struct Expression *)(*e->__anon1.list).first)->byReference = 0x1;
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(CHAR));
+}
+}
+else if(dest->kind == 2 && (source->kind == 15 || source->kind == 24 || source->kind == 1 || source->kind == 2 || (source->kind == 3 && (dest->isSigned ? (value >= -32768 && value <= 32767) : (value >= 0 && value <= 65535)))))
{
-e->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-CopyTypeInto(e->expType, thisExp->expType);
-e->expType->byReference = 0x0;
-e->expType->refCount = 1;
-if(e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && (e->expType->__anon1._class->__anon1.registered->type == 2 || e->expType->__anon1._class->__anon1.registered->type == 4 || e->expType->__anon1._class->__anon1.registered->type == 3))
+if(source->kind == 3)
{
-e->expType->classObjectType = 0;
-}
+FreeType(dest);
+FreeType(source);
+if(backupSourceExpType)
+FreeType(backupSourceExpType);
+return 1;
}
+else
+{
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(SHORT));
}
}
-else if(destType && e->expType && (e->expType->classObjectType == 3 || e->expType->classObjectType == 2) && !destType->classObjectType && destType->kind != 0)
-{
-if(destType->kind == 14)
+else if(dest->kind == 3 && (source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1 || source->kind == 3))
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Unspecified type\n", (((void *)0))));
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(INT));
}
-else if(!(destType->truth && e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && e->expType->__anon1._class->__anon1.registered->type == 1))
+else if(dest->kind == 4 && (source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1 || source->kind == 3 || source->kind == 4))
{
-unsigned int byReference = e->expType->byReference;
-struct Expression * thisExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-char typeString[1024];
-struct Type * type;
-int backupClassObjectType;
-unsigned int backupByReference;
-
-if(e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && strcmp(e->expType->__anon1._class->__anon1.registered->name, "class"))
-type = e->expType;
-else
-type = destType;
-backupClassObjectType = type->classObjectType;
-backupByReference = type->byReference;
-type->classObjectType = 0;
-type->byReference = 0x0;
-typeString[0] = '\0';
-PrintType(type, typeString, 0x0, 0x1);
-decl = SpecDeclFromString(typeString, specs, (((void *)0)));
-type->classObjectType = backupClassObjectType;
-type->byReference = backupByReference;
-*thisExp = *e;
-thisExp->prev = (((void *)0));
-thisExp->next = (((void *)0));
-__ecereMethod_Expression_Clear(e);
-if((type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 1000 || type->__anon1._class->__anon1.registered->type == 2 || type->__anon1._class->__anon1.registered->type == 4 || type->__anon1._class->__anon1.registered->type == 3)) || (type->kind != 13 && type->kind != 22 && type->kind != 12 && type->kind != 8) || (!destType->byReference && byReference && (destType->kind != 13 || type->kind != 13)))
+specs = MkList();
+if(!dest->isSigned)
+ListAdd(specs, MkSpecifier(UNSIGNED));
+ListAdd(specs, MkSpecifier(INT64));
+}
+else if(dest->kind == 15 && (source->kind == 4 || source->kind == 3 || source->kind == 2 || source->kind == 24 || source->kind == 1))
{
-e->type = 4;
-e->__anon1.op.op = '*';
-e->__anon1.op.exp1 = (((void *)0));
-e->__anon1.op.exp2 = MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), thisExp);
-e->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-CopyTypeInto(e->expType, type);
-e->expType->byReference = 0x0;
-e->expType->refCount = 1;
+specs = MkListOne(MkEnum(MkIdentifier(dest->__anon1.__anon1.enumName), (((void *)0))));
}
else
{
-e->type = 11;
-e->__anon1.cast.typeName = MkTypeName(specs, decl);
-e->__anon1.cast.exp = thisExp;
-e->byReference = 0x1;
-e->expType = type;
-type->refCount++;
+FreeType(source);
+FreeType(dest);
+if(backupSourceExpType)
+{
+if(sourceExp->expType)
+FreeType(sourceExp->expType);
+sourceExp->expType = backupSourceExpType;
}
-e->destType = destType;
-destType->refCount++;
+return 0;
+}
+if(!flag && !sourceExp->opDestType)
+{
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+
+*newExp = *sourceExp;
+newExp->prev = (((void *)0));
+newExp->next = (((void *)0));
+if(sourceExp->destType)
+sourceExp->destType->refCount++;
+if(sourceExp->expType)
+sourceExp->expType->refCount++;
+sourceExp->type = 11;
+if(realDest->kind == 8)
+{
+sourceExp->__anon1.cast.typeName = QMkClass(realDest->__anon1._class->string, (((void *)0)));
+FreeList(specs, (void *)(FreeSpecifier));
+}
+else
+sourceExp->__anon1.cast.typeName = MkTypeName(specs, (((void *)0)));
+if(newExp->type == 4)
+{
+sourceExp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp));
}
+else
+sourceExp->__anon1.cast.exp = newExp;
+FreeType(sourceExp->expType);
+sourceExp->expType = (((void *)0));
+ProcessExpressionType(sourceExp);
}
+else
+FreeList(specs, (void *)(FreeSpecifier));
+FreeType(dest);
+FreeType(source);
+if(backupSourceExpType)
+FreeType(backupSourceExpType);
+return 1;
}
-
-void ApplyLocation(struct Expression * exp, struct Location * loc)
+else
{
-exp->loc = *loc;
-switch(exp->type)
+if(computedExp != nbExp)
{
-case 4:
-if(exp->__anon1.op.exp1)
-ApplyLocation(exp->__anon1.op.exp1, loc);
-if(exp->__anon1.op.exp2)
-ApplyLocation(exp->__anon1.op.exp2, loc);
-break;
-case 5:
-if(exp->__anon1.list)
+FreeExpression(computedExp);
+computedExp = nbExp;
+}
+while((sourceExp->type == 5 || sourceExp->type == 32) && sourceExp->__anon1.list)
+sourceExp = (*sourceExp->__anon1.list).last;
+if(sourceExp->type == 0)
{
-struct Expression * e;
+struct Identifier * id = sourceExp->__anon1.__anon1.identifier;
-for(e = (*exp->__anon1.list).first; e; e = e->next)
-ApplyLocation(e, loc);
-}
-break;
-case 6:
-if(exp->__anon1.index.index)
+if(dest->kind == 8)
{
-struct Expression * e;
+if(dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4)
+{
+struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class->__anon1.registered;
+struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum");
-for(e = (*exp->__anon1.index.index).first; e; e = e->next)
-ApplyLocation(e, loc);
-}
-if(exp->__anon1.index.exp)
-ApplyLocation(exp->__anon1.index.exp, loc);
-break;
-case 7:
-if(exp->__anon1.call.arguments)
+if(enumClass)
{
-struct Expression * arg;
+for(; _class && _class->type == 4; _class = _class->base)
+{
+struct __ecereNameSpace__ecere__sys__NamedLink64 * value;
+struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0)));
-for(arg = (*exp->__anon1.call.arguments).first; arg; arg = arg->next)
-ApplyLocation(arg, loc);
-}
-if(exp->__anon1.call.exp)
-ApplyLocation(exp->__anon1.call.exp, loc);
-break;
-case 8:
-case 9:
-if(exp->__anon1.member.exp)
-ApplyLocation(exp->__anon1.member.exp, loc);
-break;
-case 11:
-if(exp->__anon1.cast.exp)
-ApplyLocation(exp->__anon1.cast.exp, loc);
+for(value = e->values.first; value; value = value->next)
+{
+if(!strcmp(value->name, id->string))
break;
-case 12:
-if(exp->__anon1.cond.exp)
+}
+if(value)
{
-struct Expression * e;
-
-for(e = (*exp->__anon1.cond.exp).first; e; e = e->next)
-ApplyLocation(e, loc);
+FreeType(sourceExp->expType);
+sourceExp->isConstant = 1;
+sourceExp->expType = MkClassType(_class->fullName);
+if(inCompiler || inPreCompiler || inDebugger)
+{
+FreeExpContents(sourceExp);
+sourceExp->type = 2;
+if(_class->dataTypeString && (!strcmp(_class->dataTypeString, "int") || !strcmp(_class->dataTypeString, "int64") || !strcmp(_class->dataTypeString, "short") || !strcmp(_class->dataTypeString, "char")))
+sourceExp->__anon1.__anon1.constant = PrintInt64(value->data);
+else
+sourceExp->__anon1.__anon1.constant = PrintUInt64(value->data);
}
-if(exp->__anon1.cond.cond)
-ApplyLocation(exp->__anon1.cond.cond, loc);
-if(exp->__anon1.cond.elseExp)
-ApplyLocation(exp->__anon1.cond.elseExp, loc);
-break;
-case 34:
-if(exp->__anon1.vaArg.exp)
-ApplyLocation(exp->__anon1.vaArg.exp, loc);
-break;
-default:
-break;
+FreeType(dest);
+return 1;
}
}
-
-extern char * strstr(const char * , const char * );
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DefinedExpression;
-
-struct __ecereNameSpace__ecere__com__DefinedExpression
+}
+}
+}
+if(dest->classObjectType != 2 && dest->kind == 8 && MatchWithEnums_Module(privateModule, sourceExp, dest, id->string, conversions))
{
-struct __ecereNameSpace__ecere__com__DefinedExpression * prev;
-struct __ecereNameSpace__ecere__com__DefinedExpression * next;
-const char * name;
-const char * value;
-struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__DefinedExpression * __ecereNameSpace__ecere__com__eSystem_FindDefine(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
-
-extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_FindFunction(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
-
-extern unsigned int __ecereNameSpace__ecere__sys__UTF8GetChar(const char * string, int * numBytes);
-
-extern struct Expression * GetTemplateArgExp(struct TemplateParameter * param, struct __ecereNameSpace__ecere__com__Class * curClass, unsigned int pointer);
-
-extern struct Expression * MkExpCondition(struct Expression * cond, struct __ecereNameSpace__ecere__sys__OldList * expressions, struct Expression * elseExp);
-
-extern struct Expression * MkExpClass(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * decl);
-
-static void ProcessStatement(struct Statement * stmt);
-
-extern struct Expression * MkExpExtensionInitializer(struct TypeName * typeName, struct Initializer * initializer);
-
-extern struct Initializer * MkInitializerList(struct __ecereNameSpace__ecere__sys__OldList * list);
-
-extern char * __ecereNameSpace__ecere__com__PrintString(struct __ecereNameSpace__ecere__com__Class * class, const void * object, ...);
-
-extern const char * sourceFile;
-
-unsigned int __ecereProp_Type_Get_specConst(struct Type * this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp_Type_specConst;
-
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(struct __ecereNameSpace__ecere__sys__OldList * this);
+FreeType(dest);
+return 1;
+}
+}
+FreeType(dest);
+}
+return 0;
+}
-void ProcessExpressionType(struct Expression * exp)
+static unsigned int CheckExpressionType(struct Expression * exp, struct Type * destType, unsigned int skipUnitBla, unsigned int warnConst)
{
-unsigned int unresolved = 0x0;
-struct Location oldyylloc = yylloc;
-unsigned int notByReference = 0x0;
+unsigned int result = 1;
-if(!exp || exp->expType)
-return ;
-yylloc = exp->loc;
-switch(exp->type)
+if(destType)
{
-case 0:
+struct __ecereNameSpace__ecere__sys__OldList converts =
{
-struct Identifier * id = exp->__anon1.__anon1.identifier;
+0, 0, 0, 0, 0
+};
+struct Conversion * convert;
-if(!id || !topContext)
-return ;
-if(id->_class && id->_class->__anon1.__anon1.name)
-{
-id->classSym = id->_class->__anon1.__anon1.symbol;
-}
-if(strstr(id->string, "__ecereClass") == id->string)
-{
-exp->expType = ProcessTypeString("ecere::com::Class", 0x1);
-break;
-}
-else if(id->_class && (id->classSym || (id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property"))))
+if(destType->kind == 0)
+return 0;
+if(!MatchTypeExpression(exp, destType, &converts, skipUnitBla, warnConst))
+result = 0;
+if(converts.count)
{
-ReplaceClassMembers(exp, thisClass);
-if(exp->type != 0)
+for(convert = converts.first; convert; convert = convert->next)
{
-ProcessExpressionType(exp);
-break;
-}
-if(id->classSym && ResolveIdWithClass(exp, id->classSym->__anon1.registered, 0x0))
-break;
-}
-else
+unsigned int empty = !(convert->isGet ? (void *)convert->convert->Get : (void *)convert->convert->Set);
+
+if(!empty)
{
-struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0x0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+int objectType = exp->expType ? exp->expType->classObjectType : 0;
-if(!symbol)
+*newExp = *exp;
+newExp->prev = (((void *)0));
+newExp->next = (((void *)0));
+newExp->destType = (((void *)0));
+if(convert->isGet)
{
-if(exp->destType && CheckExpressionType(exp, exp->destType, 0x0, 0x0))
-break;
+exp->type = 8;
+exp->addedThis = 1;
+exp->__anon1.member.exp = newExp;
+FreeType(exp->__anon1.member.exp->expType);
+exp->__anon1.member.exp->expType = MkClassType(convert->convert->_class->fullName);
+exp->__anon1.member.exp->expType->classObjectType = objectType;
+exp->__anon1.member.member = MkIdentifier(convert->convert->dataTypeString);
+exp->__anon1.member.memberType = 1;
+exp->expType = convert->resultType ? convert->resultType : convert->convert->dataType;
+exp->needCast = 1;
+if(exp->expType)
+exp->expType->refCount++;
+ApplyAnyObjectLogic(exp->__anon1.member.exp);
+}
else
{
-if(thisClass)
{
-ReplaceClassMembers(exp, thisClass ? thisClass : currentClass);
-if(exp->type != 0)
+exp->type = 8;
+exp->addedThis = 1;
+exp->__anon1.member.exp = newExp;
+if(newExp->expType && newExp->expType->kind == 8 && newExp->expType->__anon1._class && newExp->expType->__anon1._class->__anon1.registered && newExp->expType->__anon1._class->__anon1.registered->type == 5)
{
-ProcessExpressionType(exp);
-break;
+newExp->byReference = 1;
}
+FreeType(exp->__anon1.member.exp->expType);
+exp->__anon1.member.exp->expType = (((void *)0));
+if(convert->convert->dataType)
+{
+exp->__anon1.member.exp->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(exp->__anon1.member.exp->expType, convert->convert->dataType);
+exp->__anon1.member.exp->expType->refCount = 1;
+exp->__anon1.member.exp->expType->classObjectType = objectType;
+ApplyAnyObjectLogic(exp->__anon1.member.exp);
}
-else if(currentClass && !id->_class)
-{
-if(ResolveIdWithClass(exp, currentClass, 0x1))
-break;
+exp->__anon1.member.member = MkIdentifier(convert->convert->_class->fullName);
+exp->__anon1.member.memberType = 4;
+exp->expType = convert->resultType ? convert->resultType : MkClassType(convert->convert->_class->fullName);
+exp->needCast = 1;
+if(convert->resultType)
+convert->resultType->refCount++;
}
-symbol = FindSymbol(id->string, topContext->parent, globalContext, 0x0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
}
}
-if(symbol)
+else
{
-struct Type * type = symbol->type;
-struct __ecereNameSpace__ecere__com__Class * _class = (type && type->kind == 8 && type->__anon1._class) ? type->__anon1._class->__anon1.registered : (((void *)0));
-
-if(_class && !strcmp(id->string, "this") && !type->classObjectType)
+FreeType(exp->expType);
+if(convert->isGet)
{
-struct Context * context = SetupTemplatesContext(_class);
-
-type = ReplaceThisClassType(_class);
-FinishTemplatesContext(context);
-if(type)
-type->refCount = 0;
+exp->expType = convert->resultType ? convert->resultType : convert->convert->dataType;
+if(exp->destType->casted)
+exp->needCast = 1;
+if(exp->expType)
+exp->expType->refCount++;
}
-FreeSpecifier(id->_class);
-id->_class = (((void *)0));
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
-id->classSym = (((void *)0));
-exp->expType = type;
-if(type)
-type->refCount++;
-if(type && (type->kind == 15))
-exp->isConstant = 0x1;
-if(symbol->isParam || !strcmp(id->string, "this"))
+else
{
-if(_class && _class->type == 1 && !type->declaredWithStruct)
-exp->byReference = 0x1;
+exp->expType = convert->resultType ? convert->resultType : MkClassType(convert->convert->_class->fullName);
+if(exp->destType->casted)
+exp->needCast = 1;
+if(convert->resultType)
+convert->resultType->refCount++;
}
-if(symbol->isIterator)
-{
-if(symbol->isIterator == 3)
+}
+}
+if(exp->isConstant && inCompiler)
+ComputeExpression(exp);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(&converts, (void *)(FreeConvert));
+}
+if(!result && exp->expType && converts.count)
{
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpIdentifier(exp->__anon1.__anon1.identifier)));
-((struct Expression *)(*exp->__anon1.list).first)->__anon1.op.exp2->expType = exp->expType;
-exp->expType = (((void *)0));
-ProcessExpressionType(exp);
+result = MatchTypes(exp->expType, exp->destType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst);
}
-else if(symbol->isIterator != 4)
+if(!result && exp->expType && exp->destType)
{
-exp->type = 8;
-exp->__anon1.member.exp = MkExpIdentifier(exp->__anon1.__anon1.identifier);
-exp->__anon1.member.exp->expType = exp->expType;
-exp->__anon1.member.member = MkIdentifier("data");
-exp->expType = (((void *)0));
-ProcessExpressionType(exp);
+if((exp->destType->kind == 8 && exp->expType->kind == 13 && exp->expType->__anon1.type->kind == 8 && exp->expType->__anon1.type->__anon1._class == exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && exp->destType->__anon1._class->__anon1.registered->type == 1) || (exp->expType->kind == 8 && exp->destType->kind == 13 && exp->destType->__anon1.type->kind == 8 && exp->destType->__anon1.type->__anon1._class == exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1))
+result = 1;
}
}
-break;
+return result;
}
-else
-{
-struct __ecereNameSpace__ecere__com__DefinedExpression * definedExp = (((void *)0));
-if(thisNameSpace && !(id->_class && !id->_class->__anon1.__anon1.name))
+static void ProcessFunction(struct FunctionDefinition * function);
+
+void ProcessInstantiationType(struct Instantiation * inst)
{
-char name[1024];
+yylloc = inst->loc;
+if(inst->_class)
+{
+struct MembersInit * members;
+struct Symbol * classSym;
+struct __ecereNameSpace__ecere__com__Class * _class;
-strcpy(name, thisNameSpace);
-strcat(name, "::");
-strcat(name, id->string);
-definedExp = __ecereNameSpace__ecere__com__eSystem_FindDefine(privateModule, name);
-}
-if(!definedExp)
-definedExp = __ecereNameSpace__ecere__com__eSystem_FindDefine(privateModule, id->string);
-if(definedExp)
+classSym = inst->_class->__anon1.__anon1.symbol;
+_class = classSym ? classSym->__anon1.registered : (((void *)0));
+if(!_class || _class->type != 5)
+DeclareStruct(curExternal, inst->_class->__anon1.__anon1.name, 0, 1);
+afterExternal = afterExternal ? afterExternal : curExternal;
+if(inst->exp)
+ProcessExpressionType(inst->exp);
+inst->isConstant = 1;
+if(inst->members)
{
-int c;
+struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256];
+int subMemberStackPos = 0;
-for(c = 0; c < definedExpStackPos; c++)
-if(definedExpStack[c] == definedExp)
-break;
-if(c == definedExpStackPos && c < sizeof (definedExpStack) / sizeof(void *))
+for(members = (*inst->members).first; members; members = members->next)
{
-struct Location backupYylloc = yylloc;
-struct __ecereNameSpace__ecere__com__Instance * backInput = fileInput;
+switch(members->type)
+{
+case 1:
+{
+char name[1024];
+static unsigned int instMethodID = 0;
+struct External * external = curExternal;
+struct Context * context = curContext;
+struct Declarator * declarator = members->__anon1.function->declarator;
+struct Identifier * nameID = GetDeclId(declarator);
+char * unmangled = nameID ? nameID->string : (((void *)0));
+struct Expression * exp;
+struct External * createdExternal = (((void *)0));
-definedExpStack[definedExpStackPos++] = definedExp;
-fileInput = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
-((int (*)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
+if(inCompiler)
+{
+char number[16];
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write])(fileInput, definedExp->value, 1, strlen(definedExp->value));
-((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
+strcpy(name, "__ecereInstMeth_");
+FullClassNameCat(name, _class ? _class->fullName : "_UNKNOWNCLASS", 0);
+strcat(name, "_");
+strcat(name, nameID->string);
+strcat(name, "_");
+sprintf(number, "_%08d", instMethodID++);
+strcat(name, number);
+nameID->string = __ecereNameSpace__ecere__sys__CopyString(name);
+}
+if(declarator)
+{
+struct Symbol * symbol = declarator->symbol;
+struct __ecereNameSpace__ecere__com__Method * method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, unmangled, privateModule);
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(fileInput, 0, 0);
-echoOn = 0x0;
-parsedExpression = (((void *)0));
-resetScanner();
-expression_yyparse();
-(__ecereNameSpace__ecere__com__eInstance_DecRef(fileInput), fileInput = 0);
-if(backInput)
-fileInput = backInput;
-yylloc = backupYylloc;
-if(parsedExpression)
+if(method && method->type == 1)
{
-FreeIdentifier(id);
-exp->type = 5;
-exp->__anon1.list = MkListOne(parsedExpression);
-ApplyLocation(parsedExpression, &yylloc);
-ProcessExpressionType(exp);
-definedExpStackPos--;
-return ;
-}
-definedExpStackPos--;
+symbol->__anon1.method = method;
+ProcessMethodType(method);
+if(!symbol->type->__anon1.__anon2.thisClass)
+{
+if(method->dataType->__anon1.__anon2.thisClass && currentClass && __ecereNameSpace__ecere__com__eClass_IsDerived(currentClass, method->dataType->__anon1.__anon2.thisClass->__anon1.registered))
+{
+if(!currentClass->symbol)
+currentClass->symbol = FindClass(currentClass->fullName);
+symbol->type->__anon1.__anon2.thisClass = currentClass->symbol;
}
else
{
-if(inCompiler)
-{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Recursion in defined expression %s\n", (((void *)0))), id->string);
+if(!_class->symbol)
+_class->symbol = FindClass(_class->fullName);
+symbol->type->__anon1.__anon2.thisClass = _class->symbol;
}
}
+DeclareType(curExternal, symbol->type, 1, 1);
}
-else
+else if(classSym)
{
-struct GlobalData * data = (((void *)0));
-
-if(thisNameSpace && !(id->_class && !id->_class->__anon1.__anon1.name))
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find virtual method %s in class %s\n", (((void *)0))), unmangled, classSym->string);
+}
+}
+createdExternal = ProcessClassFunction(classSym ? classSym->__anon1.registered : (((void *)0)), members->__anon1.function, ast, afterExternal, 1);
+if(nameID)
{
-char name[1024];
-
-strcpy(name, thisNameSpace);
-strcat(name, "::");
-strcat(name, id->string);
-data = FindGlobalData(name);
+FreeSpecifier(nameID->_class);
+nameID->_class = (((void *)0));
}
-if(!data)
-data = FindGlobalData(id->string);
-if(data)
+curExternal = createdExternal;
+if(inCompiler)
{
-DeclareGlobalData(data);
-exp->expType = data->dataType;
-if(data->dataType)
-data->dataType->refCount++;
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(data->fullName);
-FreeSpecifier(id->_class);
-id->_class = (((void *)0));
-break;
+if(createdExternal->__anon1.function)
+ProcessFunction(createdExternal->__anon1.function);
}
-else
+else if(declarator)
{
-struct __ecereNameSpace__ecere__com__GlobalFunction * function = (((void *)0));
-
-if(thisNameSpace && !(id->_class && !id->_class->__anon1.__anon1.name))
+curExternal = declarator->symbol->__anon2.__anon1.pointerExternal;
+ProcessFunction((struct FunctionDefinition *)members->__anon1.function);
+}
+curExternal = external;
+curContext = context;
+if(inCompiler)
{
-char name[1024];
-
-strcpy(name, thisNameSpace);
-strcat(name, "::");
-strcat(name, id->string);
-function = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, name);
+FreeClassFunction(members->__anon1.function);
+exp = QMkExpId(name);
+members->type = 0;
+members->__anon1.dataMembers = MkListOne(MkMemberInit(MkListOne(MkIdentifier(unmangled)), MkInitializerAssignment(exp)));
+(__ecereNameSpace__ecere__com__eSystem_Delete(unmangled), unmangled = 0);
}
-if(!function)
-function = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, id->string);
-if(function)
+break;
+}
+case 0:
{
-char name[1024];
+if(members->__anon1.dataMembers && classSym)
+{
+struct MemberInit * member;
+struct Location oldyyloc = yylloc;
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(function->name);
-name[0] = (char)0;
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1 && (!function->dataType || !function->dataType->dllExport))
-strcpy(name, "__ecereFunction_");
-FullClassNameCat(name, id->string, 0x0);
-if(DeclareFunction(function, name))
+for(member = (*members->__anon1.dataMembers).first; member; member = member->next)
{
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(name);
+ProcessMemberInitData(member, classSym->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos);
+if(member->initializer && !member->initializer->isConstant)
+inst->isConstant = 0;
+}
+yylloc = oldyyloc;
}
-exp->expType = function->dataType;
-if(function->dataType)
-function->dataType->refCount++;
-FreeSpecifier(id->_class);
-id->_class = (((void *)0));
break;
}
}
}
}
}
-unresolved = 0x1;
-break;
}
-case 1:
+
+static void ProcessClass(struct __ecereNameSpace__ecere__sys__OldList * definitions, struct Symbol * symbol);
+
+static void ProcessSpecifier(struct Specifier * spec, unsigned int declareStruct, unsigned int warnClasses)
{
-if(!exp->__anon1.instance->_class)
+switch(spec->type)
{
-if(exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class)
+case 0:
{
-exp->__anon1.instance->_class = MkSpecifierName(exp->destType->__anon1._class->string);
+if(spec->__anon1.specifier == THISCLASS)
+{
+if(thisClass)
+{
+spec->type = 1;
+spec->__anon1.__anon1.name = ReplaceThisClass(thisClass);
+spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name);
+ProcessSpecifier(spec, declareStruct, 0);
}
}
-ProcessInstantiationType(exp->__anon1.instance);
-exp->isConstant = exp->__anon1.instance->isConstant;
-if(exp->__anon1.instance->_class)
+break;
+}
+case 1:
{
-exp->expType = MkClassType(exp->__anon1.instance->_class->__anon1.__anon1.name);
+struct Symbol * symbol = FindType(curContext, spec->__anon1.__anon1.name);
+
+if(symbol)
+DeclareType(curExternal, symbol->type, 1, 1);
+else if(spec->__anon1.__anon1.symbol)
+{
+struct __ecereNameSpace__ecere__com__Class * c = spec->__anon1.__anon1.symbol->__anon1.registered;
+
+if(warnClasses && !c)
+Compiler_Warning("Undeclared class %s\n", spec->__anon1.__anon1.name);
+DeclareStruct(curExternal, spec->__anon1.__anon1.name, c && c->type == 5, declareStruct && c && c->type == 1);
}
break;
}
case 2:
{
-if(!exp->expType)
-{
-char * constant = exp->__anon1.__anon1.constant;
-struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type->constant = 0x1, type);
+struct Enumerator * e;
-exp->expType = type;
-if(constant[0] == '\'')
+if(spec->__anon1.__anon2.list)
{
-if((int)((unsigned char *)constant)[1] > 127)
+for(e = (*spec->__anon1.__anon2.list).first; e; e = e->next)
{
-int nb;
-unsigned int ch = __ecereNameSpace__ecere__sys__UTF8GetChar(constant + 1, &nb);
-
-if(nb < 2)
-ch = constant[1];
-(__ecereNameSpace__ecere__com__eSystem_Delete(constant), constant = 0);
-exp->__anon1.__anon1.constant = PrintUInt(ch);
-type->kind = 8;
-type->__anon1._class = FindClass("unichar");
-type->isSigned = 0x0;
+if(e->exp)
+ProcessExpressionType(e->exp);
}
-else
-{
-type->kind = 1;
-type->isSigned = 0x1;
}
+if(inCompiler)
+break;
}
-else
+case 3:
+case 4:
{
-char * dot = strchr(constant, '.');
-unsigned int isHex = (constant[0] == '0' && (constant[1] == 'x' || constant[1] == 'X'));
-char * exponent;
+if(spec->__anon1.__anon2.definitions)
+{
+struct Symbol * symbol = spec->__anon1.__anon2.id ? FindClass(spec->__anon1.__anon2.id->string) : (((void *)0));
-if(isHex)
+ProcessClass(spec->__anon1.__anon2.definitions, symbol);
+}
+break;
+}
+}
+}
+
+static void ProcessDeclarator(struct Declarator * decl, unsigned int isFunction)
{
-exponent = strchr(constant, 'p');
-if(!exponent)
-exponent = strchr(constant, 'P');
+switch(decl->type)
+{
+case 1:
+if(decl->__anon1.identifier->classSym)
+{
+FreeSpecifier(decl->__anon1.identifier->_class);
+decl->__anon1.identifier->_class = (((void *)0));
}
-else
+break;
+case 3:
+if(decl->__anon1.array.exp)
+ProcessExpressionType(decl->__anon1.array.exp);
+case 0:
+case 2:
+case 4:
+case 5:
+case 6:
+case 7:
{
-exponent = strchr(constant, 'e');
-if(!exponent)
-exponent = strchr(constant, 'E');
+struct Identifier * id = (((void *)0));
+struct Specifier * classSpec = (((void *)0));
+
+if(decl->type == 4)
+{
+id = GetDeclId(decl);
+if(id && id->_class)
+{
+classSpec = id->_class;
+id->_class = (((void *)0));
}
-if(dot || exponent)
+}
+if(decl->declarator)
+ProcessDeclarator(decl->declarator, isFunction);
+if(decl->type == 4)
{
-if(strchr(constant, 'f') || strchr(constant, 'F'))
-type->kind = 6;
-else
-type->kind = 7;
-type->isSigned = 0x1;
+if(classSpec)
+{
+struct TypeName * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), param->qualifiers = MkListOne(classSpec), param->declarator = (((void *)0)), param);
+
+if(!decl->__anon1.function.parameters)
+decl->__anon1.function.parameters = MkList();
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*decl->__anon1.function.parameters), (((void *)0)), param);
}
-else
+if(decl->__anon1.function.parameters)
{
-unsigned int isSigned = constant[0] == '-';
-char * endP = (((void *)0));
-long long i64 = strtoll(constant, &endP, 0);
-uint64 ui64 = strtoull(constant, &endP, 0);
-unsigned int is64Bit = endP && (!strcmp(endP, "LL") || !strcmp(endP, "ll"));
+struct TypeName * param;
-if(isSigned)
+for(param = (*decl->__anon1.function.parameters).first; param; param = param->next)
{
-if(i64 < (((int)0x80000000)))
-is64Bit = 0x1;
-}
-else
+if(param->qualifiers)
{
-if(ui64 > (((int)0x7fffffff)))
+struct Specifier * spec;
+
+for(spec = (*param->qualifiers).first; spec; spec = spec->next)
{
-if(ui64 > (0xffffffff))
+if(spec->type == 0)
{
-is64Bit = 0x1;
-if(ui64 <= (((long long)0x7fffffffffffffffLL)) && (constant[0] != '0' || !constant[1]))
-isSigned = 0x1;
-}
+if(spec->__anon1.specifier == TYPED_OBJECT)
+{
+struct Declarator * d = param->declarator;
+struct TypeName * newParam = (newParam = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), newParam->qualifiers = MkListOne(MkSpecifier(VOID)), newParam->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d), newParam);
+
+if(!d || d->type != 5)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*newParam->qualifiers), (((void *)0)), MkSpecifier(CONST));
+FreeList(param->qualifiers, (void *)(FreeSpecifier));
+param->qualifiers = MkListOne(MkStructOrUnion(3, MkIdentifier("__ecereNameSpace__ecere__com__Class"), (((void *)0))));
+param->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier("class")));
+DeclareStruct(curExternal, "ecere::com::Class", 0, 1);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*decl->__anon1.function.parameters), param, newParam);
+param = newParam;
+break;
}
-else if(constant[0] != '0' || !constant[1])
-isSigned = 0x1;
+else if(spec->__anon1.specifier == ANY_OBJECT)
+{
+struct Declarator * d = param->declarator;
+
+FreeList(param->qualifiers, (void *)(FreeSpecifier));
+param->qualifiers = MkListOne(MkSpecifier(VOID));
+if(!d || d->type != 5)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*param->qualifiers), (((void *)0)), MkSpecifier(CONST));
+param->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d);
+break;
}
-type->kind = is64Bit ? 4 : 3;
-type->isSigned = isSigned;
+else if(spec->__anon1.specifier == THISCLASS)
+{
+if(thisClass)
+{
+spec->type = 1;
+spec->__anon1.__anon1.name = ReplaceThisClass(thisClass);
+spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name);
+ProcessSpecifier(spec, 0, 0);
}
+break;
}
-exp->isConstant = 0x1;
-if(exp->destType && exp->destType->kind == 7)
-type->kind = 7;
-else if(exp->destType && exp->destType->kind == 6)
-type->kind = 6;
-else if(exp->destType && exp->destType->kind == 4)
-type->kind = 4;
}
-break;
+else if(spec->type == 1)
+{
+ProcessSpecifier(spec, isFunction, 1);
}
-case 3:
+else if((spec->type == 3 || spec->type == 4) && !spec->__anon1.__anon2.definitions && spec->__anon1.__anon2.id && spec->__anon1.__anon2.id->string)
{
-exp->isConstant = 0x1;
-exp->expType = __extension__ ({
-struct Type * __ecereInstance2 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance2->refCount = 1, __ecereInstance2->kind = 13, __ecereInstance2->__anon1.type = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Declarator * d = param->declarator;
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 1, __ecereInstance1->constant = 0x1, __ecereInstance1->isSigned = 0x1, __ecereInstance1;
-}), __ecereInstance2;
-});
+if(!d || d->type != 5)
+DeclareStruct(curExternal, spec->__anon1.__anon2.id->string, 0, 1);
+}
+}
+}
+if(param->declarator)
+ProcessDeclarator(param->declarator, 0);
+}
+}
+}
break;
}
-case 13:
-case 26:
-ProcessExpressionType(exp->__anon1._new.size);
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+}
+}
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = ProcessType(exp->__anon1._new.typeName->qualifiers, exp->__anon1._new.typeName->declarator), __ecereInstance1;
-});
-DeclareType(exp->expType->__anon1.type, 0x0, 0x0);
-break;
-case 14:
-case 27:
-ProcessExpressionType(exp->__anon1._renew.size);
-ProcessExpressionType(exp->__anon1._renew.exp);
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+static void ProcessDeclaration(struct Declaration * decl, unsigned int warnClasses)
+{
+yylloc = decl->loc;
+switch(decl->type)
+{
+case 1:
+{
+unsigned int declareStruct = 0;
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = ProcessType(exp->__anon1._renew.typeName->qualifiers, exp->__anon1._renew.typeName->declarator), __ecereInstance1;
-});
-DeclareType(exp->expType->__anon1.type, 0x0, 0x0);
-break;
-case 4:
+if(decl->__anon1.__anon1.declarators)
{
-unsigned int assign = 0x0, boolResult = 0x0, boolOps = 0x0;
-struct Type * type1 = (((void *)0)), * type2 = (((void *)0));
-unsigned int useDestType = 0x0, useSideType = 0x0;
-struct Location oldyylloc = yylloc;
-unsigned int useSideUnit = 0x0;
-struct __ecereNameSpace__ecere__com__Class * destClass = (exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class) ? exp->destType->__anon1._class->__anon1.registered : (((void *)0));
-struct Type * dummy = (dummy = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), dummy->count = 1, dummy->refCount = 1, dummy);
+struct InitDeclarator * d;
-switch(exp->__anon1.op.op)
+for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
{
-case '=':
-case MUL_ASSIGN:
-case DIV_ASSIGN:
-case MOD_ASSIGN:
-case ADD_ASSIGN:
-case SUB_ASSIGN:
-case LEFT_ASSIGN:
-case RIGHT_ASSIGN:
-case AND_ASSIGN:
-case XOR_ASSIGN:
-case OR_ASSIGN:
-assign = 0x1;
-break;
-case '!':
-break;
-case AND_OP:
-case OR_OP:
-boolOps = 0x1;
-boolResult = 0x1;
-break;
-case EQ_OP:
-case '<':
-case '>':
-case LE_OP:
-case GE_OP:
-case NE_OP:
-boolResult = 0x1;
-useSideType = 0x1;
-break;
-case '+':
-case '-':
-useSideUnit = 0x1;
-useSideType = 0x1;
-useDestType = 0x1;
+struct Type * type, * subType;
+
+ProcessDeclarator(d->declarator, 0);
+type = ProcessType(decl->__anon1.__anon1.specifiers, d->declarator);
+if(d->initializer)
+{
+ProcessInitializer(d->initializer, type);
+if((*decl->__anon1.__anon1.declarators).count == 1 && d->initializer->type == 0 && d->initializer->__anon1.exp->type == 1)
+{
+if(type->kind == 8 && type->__anon1._class == d->initializer->__anon1.exp->expType->__anon1._class)
+{
+struct Instantiation * inst = d->initializer->__anon1.exp->__anon1.instance;
+
+inst->exp = MkExpIdentifier(CopyIdentifier(GetDeclId(d->declarator)));
+d->initializer->__anon1.exp->__anon1.instance = (((void *)0));
+if(decl->__anon1.__anon1.specifiers)
+FreeList(decl->__anon1.__anon1.specifiers, (void *)(FreeSpecifier));
+FreeList(decl->__anon1.__anon1.declarators, (void *)(FreeInitDeclarator));
+d = (((void *)0));
+decl->type = 2;
+decl->__anon1.inst = inst;
+}
+}
+}
+for(subType = type; subType; )
+{
+if(subType->kind == 8)
+{
+declareStruct = 1;
break;
-case LEFT_OP:
-case RIGHT_OP:
-useSideType = 0x1;
-useDestType = 0x1;
+}
+else if(subType->kind == 13)
break;
-case '|':
-case '^':
-useSideType = 0x1;
-useDestType = 0x1;
+else if(subType->kind == 12)
+subType = subType->__anon1.__anon4.arrayType;
+else
break;
-case '/':
-case '%':
-useSideType = 0x1;
-useDestType = 0x1;
+}
+FreeType(type);
+if(!d)
break;
-case '&':
-case '*':
-if(exp->__anon1.op.exp1)
+}
+}
+if(decl->__anon1.__anon1.specifiers)
{
-useSideType = 0x1;
-useDestType = 0x1;
+struct Specifier * s;
+
+for(s = (*decl->__anon1.__anon1.specifiers).first; s; s = s->next)
+{
+ProcessSpecifier(s, declareStruct, 1);
+}
}
break;
}
-if(exp->__anon1.op.op == '&')
+case 2:
{
-if(!exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->type == 0 && exp->__anon1.op.exp2->__anon1.__anon1.identifier)
+ProcessInstantiationType(decl->__anon1.inst);
+break;
+}
+case 0:
{
-struct Identifier * id = exp->__anon1.op.exp2->__anon1.__anon1.identifier;
-struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0x0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
+struct Specifier * spec;
+struct Declarator * d;
+unsigned int declareStruct = 0;
-if(symbol && symbol->isIterator == 2)
+if(decl->__anon1.__anon1.declarators)
{
-exp->type = 8;
-exp->__anon1.member.exp = exp->__anon1.op.exp2;
-exp->__anon1.member.member = MkIdentifier("key");
-exp->expType = (((void *)0));
-exp->__anon1.op.exp2->expType = symbol->type;
-symbol->type->refCount++;
-ProcessExpressionType(exp);
-FreeType(dummy);
+for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
+{
+struct Type * type = ProcessType(decl->__anon1.__anon1.specifiers, d->declarator);
+struct Type * subType;
+
+ProcessDeclarator(d, 0);
+for(subType = type; subType; )
+{
+if(subType->kind == 8)
+{
+declareStruct = 1;
break;
}
+else if(subType->kind == 13)
+break;
+else if(subType->kind == 12)
+subType = subType->__anon1.__anon4.arrayType;
+else
+break;
}
+FreeType(type);
}
-if(exp->__anon1.op.exp1)
-{
-if(exp->__anon1.op.exp2 && useSideUnit && useDestType && destClass && destClass->type == 3 && destClass->base->type != 3)
-useDestType = 0x0;
-if(destClass && useDestType && ((destClass->type == 3 && useSideUnit) || destClass->type == 4 || destClass->type == 2))
-{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = exp->destType;
-exp->__anon1.op.exp1->opDestType = 0x1;
-if(exp->destType)
-exp->destType->refCount++;
}
-else if(!assign)
+if(decl->__anon1.__anon1.specifiers)
{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = dummy;
-dummy->refCount++;
+for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
+ProcessSpecifier(spec, declareStruct, warnClasses);
}
-if(exp->__anon1.op.exp1->destType && exp->__anon1.op.op != '=')
-exp->__anon1.op.exp1->destType->count++;
-ProcessExpressionType(exp->__anon1.op.exp1);
-if(exp->__anon1.op.exp1->destType && exp->__anon1.op.op != '=')
-exp->__anon1.op.exp1->destType->count--;
-exp->__anon1.op.exp1->opDestType = 0x0;
-if(!exp->__anon1.op.exp2 && (exp->__anon1.op.op == INC_OP || exp->__anon1.op.op == DEC_OP) && exp->__anon1.op.exp1->expType && exp->__anon1.op.exp1->expType->kind == 8 && exp->__anon1.op.exp1->expType->__anon1._class && exp->__anon1.op.exp1->expType->__anon1._class->__anon1.registered && exp->__anon1.op.exp1->expType->__anon1._class->__anon1.registered->type == 3)
-{
-exp->__anon1.op.exp2 = MkExpConstant("1");
-exp->__anon1.op.op = exp->__anon1.op.op == INC_OP ? ADD_ASSIGN : SUB_ASSIGN;
-assign = 0x1;
+break;
}
-if(exp->__anon1.op.exp1->destType == dummy)
-{
-FreeType(dummy);
-exp->__anon1.op.exp1->destType = (((void *)0));
}
-type1 = exp->__anon1.op.exp1->expType;
}
-if(exp->__anon1.op.exp2)
-{
-char expString[10240];
-expString[0] = '\0';
-if(exp->__anon1.op.exp2->type == 1 && !exp->__anon1.op.exp2->__anon1.instance->_class)
+static void ProcessStatement(struct Statement * stmt)
{
-if(exp->__anon1.op.exp1)
+yylloc = stmt->loc;
+switch(stmt->type)
{
-exp->__anon1.op.exp2->destType = exp->__anon1.op.exp1->expType;
-if(exp->__anon1.op.exp1->expType)
-exp->__anon1.op.exp1->expType->refCount++;
-}
-else
+case 0:
+ProcessStatement(stmt->__anon1.labeled.stmt);
+break;
+case 1:
+if(stmt->__anon1.caseStmt.exp)
{
-exp->__anon1.op.exp2->destType = exp->destType;
-if(!exp->__anon1.op.exp1 || exp->__anon1.op.op != '&')
-exp->__anon1.op.exp2->opDestType = 0x1;
-if(exp->destType)
-exp->destType->refCount++;
-}
-if(type1)
-type1->refCount++;
-exp->expType = type1;
+FreeType(stmt->__anon1.caseStmt.exp->destType);
+stmt->__anon1.caseStmt.exp->destType = curSwitchType;
+if(curSwitchType)
+curSwitchType->refCount++;
+ProcessExpressionType(stmt->__anon1.caseStmt.exp);
+ComputeExpression(stmt->__anon1.caseStmt.exp);
}
-else if(assign)
+if(stmt->__anon1.caseStmt.stmt)
+ProcessStatement(stmt->__anon1.caseStmt.stmt);
+break;
+case 2:
{
-if(inCompiler)
-PrintExpression(exp->__anon1.op.exp2, expString);
-if(type1 && type1->kind == 13)
+if(stmt->__anon1.compound.context)
{
-if(exp->__anon1.op.op == MUL_ASSIGN || exp->__anon1.op.op == DIV_ASSIGN || exp->__anon1.op.op == MOD_ASSIGN || exp->__anon1.op.op == LEFT_ASSIGN || exp->__anon1.op.op == RIGHT_ASSIGN || exp->__anon1.op.op == AND_ASSIGN || exp->__anon1.op.op == OR_ASSIGN)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "operator %s illegal on pointer\n", (((void *)0))), exp->__anon1.op.op);
-else if(exp->__anon1.op.op == '=')
+struct Declaration * decl;
+struct Statement * s;
+struct Statement * prevCompound = curCompound;
+struct Context * prevContext = curContext;
+
+if(!stmt->__anon1.compound.isSwitch)
+curCompound = stmt;
+curContext = stmt->__anon1.compound.context;
+if(stmt->__anon1.compound.declarations)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1;
-if(type1)
-type1->refCount++;
-}
+for(decl = (*stmt->__anon1.compound.declarations).first; decl; decl = decl->next)
+ProcessDeclaration(decl, 1);
}
-else
-{
-if(exp->__anon1.op.op == MUL_ASSIGN || exp->__anon1.op.op == DIV_ASSIGN || exp->__anon1.op.op == MOD_ASSIGN || exp->__anon1.op.op == LEFT_ASSIGN || exp->__anon1.op.op == RIGHT_ASSIGN)
-;
-else
+if(stmt->__anon1.compound.statements)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1;
-if(type1)
-type1->refCount++;
+for(s = (*stmt->__anon1.compound.statements).first; s; s = s->next)
+ProcessStatement(s);
}
+curContext = prevContext;
+curCompound = prevCompound;
}
-if(type1)
-type1->refCount++;
-exp->expType = type1;
+break;
}
-else if(destClass && ((destClass->type == 3 && useDestType && useSideUnit) || (destClass->type == 4 && useDestType)))
+case 3:
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = exp->destType;
-if(exp->__anon1.op.op != '&')
-exp->__anon1.op.exp2->opDestType = 0x1;
-if(exp->destType)
-exp->destType->refCount++;
-}
-else
+struct Expression * exp;
+
+if(stmt->__anon1.expressions)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = dummy;
-dummy->refCount++;
+for(exp = (*stmt->__anon1.expressions).first; exp; exp = exp->next)
+ProcessExpressionType(exp);
}
-if(type1 && boolResult && useSideType && type1->kind == 8 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && (type1->__anon1._class->__anon1.registered->type == 2 || type1->__anon1._class->__anon1.registered->type == 4))
-{
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1;
-type1->refCount++;
+break;
}
-if(exp->__anon1.op.exp2->destType && exp->__anon1.op.op != '=')
-exp->__anon1.op.exp2->destType->count++;
-if(exp->__anon1.op.op == SIZEOF)
+case 4:
{
-struct Expression * e = exp->__anon1.op.exp2;
+struct Expression * exp;
-while((e->type == 5 || e->type == 32 || e->type == 23) && e->__anon1.list)
-{
-if(e->type == 5 || e->type == 32 || e->type == 23)
+FreeType(((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType);
+((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType = MkClassType("bool");
+((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType->truth = 1;
+for(exp = (*stmt->__anon1.ifStmt.exp).first; exp; exp = exp->next)
{
-if(e->type == 23)
-e = (*((struct Statement *)(*e->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
-else
-e = (*e->__anon1.list).last;
-}
+ProcessExpressionType(exp);
}
-if(e->type == 11 && e->__anon1.cast.exp)
-e->__anon1.cast.exp->needCast = 0x1;
+if(stmt->__anon1.ifStmt.stmt)
+ProcessStatement(stmt->__anon1.ifStmt.stmt);
+if(stmt->__anon1.ifStmt.elseStmt)
+ProcessStatement(stmt->__anon1.ifStmt.elseStmt);
+break;
}
-ProcessExpressionType(exp->__anon1.op.exp2);
-exp->__anon1.op.exp2->opDestType = 0x0;
-if(exp->__anon1.op.exp2->destType && exp->__anon1.op.op != '=')
-exp->__anon1.op.exp2->destType->count--;
-if(assign && type1 && type1->kind == 13 && exp->__anon1.op.exp2->expType)
+case 5:
{
-if(exp->__anon1.op.exp2->expType->kind == 23 || exp->__anon1.op.exp2->expType->kind == 22 || exp->__anon1.op.exp2->expType->kind == 4 || exp->__anon1.op.exp2->expType->kind == 3 || exp->__anon1.op.exp2->expType->kind == 2 || exp->__anon1.op.exp2->expType->kind == 1)
+struct Type * oldSwitchType = curSwitchType;
+
+if(stmt->__anon1.switchStmt.exp)
{
-if(exp->__anon1.op.op != '=' && type1->__anon1.type->kind == 0)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "void *: unknown size\n", (((void *)0))));
-}
-else if(exp->__anon1.op.exp2->expType->kind == 13 || exp->__anon1.op.exp2->expType->kind == 12 || exp->__anon1.op.exp2->expType->kind == 11 || exp->__anon1.op.exp2->expType->kind == 16 || (type1->__anon1.type->kind == 0 && exp->__anon1.op.exp2->expType->kind == 8 && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered && (exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 0 || exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 1 || exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 5)))
+struct Expression * exp;
+
+for(exp = (*stmt->__anon1.switchStmt.exp).first; exp; exp = exp->next)
{
-if(exp->__anon1.op.op == ADD_ASSIGN)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0))));
+if(!exp->next)
+{
+ProcessExpressionType(exp);
+}
+if(!exp->next)
+curSwitchType = exp->expType;
}
-else if((exp->__anon1.op.exp2->expType->kind == 8 && type1->kind == 13 && type1->__anon1.type->kind == 8 && type1->__anon1.type->__anon1._class == exp->__anon1.op.exp2->expType->__anon1._class && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 1))
-{
-if(exp->__anon1.op.op == ADD_ASSIGN)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0))));
}
-else if(inCompiler)
+ProcessStatement(stmt->__anon1.switchStmt.stmt);
+curSwitchType = oldSwitchType;
+break;
+}
+case 6:
{
-char type1String[1024];
-char type2String[1024];
+if(stmt->__anon1.whileStmt.exp)
+{
+struct Expression * exp;
-type1String[0] = '\0';
-type2String[0] = '\0';
-PrintType(exp->__anon1.op.exp2->expType, type1String, 0x0, 0x1);
-PrintType(type1, type2String, 0x0, 0x1);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expression %s (%s); expected %s\n", (((void *)0))), expString, type1String, type2String);
+FreeType(((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType);
+((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType = MkClassType("bool");
+((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType->truth = 1;
+for(exp = (*stmt->__anon1.whileStmt.exp).first; exp; exp = exp->next)
+{
+ProcessExpressionType(exp);
}
}
-if(exp->__anon1.op.exp2->destType == dummy)
-{
-FreeType(dummy);
-exp->__anon1.op.exp2->destType = (((void *)0));
+if(stmt->__anon1.whileStmt.stmt)
+ProcessStatement(stmt->__anon1.whileStmt.stmt);
+break;
}
-if(exp->__anon1.op.op == '-' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2->expType && !exp->__anon1.op.exp2->expType->isSigned)
+case 7:
{
-type2 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-type2->refCount = 1;
-CopyTypeInto(type2, exp->__anon1.op.exp2->expType);
-type2->isSigned = 0x1;
-}
-else if(exp->__anon1.op.op == '~' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2->expType && (!exp->__anon1.op.exp2->expType->isSigned || exp->__anon1.op.exp2->expType->kind != 3))
+if(stmt->__anon1.doWhile.exp)
{
-type2 = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Expression * exp;
-__ecereInstance1->kind = 3, __ecereInstance1;
-});
-type2->refCount = 1;
-type2->isSigned = 0x1;
+if((*stmt->__anon1.doWhile.exp).last)
+{
+FreeType(((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType);
+((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType = MkClassType("bool");
+((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType->truth = 1;
}
-else
+for(exp = (*stmt->__anon1.doWhile.exp).first; exp; exp = exp->next)
{
-type2 = exp->__anon1.op.exp2->expType;
-if(type2)
-type2->refCount++;
+ProcessExpressionType(exp);
}
}
-dummy->kind = 0;
-if(exp->__anon1.op.op == SIZEOF)
+if(stmt->__anon1.doWhile.stmt)
+ProcessStatement(stmt->__anon1.doWhile.stmt);
+break;
+}
+case 8:
{
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Expression * exp;
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1;
-});
-exp->isConstant = 0x1;
-}
-else if(exp->__anon1.op.op == '*' && !exp->__anon1.op.exp1)
+if(stmt->__anon1.forStmt.init)
+ProcessStatement(stmt->__anon1.forStmt.init);
+if(stmt->__anon1.forStmt.check && stmt->__anon1.forStmt.check->__anon1.expressions)
{
-exp->expType = Dereference(type2);
-if(type2 && type2->kind == 8)
-notByReference = 0x1;
+FreeType(((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType);
+((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType = MkClassType("bool");
+((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType->truth = 1;
}
-else if(exp->__anon1.op.op == '&' && !exp->__anon1.op.exp1)
-exp->expType = Reference(type2);
-else if(!assign)
+if(stmt->__anon1.forStmt.check)
+ProcessStatement(stmt->__anon1.forStmt.check);
+if(stmt->__anon1.forStmt.increment)
{
-if(boolOps)
+for(exp = (*stmt->__anon1.forStmt.increment).first; exp; exp = exp->next)
+ProcessExpressionType(exp);
+}
+if(stmt->__anon1.forStmt.stmt)
+ProcessStatement(stmt->__anon1.forStmt.stmt);
+break;
+}
+case 18:
{
-if(exp->__anon1.op.exp1)
+struct Identifier * id = stmt->__anon1.forEachStmt.id;
+struct __ecereNameSpace__ecere__sys__OldList * exp = stmt->__anon1.forEachStmt.exp;
+struct __ecereNameSpace__ecere__sys__OldList * filter = stmt->__anon1.forEachStmt.filter;
+struct Statement * block = stmt->__anon1.forEachStmt.stmt;
+char iteratorType[1024];
+struct Type * source;
+struct Expression * e;
+unsigned int isBuiltin = exp && (*exp).last && (((struct Expression *)(*exp).last)->type == 35 || (((struct Expression *)(*exp).last)->type == 11 && ((struct Expression *)(*exp).last)->__anon1.cast.exp->type == 35));
+struct Expression * arrayExp;
+const char * typeString = (((void *)0));
+int builtinCount = 0;
+
+for(e = exp ? (*exp).first : (((void *)0)); e; e = e->next)
{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = MkClassType("bool");
-exp->__anon1.op.exp1->destType->truth = 0x1;
-if(!exp->__anon1.op.exp1->expType)
-ProcessExpressionType(exp->__anon1.op.exp1);
-else
-CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0);
-FreeType(exp->__anon1.op.exp1->expType);
-exp->__anon1.op.exp1->expType = MkClassType("bool");
-exp->__anon1.op.exp1->expType->truth = 0x1;
-}
-if(exp->__anon1.op.exp2)
+if(!e->next)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = MkClassType("bool");
-exp->__anon1.op.exp2->destType->truth = 0x1;
-if(!exp->__anon1.op.exp2->expType)
-ProcessExpressionType(exp->__anon1.op.exp2);
-else
-CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0);
-FreeType(exp->__anon1.op.exp2->expType);
-exp->__anon1.op.exp2->expType = MkClassType("bool");
-exp->__anon1.op.exp2->expType->truth = 0x1;
+FreeType(e->destType);
+e->destType = ProcessTypeString("Container", 0);
}
+if(!isBuiltin || e->next)
+ProcessExpressionType(e);
}
-else if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && ((useSideType) || ((!type1 || type1->kind != 8 || !strcmp(type1->__anon1._class->string, "String")) && (!type2 || type2->kind != 8 || !strcmp(type2->__anon1._class->string, "String")))))
-{
-if(type1 && type2 && ((type1->kind == 8 && type1->__anon1._class && strcmp(type1->__anon1._class->string, "String")) == (type2->kind == 8 && type2->__anon1._class && strcmp(type2->__anon1._class->string, "String"))))
-{
-if(exp->__anon1.op.op == '-' && ((type1->kind == 8 && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 4) || (type2->kind == 8 && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 4)))
+source = (exp && (*exp).last) ? ((struct Expression *)(*exp).last)->expType : (((void *)0));
+if(isBuiltin || (source && source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, containerClass)))
{
-struct Type * intType;
+struct __ecereNameSpace__ecere__com__Class * _class = source ? source->__anon1._class->__anon1.registered : (((void *)0));
+struct Symbol * symbol;
+struct Expression * expIt = (((void *)0));
+unsigned int isMap = 0, isArray = 0, isLinkList = 0, isList = 0, isCustomAVLTree = 0;
+struct __ecereNameSpace__ecere__com__Class * arrayClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Array");
+struct __ecereNameSpace__ecere__com__Class * linkListClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "LinkList");
+struct __ecereNameSpace__ecere__com__Class * customAVLTreeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "CustomAVLTree");
-if(!type1->__anon1._class->__anon1.registered->dataType)
-type1->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type1->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-if(!type2->__anon1._class->__anon1.registered->dataType)
-type2->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type2->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-intType = ProcessTypeString((type1->__anon1._class->__anon1.registered->dataType->kind == 4 || type2->__anon1._class->__anon1.registered->dataType->kind == 4) ? "int64" : "int", 0x0);
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp1->destType = intType;
-exp->__anon1.op.exp2->destType = intType;
-intType->refCount++;
-}
-else
+if(inCompiler)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1;
-type1->refCount++;
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = type2;
-type2->refCount++;
+stmt->type = 2;
+stmt->__anon1.compound.context = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Context);
+stmt->__anon1.compound.context->parent = curContext;
+curContext = stmt->__anon1.compound.context;
}
-if(!boolResult && type1->kind == 8 && (!exp->destType || exp->destType->kind != 8) && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 3 && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 3 && type1->__anon1._class->__anon1.registered != type2->__anon1._class->__anon1.registered)
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "operating on %s and %s with an untyped result, assuming %s\n", (((void *)0))), type1->__anon1._class->string, type2->__anon1._class->string, type1->__anon1._class->string);
-if(type1->kind == 13 && type1->__anon1.type->kind == 20 && type2->kind != 13)
+if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, customAVLTreeClass))
{
-struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 0x1);
+struct __ecereNameSpace__ecere__com__Class * mapClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Map");
-if(argExp)
+isCustomAVLTree = 1;
+if(__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, mapClass))
+isMap = 1;
+}
+else if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, arrayClass))
+isArray = 1;
+else if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, linkListClass))
{
-struct Expression * classExp = MkExpMember(argExp, MkIdentifier("dataTypeClass"));
+struct __ecereNameSpace__ecere__com__Class * listClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "List");
-exp->__anon1.op.exp1 = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), exp->__anon1.op.exp1)));
-ProcessExpressionType(exp->__anon1.op.exp1);
-if(type2->kind != 13)
-{
-ProcessExpressionType(classExp);
-exp->__anon1.op.exp2 = MkExpBrackets(MkListOne(MkExpOp(exp->__anon1.op.exp2, '*', MkExpMember(classExp, MkIdentifier("typeSize")))));
-if(!exp->__anon1.op.exp2->expType)
-{
-if(type2)
-FreeType(type2);
-type2 = exp->__anon1.op.exp2->expType = ProcessTypeString("int", 0x0);
-type2->refCount++;
-}
-ProcessExpressionType(exp->__anon1.op.exp2);
-}
-}
+isLinkList = 1;
+isList = __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, listClass);
}
-if(!boolResult && ((type1->kind == 13 || type1->kind == 12 || (type1->kind == 8 && !strcmp(type1->__anon1._class->string, "String"))) && (type2->kind == 23 || type2->kind == 22 || type2->kind == 4 || type2->kind == 3 || type2->kind == 2 || type2->kind == 1)))
+if(inCompiler && isArray)
{
-if(type1->kind != 8 && type1->__anon1.type->kind == 0)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "void *: unknown size\n", (((void *)0))));
-exp->expType = type1;
-if(type1)
-type1->refCount++;
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+
+decl = SpecDeclFromString(_class->templateArgs[2].__anon1.__anon1.dataTypeString, specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(id)));
+stmt->__anon1.compound.declarations = MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, (((void *)0))))));
+ListAdd(stmt->__anon1.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source->__anon1._class->__anon1.registered->fullName)), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalArray")), MkInitializerAssignment(MkExpBrackets(exp))))));
}
-else if(!boolResult && ((type2->kind == 13 || type2->kind == 12 || (type2->kind == 8 && !strcmp(type2->__anon1._class->string, "String"))) && (type1->kind == 23 || type1->kind == 22 || type1->kind == 4 || type1->kind == 3 || type1->kind == 2 || type1->kind == 1)))
+else if(isBuiltin)
{
-if(type2->kind != 8 && type2->__anon1.type->kind == 0)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "void *: unknown size\n", (((void *)0))));
-exp->expType = type2;
-if(type2)
-type2->refCount++;
+struct Type * type = (((void *)0));
+char typeStringBuf[1024];
+
+arrayExp = (((struct Expression *)(*exp).last)->type == 35) ? (struct Expression *)(*exp).last : ((struct Expression *)(*exp).last)->__anon1.cast.exp;
+if(((struct Expression *)(*exp).last)->type == 11)
+{
+struct TypeName * typeName = ((struct Expression *)(*exp).last)->__anon1.cast.typeName;
+
+if(typeName)
+arrayExp->destType = ProcessType(typeName->qualifiers, typeName->declarator);
}
-else if((type1->kind == 13 && type2->kind != 13 && type2->kind != 12 && type2->kind != 11 && type2->kind != 16 && type2->kind != 8 && type2->kind != 19) || (type2->kind == 13 && type1->kind != 13 && type1->kind != 12 && type1->kind != 11 && type1->kind != 16 && type1->kind != 8 && type1->kind != 19))
+if(arrayExp->destType && arrayExp->destType->kind == 8 && arrayExp->destType->__anon1._class && arrayExp->destType->__anon1._class->__anon1.registered && arrayExp->destType->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(arrayExp->destType->__anon1._class->__anon1.registered, containerClass) && arrayExp->destType->__anon1._class->__anon1.registered->templateArgs)
{
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "different levels of indirection\n", (((void *)0))));
+struct __ecereNameSpace__ecere__com__Class * templateClass = arrayExp->destType->__anon1._class->__anon1.registered;
+
+typeString = templateClass->templateArgs[2].__anon1.__anon1.dataTypeString;
}
-else
+else if(arrayExp->__anon1.list)
{
-unsigned int success = 0x0;
+struct Expression * e;
-if(type1->kind == 13 && type2->kind == 13)
+for(e = (*arrayExp->__anon1.list).first; e; e = e->next)
{
-if(exp->__anon1.op.op == '+')
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0))));
-else if(exp->__anon1.op.op == '-')
+ProcessExpressionType(e);
+if(e->expType)
{
-if(MatchTypes(type1->__anon1.type, type2->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 0x0, 0x0, 0x0, 0x0, 0x0))
+if(!type)
{
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->kind = 3, __ecereInstance1->refCount = 1, __ecereInstance1;
-});
-success = 0x1;
-if(type1->__anon1.type->kind == 20)
+type = e->expType;
+type->refCount++;
+}
+else
{
-struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 0x1);
-
-if(argExp)
+if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1))
{
-struct Expression * classExp = MkExpMember(argExp, MkIdentifier("dataTypeClass"));
-
-ProcessExpressionType(classExp);
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpOp(MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(exp->__anon1.op.exp1))), exp->__anon1.op.op, MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(exp->__anon1.op.exp2)))))), '/', MkExpMember(classExp, MkIdentifier("typeSize"))));
-ProcessExpressionType(((struct Expression *)(*exp->__anon1.list).first)->__anon1.op.exp2);
-FreeType(dummy);
-return ;
-}
+FreeType(type);
+type = e->expType;
+e->expType = (((void *)0));
+e = (*arrayExp->__anon1.list).first;
+ProcessExpressionType(e);
+if(e->expType)
+{
+if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1))
+{
+FreeType(e->expType);
+e->expType = (((void *)0));
+FreeType(type);
+type = (((void *)0));
+break;
}
}
}
}
-if(!success && exp->__anon1.op.exp1->type == 2)
-{
-if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0))
+if(e->expType)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp1->destType;
-if(exp->__anon1.op.exp1->destType)
-exp->__anon1.op.exp1->destType->refCount++;
-success = 0x1;
+FreeType(e->expType);
+e->expType = (((void *)0));
+}
+}
}
-else if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0))
+if(type)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp2->destType;
-if(exp->__anon1.op.exp2->destType)
-exp->__anon1.op.exp2->destType->refCount++;
-success = 0x1;
+typeStringBuf[0] = '\0';
+PrintType(type, typeStringBuf, 0, 1);
+typeString = typeStringBuf;
+FreeType(type);
}
}
-else if(!success)
+if(typeString)
{
-if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0))
+if(inCompiler)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp2->destType;
-if(exp->__anon1.op.exp2->destType)
-exp->__anon1.op.exp2->destType->refCount++;
-success = 0x1;
-}
-else if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0))
+struct __ecereNameSpace__ecere__sys__OldList * initializers = MkList();
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+
+if(arrayExp->__anon1.list)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp1->destType;
-if(exp->__anon1.op.exp1->destType)
-exp->__anon1.op.exp1->destType->refCount++;
-success = 0x1;
+struct Expression * e;
+
+builtinCount = (*arrayExp->__anon1.list).count;
+type = ProcessTypeString(typeString, 0);
+while((e = (*arrayExp->__anon1.list).first))
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*arrayExp->__anon1.list), e);
+e->destType = type;
+type->refCount++;
+ProcessExpressionType(e);
+if(inCompiler)
+ListAdd(initializers, MkInitializerAssignment(e));
+}
+FreeType(type);
+(__ecereNameSpace__ecere__com__eSystem_Delete(arrayExp->__anon1.list), arrayExp->__anon1.list = 0);
}
+decl = SpecDeclFromString(typeString, specs, MkDeclaratorIdentifier(id));
+stmt->__anon1.compound.declarations = MkListOne(MkDeclaration(CopyList(specs, (void *)(CopySpecifier)), MkListOne(MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl), (((void *)0))))));
+ListAdd(stmt->__anon1.compound.declarations, MkDeclaration(specs, MkListOne(MkInitDeclarator(PlugDeclarator(decl, MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__internalArray")), (((void *)0)))), MkInitializerList(initializers)))));
+FreeList(exp, (void *)(FreeExpression));
}
-if(!success)
+else if(arrayExp->__anon1.list)
{
-char expString1[10240];
-char expString2[10240];
-char type1[1024];
-char type2[1024];
+struct Expression * e;
-expString1[0] = '\0';
-expString2[0] = '\0';
-type1[0] = '\0';
-type2[0] = '\0';
-if(inCompiler)
+type = ProcessTypeString(typeString, 0);
+for(e = (*arrayExp->__anon1.list).first; e; e = e->next)
{
-PrintExpression(exp->__anon1.op.exp1, expString1);
-__ecereNameSpace__ecere__sys__ChangeCh(expString1, '\n', ' ');
-PrintExpression(exp->__anon1.op.exp2, expString2);
-__ecereNameSpace__ecere__sys__ChangeCh(expString2, '\n', ' ');
-PrintType(exp->__anon1.op.exp1->expType, type1, 0x0, 0x1);
-PrintType(exp->__anon1.op.exp2->expType, type2, 0x0, 0x1);
+e->destType = type;
+type->refCount++;
+ProcessExpressionType(e);
}
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expressions %s (%s) and %s (%s)\n", (((void *)0))), expString1, type1, expString2, type2);
+FreeType(type);
}
}
+else
+{
+arrayExp->expType = ProcessTypeString("Container", 0);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Couldn't determine type of array elements\n", (((void *)0))));
+}
}
-else if(!boolResult && (!useSideUnit) && type2 && type1 && type2->kind == 8 && type1->kind != 8 && type2->__anon1._class && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 3)
+else if(inCompiler && isLinkList && !isList)
{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType;
-if(type2->__anon1._class->__anon1.registered->dataType)
-type2->__anon1._class->__anon1.registered->dataType->refCount++;
-CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0);
-exp->expType = type2;
-if(type2)
-type2->refCount++;
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+
+decl = SpecDeclFromString(_class->templateArgs[3].__anon1.__anon1.dataTypeString, specs, MkDeclaratorIdentifier(id));
+stmt->__anon1.compound.declarations = MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, (((void *)0))))));
+ListAdd(stmt->__anon1.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source->__anon1._class->__anon1.registered->fullName)), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalLinkList")), MkInitializerAssignment(MkExpBrackets(exp))))));
}
-else if(!boolResult && (!useSideUnit) && type1 && type2 && type1->kind == 8 && type2->kind != 8 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 3)
+else if(inCompiler && _class->templateArgs)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType;
-if(type1->__anon1._class->__anon1.registered->dataType)
-type1->__anon1._class->__anon1.registered->dataType->refCount++;
-CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0);
-exp->expType = type1;
-if(type1)
-type1->refCount++;
+if(isMap)
+sprintf(iteratorType, "MapIterator<%s, %s >", _class->templateArgs[5].__anon1.__anon1.dataTypeString, _class->templateArgs[6].__anon1.__anon1.dataTypeString);
+else
+sprintf(iteratorType, "Iterator<%s, %s >", _class->templateArgs[2].__anon1.__anon1.dataTypeString, _class->templateArgs[1].__anon1.__anon1.dataTypeString);
+stmt->__anon1.compound.declarations = MkListOne(MkDeclarationInst(MkInstantiationNamed(MkListOne(MkSpecifierName(iteratorType)), MkExpIdentifier(id), MkListOne(MkMembersInitList(MkListOne(MkMemberInit(isMap ? MkListOne(MkIdentifier("map")) : (((void *)0)), MkInitializerAssignment(MkExpBrackets(exp)))))))));
}
-else if(type1)
+if(inCompiler)
{
-unsigned int valid = 0x0;
-
-if(!boolResult && useSideUnit && type1 && type1->kind == 8 && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 3 && type2 && type2->kind != 8)
+symbol = FindSymbol(id->string, curContext, curContext, 0, 0);
+if(block)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-if(!type1->__anon1._class->__anon1.registered->dataType)
-type1->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type1->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType;
-exp->__anon1.op.exp2->destType->refCount++;
-CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0);
-if(type2)
-FreeType(type2);
-type2 = exp->__anon1.op.exp2->destType;
-if(type2)
-type2->refCount++;
-exp->expType = type2;
-type2->refCount++;
+switch(block->type)
+{
+case 2:
+if(block->__anon1.compound.context)
+block->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
+case 4:
+if(block->__anon1.ifStmt.stmt && block->__anon1.ifStmt.stmt->type == 2 && block->__anon1.ifStmt.stmt->__anon1.compound.context)
+block->__anon1.ifStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+if(block->__anon1.ifStmt.elseStmt && block->__anon1.ifStmt.elseStmt->type == 2 && block->__anon1.ifStmt.elseStmt->__anon1.compound.context)
+block->__anon1.ifStmt.elseStmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
+case 5:
+if(block->__anon1.switchStmt.stmt && block->__anon1.switchStmt.stmt->type == 2 && block->__anon1.switchStmt.stmt->__anon1.compound.context)
+block->__anon1.switchStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
+case 6:
+if(block->__anon1.whileStmt.stmt && block->__anon1.whileStmt.stmt->type == 2 && block->__anon1.whileStmt.stmt->__anon1.compound.context)
+block->__anon1.whileStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
+case 7:
+if(block->__anon1.doWhile.stmt && block->__anon1.doWhile.stmt->type == 2 && block->__anon1.doWhile.stmt->__anon1.compound.context)
+block->__anon1.doWhile.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
+case 8:
+if(block->__anon1.forStmt.stmt && block->__anon1.forStmt.stmt->type == 2 && block->__anon1.forStmt.stmt->__anon1.compound.context)
+block->__anon1.forStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
+case 18:
+if(block->__anon1.forEachStmt.stmt && block->__anon1.forEachStmt.stmt->type == 2 && block->__anon1.forEachStmt.stmt->__anon1.compound.context)
+block->__anon1.forEachStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
+break;
}
-if(!boolResult && useSideUnit && type2 && type2->kind == 8 && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 3 && type1 && type1->kind != 8)
+}
+if(filter)
{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-if(!type2->__anon1._class->__anon1.registered->dataType)
-type2->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type2->__anon1._class->__anon1.registered->dataTypeString, 0x0);
-exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType;
-exp->__anon1.op.exp1->destType->refCount++;
-CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0);
-type1 = exp->__anon1.op.exp1->destType;
-exp->expType = type1;
-type1->refCount++;
+block = MkIfStmt(filter, block, (((void *)0)));
}
-if(!boolResult || exp->__anon1.op.op == '>' || exp->__anon1.op.op == '<' || exp->__anon1.op.op == GE_OP || exp->__anon1.op.op == LE_OP)
+if(isArray)
+{
+stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("array"))))), MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<', MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("array")), '+', MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("count")))))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, (((void *)0)))), block));
+ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.init);
+ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.check);
+ProcessExpressionType((*((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.increment).first);
+}
+else if(isBuiltin)
{
-unsigned int op1IsEnum = type1 && type1->kind == 8 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 4;
-unsigned int op2IsEnum = type2 && type2->kind == 8 && type2->__anon1._class && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 4;
+char count[128];
-if(exp->__anon1.op.op == '*' || exp->__anon1.op.op == '/' || exp->__anon1.op.op == '-' || exp->__anon1.op.op == '|' || exp->__anon1.op.op == '^')
+sprintf(count, "%d", builtinCount);
+stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpIdentifier(MkIdentifier("__internalArray"))))), MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<', MkExpOp(MkExpIdentifier(MkIdentifier("__internalArray")), '+', MkExpConstant(count))))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, (((void *)0)))), block));
+ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.init);
+ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.check);
+ProcessExpressionType((*((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.increment).first);
+}
+else if(isLinkList && !isList)
{
-if(op1IsEnum && exp->__anon1.op.exp2->expType)
+struct __ecereNameSpace__ecere__com__Class * typeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, _class->templateArgs[3].__anon1.__anon1.dataTypeString);
+struct __ecereNameSpace__ecere__com__Class * listItemClass = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, "ListItem");
+
+if(typeClass && __ecereNameSpace__ecere__com__eClass_IsDerived(typeClass, listItemClass) && _class->templateArgs[5].__anon1.__anon1.dataTypeString && !strcmp(_class->templateArgs[5].__anon1.__anon1.dataTypeString, "LT::link"))
{
-if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0x0, 0x0))
+stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("first"))))), MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(CopyIdentifier(id)), MkIdentifier("next")))), block));
+}
+else
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp2->expType;
-if(exp->__anon1.op.exp2->expType)
-exp->__anon1.op.exp2->expType->refCount++;
-valid = 0x1;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl = SpecDeclFromString(_class->templateArgs[3].__anon1.__anon1.dataTypeString, specs, (((void *)0)));
+
+stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("first"))))), MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpCast(MkTypeName(specs, decl), MkExpCall(MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("GetNext")), MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("IteratorPointer")), (((void *)0))), MkExpIdentifier(CopyIdentifier(id)))))))), block));
}
+ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.init);
+ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.check);
+ProcessExpressionType((*((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.increment).first);
}
-else if(op2IsEnum && exp->__anon1.op.exp1->expType)
-{
-if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0x0, 0x0))
+else
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp1->expType;
-if(exp->__anon1.op.exp1->expType)
-exp->__anon1.op.exp1->expType->refCount++;
-valid = 0x1;
+stmt->__anon1.compound.statements = MkListOne(MkWhileStmt(MkListOne(MkExpCall(MkExpMember(expIt = MkExpIdentifier(CopyIdentifier(id)), MkIdentifier("Next")), (((void *)0)))), block));
}
+ProcessExpressionType(expIt);
+if((*stmt->__anon1.compound.declarations).first)
+ProcessDeclaration((*stmt->__anon1.compound.declarations).first, 1);
+if(symbol)
+symbol->isIterator = isMap ? 2 : ((isArray || isBuiltin) ? 3 : (isLinkList ? (isList ? 5 : 4) : (isCustomAVLTree ? 6 : 1)));
+ProcessStatement(stmt);
}
+else
+ProcessStatement(stmt->__anon1.forEachStmt.stmt);
+if(inCompiler)
+curContext = stmt->__anon1.compound.context->parent;
+break;
}
else
{
-if(op1IsEnum && exp->__anon1.op.exp2->expType)
-{
-if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0x0, 0x0))
-{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp1->expType;
-if(exp->__anon1.op.exp1->expType)
-exp->__anon1.op.exp1->expType->refCount++;
-valid = 0x1;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Expression is not a container\n", (((void *)0))));
}
+break;
}
-else if(op2IsEnum && exp->__anon1.op.exp1->expType)
+case 9:
+break;
+case 10:
+break;
+case 11:
+break;
+case 12:
+{
+struct Expression * exp;
+
+if(stmt->__anon1.expressions)
{
-if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0x0, 0x0))
+for(exp = (*stmt->__anon1.expressions).first; exp; exp = exp->next)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp2->expType;
-if(exp->__anon1.op.exp2->expType)
-exp->__anon1.op.exp2->expType->refCount++;
-valid = 0x1;
+if(!exp->next)
+{
+if(curFunction && !curFunction->type)
+curFunction->type = ProcessType(curFunction->specifiers, curFunction->declarator);
+FreeType(exp->destType);
+exp->destType = (curFunction && curFunction->type && curFunction->type->kind == 11) ? curFunction->type->__anon1.__anon2.returnType : (((void *)0));
+if(exp->destType)
+exp->destType->refCount++;
}
+ProcessExpressionType(exp);
}
}
+break;
}
-if(!valid)
+case 14:
{
-if(type2 && type2->kind == 8 && type2->__anon1._class && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 3 && (type1->kind != 8 || !type1->__anon1._class || !type1->__anon1._class->__anon1.registered || type1->__anon1._class->__anon1.registered->type != 3))
+ProcessDeclaration(stmt->__anon1.decl, 1);
+break;
+}
+case 13:
{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = type2;
-type2->refCount++;
-if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0))
+struct AsmField * field;
+
+if(stmt->__anon1.asmStmt.inputFields)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp1->destType;
-if(exp->__anon1.op.exp1->destType)
-exp->__anon1.op.exp1->destType->refCount++;
+for(field = (*stmt->__anon1.asmStmt.inputFields).first; field; field = field->next)
+if(field->expression)
+ProcessExpressionType(field->expression);
}
+if(stmt->__anon1.asmStmt.outputFields)
+{
+for(field = (*stmt->__anon1.asmStmt.outputFields).first; field; field = field->next)
+if(field->expression)
+ProcessExpressionType(field->expression);
}
-else
+if(stmt->__anon1.asmStmt.clobberedFields)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1;
-type1->refCount++;
-if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0))
+for(field = (*stmt->__anon1.asmStmt.clobberedFields).first; field; field = field->next)
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp2->destType;
-if(exp->__anon1.op.exp2->destType)
-exp->__anon1.op.exp2->destType->refCount++;
+if(field->expression)
+ProcessExpressionType(field->expression);
}
-else if(type1 && type2)
+}
+break;
+}
+case 17:
{
-char expString1[10240];
-char expString2[10240];
-char type1String[1024];
-char type2String[1024];
+struct PropertyWatch * propWatch;
+struct __ecereNameSpace__ecere__sys__OldList * watches = stmt->__anon1._watch.watches;
+struct Expression * object = stmt->__anon1._watch.object;
+struct Expression * watcher = stmt->__anon1._watch.watcher;
-expString1[0] = '\0';
-expString2[0] = '\0';
-type1String[0] = '\0';
-type2String[0] = '\0';
+if(watcher)
+ProcessExpressionType(watcher);
+if(object)
+ProcessExpressionType(object);
if(inCompiler)
{
-PrintExpression(exp->__anon1.op.exp1, expString1);
-__ecereNameSpace__ecere__sys__ChangeCh(expString1, '\n', ' ');
-PrintExpression(exp->__anon1.op.exp2, expString2);
-__ecereNameSpace__ecere__sys__ChangeCh(expString2, '\n', ' ');
-PrintType(exp->__anon1.op.exp1->expType, type1String, 0x0, 0x1);
-PrintType(exp->__anon1.op.exp2->expType, type2String, 0x0, 0x1);
-}
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expressions %s (%s) and %s (%s)\n", (((void *)0))), expString1, type1String, expString2, type2String);
-if(type1->kind == 8 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 4)
+if(watcher || thisClass)
{
-exp->expType = exp->__anon1.op.exp1->expType;
-if(exp->__anon1.op.exp1->expType)
-exp->__anon1.op.exp1->expType->refCount++;
-}
-else if(type2->kind == 8 && type2->__anon1._class && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 4)
+struct External * external = curExternal;
+struct Context * context = curContext;
+
+stmt->type = 3;
+stmt->__anon1.expressions = MkList();
+for(propWatch = (*watches).first; propWatch; propWatch = propWatch->next)
{
-exp->expType = exp->__anon1.op.exp2->expType;
-if(exp->__anon1.op.exp2->expType)
-exp->__anon1.op.exp2->expType->refCount++;
-}
-}
-}
+struct ClassFunction * func;
+char watcherName[1024];
+struct __ecereNameSpace__ecere__com__Class * watcherClass = watcher ? ((watcher->expType && watcher->expType->kind == 8 && watcher->expType->__anon1._class) ? watcher->expType->__anon1._class->__anon1.registered : (((void *)0))) : thisClass;
+struct External * createdExternal;
+
+sprintf(watcherName, "__ecerePropertyWatcher_%d", propWatcherID++);
+if(propWatch->deleteWatch)
+strcat(watcherName, "_delete");
+else
+{
+struct Identifier * propID;
+
+for(propID = (*propWatch->properties).first; propID; propID = propID->next)
+{
+strcat(watcherName, "_");
+strcat(watcherName, propID->string);
}
}
-else if(type2)
+if(object && object->expType && object->expType->kind == 8 && object->expType->__anon1._class && object->expType->__anon1._class->__anon1.registered)
{
-if(type2->kind == 8 && type2->__anon1._class && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 4)
+func = MkClassFunction(MkListOne(MkSpecifier(VOID)), (((void *)0)), MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(watcherName)), MkListOne(MkTypeName(MkListOne(MkSpecifierName(object->expType->__anon1._class->string)), MkDeclaratorIdentifier(MkIdentifier("value"))))), (((void *)0)));
+ProcessClassFunctionBody(func, propWatch->compound);
+propWatch->compound = (((void *)0));
+createdExternal = ProcessClassFunction(watcherClass, func, ast, curExternal, 1);
+FreeClassFunction(func);
+curExternal = createdExternal;
+ProcessFunction(createdExternal->__anon1.function);
+if(propWatch->deleteWatch)
{
-struct Type * oldType = exp->__anon1.op.exp1->expType;
+struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
-exp->__anon1.op.exp1->expType = (((void *)0));
-if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0))
-FreeType(oldType);
-else
-exp->__anon1.op.exp1->expType = oldType;
+ListAdd(args, CopyExpression(object));
+ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(args, MkExpIdentifier(MkIdentifier(watcherName)));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_WatchDestruction")), args));
}
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = type2;
-type2->refCount++;
-if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0))
+else
{
-if(exp->expType)
-FreeType(exp->expType);
-exp->expType = exp->__anon1.op.exp1->destType;
-if(exp->__anon1.op.exp1->destType)
-exp->__anon1.op.exp1->destType->refCount++;
-}
-}
-}
-else if(type2 && (!type1 || (type2->kind == 8 && type1->kind != 8)))
+struct __ecereNameSpace__ecere__com__Class * _class = object->expType->__anon1._class->__anon1.registered;
+struct Identifier * propID;
+
+for(propID = (*propWatch->properties).first; propID; propID = propID->next)
{
-if(type1 && type2->__anon1._class && type2->__anon1._class->__anon1.registered && type2->__anon1._class->__anon1.registered->type == 3)
+char propName[1024];
+struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, propID->string, privateModule);
+
+if(prop)
{
-if(exp->__anon1.op.exp1->destType)
-FreeType(exp->__anon1.op.exp1->destType);
-exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType;
-if(type2->__anon1._class->__anon1.registered->dataType)
-type2->__anon1._class->__anon1.registered->dataType->refCount++;
-CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0);
+char getName[1024], setName[1024];
+struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
+
+DeclareProperty(createdExternal, prop, setName, getName);
+strcpy(propName, "__ecereProp_");
+FullClassNameCat(propName, prop->_class->fullName, 0);
+strcat(propName, "_");
+FullClassNameCat(propName, prop->name, 1);
+ListAdd(args, CopyExpression(object));
+ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
+ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(args, MkExpCast(MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpIdentifier(MkIdentifier(watcherName))));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_Watch")), args));
+__ecereMethod_External_CreateUniqueEdge(external, createdExternal, 1);
+}
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Property %s not found in class %s\n", (((void *)0))), propID->string, _class->fullName);
+}
}
-if(exp->__anon1.op.op == '!')
-{
-exp->expType = MkClassType("bool");
-exp->expType->truth = 0x1;
}
else
-{
-exp->expType = type2;
-if(type2)
-type2->refCount++;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Invalid watched object\n", (((void *)0))));
+}
+curExternal = external;
+curContext = context;
+if(watcher)
+FreeExpression(watcher);
+if(object)
+FreeExpression(object);
+FreeList(watches, (void *)(FreePropertyWatch));
}
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "No observer specified and not inside a class\n", (((void *)0))));
}
-else if(type1 && (!type2 || (type1->kind == 8 && type2->kind != 8)))
+else
{
-if(type2 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 3)
+for(propWatch = (*watches).first; propWatch; propWatch = propWatch->next)
{
-if(exp->__anon1.op.exp2->destType)
-FreeType(exp->__anon1.op.exp2->destType);
-exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType;
-if(type1->__anon1._class->__anon1.registered->dataType)
-type1->__anon1._class->__anon1.registered->dataType->refCount++;
-CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0);
+ProcessStatement(propWatch->compound);
}
-exp->expType = type1;
-if(type1)
-type1->refCount++;
}
+break;
}
-yylloc = exp->loc;
-if(exp->__anon1.op.exp1 && !exp->__anon1.op.exp1->expType)
+case 15:
{
-char expString[10000];
+struct __ecereNameSpace__ecere__sys__OldList * watches = stmt->__anon1._watch.watches;
+struct Expression * object = stmt->__anon1._watch.object;
+struct __ecereNameSpace__ecere__com__Class * _class;
-expString[0] = '\0';
+if(object)
+ProcessExpressionType(object);
if(inCompiler)
{
-PrintExpression(exp->__anon1.op.exp1, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
-}
-if(expString[0])
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
-}
-if(exp->__anon1.op.exp2 && !exp->__anon1.op.exp2->expType)
+_class = object ? ((object->expType && object->expType->kind == 8 && object->expType->__anon1._class) ? object->expType->__anon1._class->__anon1.registered : (((void *)0))) : thisClass;
+if(_class)
{
-char expString[10240];
+struct Identifier * propID;
-expString[0] = '\0';
-if(inCompiler)
+stmt->type = 3;
+stmt->__anon1.expressions = MkList();
+if(!watches && curFunction->propSet && (!object || (object->type == 0 && !strcmp(object->__anon1.__anon1.identifier->string, "this"))))
{
-PrintExpression(exp->__anon1.op.exp2, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
-}
-if(expString[0])
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
+watches = MkListOne(MkIdentifier(curFunction->propSet->string));
}
-if(boolResult)
+else if(!watches)
{
-FreeType(exp->expType);
-exp->expType = MkClassType("bool");
-exp->expType->truth = 0x1;
}
-if(exp->__anon1.op.op != SIZEOF)
-exp->isConstant = (!exp->__anon1.op.exp1 || exp->__anon1.op.exp1->isConstant) && (!exp->__anon1.op.exp2 || exp->__anon1.op.exp2->isConstant);
-if(exp->__anon1.op.op == SIZEOF && exp->__anon1.op.exp2->expType)
+if(watches)
{
-DeclareType(exp->__anon1.op.exp2->expType, 0x0, 0x0);
-}
-if(exp->__anon1.op.op == DELETE && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->expType && __ecereProp_Type_Get_specConst(exp->__anon1.op.exp2->expType))
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "deleting const qualified object\n", (((void *)0))));
-yylloc = oldyylloc;
-FreeType(dummy);
-if(type2)
-FreeType(type2);
-break;
+for(propID = (*watches).first; propID; propID = propID->next)
+{
+struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, propID->string, privateModule);
+
+if(prop)
+{
+CreateFireWatcher(prop, object, stmt);
}
-case 5:
-case 32:
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Property %s not found in class %s\n", (((void *)0))), propID->string, _class->fullName);
+}
+}
+else
{
-struct Expression * e;
+struct __ecereNameSpace__ecere__com__Property * prop;
+struct __ecereNameSpace__ecere__com__Class * base;
-exp->isConstant = 0x1;
-for(e = (*exp->__anon1.list).first; e; e = e->next)
+for(base = _class; base; base = base->base)
{
-unsigned int inced = 0x0;
-
-if(!e->next)
+for(prop = base->membersAndProperties.first; prop; prop = prop->next)
{
-FreeType(e->destType);
-e->opDestType = exp->opDestType;
-e->destType = exp->destType;
-if(e->destType)
+if(prop->isProperty && prop->isWatchable)
{
-exp->destType->refCount++;
-e->destType->count++;
-inced = 0x1;
+CreateFireWatcher(prop, object, stmt);
}
}
-ProcessExpressionType(e);
-if(inced)
-exp->destType->count--;
-if(!exp->expType && !e->next)
-{
-exp->expType = e->expType;
-if(e->expType)
-e->expType->refCount++;
}
-if(!e->isConstant)
-exp->isConstant = 0x0;
}
-e = (*exp->__anon1.list).first;
-if(!e->next && e->type == 8)
-{
-struct Expression * next = exp->next, * prev = exp->prev;
-
-FreeType(exp->expType);
-FreeType(exp->destType);
-(__ecereNameSpace__ecere__com__eSystem_Delete(exp->__anon1.list), exp->__anon1.list = 0);
-*exp = *e;
-exp->prev = prev;
-exp->next = next;
-((e ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)e) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(e)) : 0), e = 0);
-ProcessExpressionType(exp);
+if(object)
+FreeExpression(object);
+FreeList(watches, (void *)(FreeIdentifier));
+}
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Invalid object specified and not inside a class\n", (((void *)0))));
}
break;
}
-case 6:
+case 16:
{
-struct Expression * e;
+struct __ecereNameSpace__ecere__sys__OldList * watches = stmt->__anon1._watch.watches;
+struct Expression * object = stmt->__anon1._watch.object;
+struct Expression * watcher = stmt->__anon1._watch.watcher;
+struct __ecereNameSpace__ecere__com__Class * _class;
-exp->isConstant = 0x1;
-ProcessExpressionType(exp->__anon1.index.exp);
-if(!exp->__anon1.index.exp->isConstant)
-exp->isConstant = 0x0;
-if(exp->__anon1.index.exp->expType)
+if(object)
+ProcessExpressionType(object);
+if(watcher)
+ProcessExpressionType(watcher);
+if(inCompiler)
{
-struct Type * source = exp->__anon1.index.exp->expType;
+_class = (object && object->expType && object->expType->kind == 8 && object->expType->__anon1._class) ? object->expType->__anon1._class->__anon1.registered : (((void *)0));
+if(watcher || thisClass)
+{
+if(_class)
+{
+struct Identifier * propID;
-if(source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered)
+stmt->type = 3;
+stmt->__anon1.expressions = MkList();
+if(!watches)
{
-struct __ecereNameSpace__ecere__com__Class * _class = source->__anon1._class->__anon1.registered;
-struct __ecereNameSpace__ecere__com__Class * c = _class->templateClass ? _class->templateClass : _class;
+struct __ecereNameSpace__ecere__sys__OldList * args;
-if(_class != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(c, containerClass) && _class->templateArgs)
+args = MkList();
+ListAdd(args, CopyExpression(object));
+ListAdd(args, MkExpConstant("0"));
+ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_StopWatching")), args));
+}
+else
{
-exp->expType = ProcessTypeString(_class->templateArgs[2].__anon1.__anon1.dataTypeString, 0x0);
-if(exp->__anon1.index.index && (*exp->__anon1.index.index).last)
+for(propID = (*watches).first; propID; propID = propID->next)
{
-struct Type * type = ProcessTypeString(_class->templateArgs[1].__anon1.__anon1.dataTypeString, 0x0);
+char propName[1024];
+struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, propID->string, privateModule);
-if(type->kind == 8)
-type->constant = 0x1;
-else if(type->kind == 13)
+if(prop)
{
-struct Type * t = type;
+char getName[1024], setName[1024];
+struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
-while(t->kind == 13)
-t = t->__anon1.type;
-t->constant = 0x1;
+DeclareProperty(curExternal, prop, setName, getName);
+strcpy(propName, "__ecereProp_");
+FullClassNameCat(propName, prop->_class->fullName, 0);
+strcat(propName, "_");
+FullClassNameCat(propName, prop->name, 1);
+ListAdd(args, CopyExpression(object));
+ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
+ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
+ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_StopWatching")), args));
}
-((struct Expression *)(*exp->__anon1.index.index).last)->destType = type;
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Property %s not found in class %s\n", (((void *)0))), propID->string, _class->fullName);
}
}
+if(object)
+FreeExpression(object);
+if(watcher)
+FreeExpression(watcher);
+FreeList(watches, (void *)(FreeIdentifier));
}
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Invalid object specified and not inside a class\n", (((void *)0))));
}
-for(e = (*exp->__anon1.index.index).first; e; e = e->next)
-{
-if(!e->next && exp->__anon1.index.exp->expType && exp->__anon1.index.exp->expType->kind == 12 && exp->__anon1.index.exp->expType->__anon1.__anon4.enumClass)
-{
-if(e->destType)
-FreeType(e->destType);
-e->destType = MkClassType(exp->__anon1.index.exp->expType->__anon1.__anon4.enumClass->string);
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "No observer specified and not inside a class\n", (((void *)0))));
}
-ProcessExpressionType(e);
-if(!e->next)
-{
+break;
}
-if(!e->isConstant)
-exp->isConstant = 0x0;
}
-if(!exp->expType)
-exp->expType = Dereference(exp->__anon1.index.exp->expType);
-if(exp->expType)
-DeclareType(exp->expType, 0x0, 0x0);
-break;
}
-case 7:
+
+void ComputeDataTypes()
{
-struct Expression * e;
-struct Type * functionType;
-struct Type * methodType = (((void *)0));
-char name[1024];
+struct External * external;
-name[0] = '\0';
-if(inCompiler)
+currentClass = (((void *)0));
+containerClass = __ecereNameSpace__ecere__com__eSystem_FindClass(GetPrivateModule(), "Container");
+DeclareStruct((((void *)0)), "ecere::com::Class", 0, 1);
+DeclareStruct((((void *)0)), "ecere::com::Instance", 0, 1);
+DeclareStruct((((void *)0)), "ecere::com::Property", 0, 1);
+DeclareStruct((((void *)0)), "ecere::com::DataMember", 0, 1);
+DeclareStruct((((void *)0)), "ecere::com::Method", 0, 1);
+DeclareStruct((((void *)0)), "ecere::com::SerialBuffer", 0, 1);
+DeclareStruct((((void *)0)), "ecere::com::ClassTemplateArgument", 0, 1);
+DeclareFunctionUtil((((void *)0)), "eSystem_New");
+DeclareFunctionUtil((((void *)0)), "eSystem_New0");
+DeclareFunctionUtil((((void *)0)), "eSystem_Renew");
+DeclareFunctionUtil((((void *)0)), "eSystem_Renew0");
+DeclareFunctionUtil((((void *)0)), "eSystem_Delete");
+DeclareFunctionUtil((((void *)0)), "eClass_GetProperty");
+DeclareFunctionUtil((((void *)0)), "eClass_SetProperty");
+DeclareFunctionUtil((((void *)0)), "eInstance_FireSelfWatchers");
+DeclareFunctionUtil((((void *)0)), "eInstance_SetMethod");
+DeclareFunctionUtil((((void *)0)), "eInstance_IncRef");
+DeclareFunctionUtil((((void *)0)), "eInstance_StopWatching");
+DeclareFunctionUtil((((void *)0)), "eInstance_Watch");
+DeclareFunctionUtil((((void *)0)), "eInstance_FireWatchers");
+reachedPass15 = 1;
+for(external = (*ast).first; external; external = external->next)
{
-PrintExpression(exp->__anon1.call.exp, name);
-if(exp->__anon1.call.exp->expType && !exp->__anon1.call.exp->expType->__anon1.__anon2.returnType)
+afterExternal = curExternal = external;
+if(external->type == 0)
{
-PrintExpression(exp->__anon1.call.exp, name);
+if(memoryGuard)
+{
+DeclareFunctionUtil(external, "MemoryGuard_PushLoc");
+DeclareFunctionUtil(external, "MemoryGuard_PopLoc");
}
+currentClass = external->__anon1.function->_class;
+ProcessFunction(external->__anon1.function);
}
-if(exp->__anon1.call.exp->type == 0)
+else if(external->type == 1)
{
-struct Expression * idExp = exp->__anon1.call.exp;
-struct Identifier * id = idExp->__anon1.__anon1.identifier;
-
-if(!strcmp(id->string, "__builtin_frame_address"))
+if(memoryGuard && external->__anon1.declaration && external->__anon1.declaration->type == 2)
{
-exp->expType = ProcessTypeString("void *", 0x1);
-if(exp->__anon1.call.arguments && (*exp->__anon1.call.arguments).first)
-ProcessExpressionType((*exp->__anon1.call.arguments).first);
-break;
+DeclareFunctionUtil(external, "MemoryGuard_PushLoc");
+DeclareFunctionUtil(external, "MemoryGuard_PopLoc");
}
-else if(!strcmp(id->string, "__ENDIAN_PAD"))
-{
-exp->expType = ProcessTypeString("int", 0x1);
-if(exp->__anon1.call.arguments && (*exp->__anon1.call.arguments).first)
-ProcessExpressionType((*exp->__anon1.call.arguments).first);
-break;
+currentClass = (((void *)0));
+if(external->__anon1.declaration)
+ProcessDeclaration(external->__anon1.declaration, 1);
}
-else if(!strcmp(id->string, "Max") || !strcmp(id->string, "Min") || !strcmp(id->string, "Sgn") || !strcmp(id->string, "Abs"))
+else if(external->type == 2)
{
-struct Expression * a = (((void *)0));
-struct Expression * b = (((void *)0));
-struct Expression * tempExp1 = (((void *)0)), * tempExp2 = (((void *)0));
+struct ClassDefinition * _class = external->__anon1._class;
-if((!strcmp(id->string, "Max") || !strcmp(id->string, "Min")) && (*exp->__anon1.call.arguments).count == 2)
+currentClass = external->symbol->__anon1.registered;
+if(memoryGuard)
{
-a = (*exp->__anon1.call.arguments).first;
-b = (*exp->__anon1.call.arguments).last;
-tempExp1 = a;
-tempExp2 = b;
+DeclareFunctionUtil(external, "MemoryGuard_PushLoc");
+DeclareFunctionUtil(external, "MemoryGuard_PopLoc");
}
-else if((*exp->__anon1.call.arguments).count == 1)
+if(_class->definitions)
{
-a = (*exp->__anon1.call.arguments).first;
-tempExp1 = a;
+ProcessClass(_class->definitions, _class->symbol);
}
-if(a)
-{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear((&*exp->__anon1.call.arguments));
-idExp->__anon1.__anon1.identifier = (((void *)0));
-FreeExpContents(exp);
-ProcessExpressionType(a);
-if(b)
-ProcessExpressionType(b);
-exp->type = 5;
-exp->__anon1.list = MkList();
-if(a->expType && (!b || b->expType))
-{
-if((!a->isConstant && a->type != 0) || (b && !b->isConstant && b->type != 0))
-{
if(inCompiler)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct __ecereNameSpace__ecere__sys__OldList * decls = MkList();
-struct Declaration * decl;
-char temp1[1024], temp2[1024];
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*ast), external);
+((external ? __extension__ ({
+void * __ecerePtrToDelete = (external);
-GetTypeSpecs(a->expType, specs);
-if(a && !a->isConstant && a->type != 0)
-{
-sprintf(temp1, "__simpleStruct%d", curContext->simpleID++);
-ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(temp1)), (((void *)0))));
-tempExp1 = QMkExpId(temp1);
-tempExp1->expType = a->expType;
-if(a->expType)
-a->expType->refCount++;
-ListAdd(exp->__anon1.list, MkExpOp(CopyExpression(tempExp1), '=', a));
+__ecereClass_External->Destructor ? __ecereClass_External->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), external = 0);
}
-if(b && !b->isConstant && b->type != 0)
-{
-sprintf(temp2, "__simpleStruct%d", curContext->simpleID++);
-ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(temp2)), (((void *)0))));
-tempExp2 = QMkExpId(temp2);
-tempExp2->expType = b->expType;
-if(b->expType)
-b->expType->refCount++;
-ListAdd(exp->__anon1.list, MkExpOp(CopyExpression(tempExp2), '=', b));
}
-decl = MkDeclaration(specs, decls);
-if(!curCompound->__anon1.compound.declarations)
-curCompound->__anon1.compound.declarations = MkList();
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*curCompound->__anon1.compound.declarations), (((void *)0)), decl);
+else if(external->type == 4)
+{
+thisNameSpace = external->__anon1.id->string;
}
}
+currentClass = (((void *)0));
+thisNameSpace = (((void *)0));
+curExternal = (((void *)0));
}
-if(!strcmp(id->string, "Max") || !strcmp(id->string, "Min"))
+
+void ProcessExpressionType(struct Expression * exp)
{
-int op = (!strcmp(id->string, "Max")) ? '>' : '<';
+unsigned int unresolved = 0;
+struct Location oldyylloc = yylloc;
+unsigned int notByReference = 0;
-ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), op, CopyExpression(tempExp2)))), MkListOne(CopyExpression(tempExp1)), CopyExpression(tempExp2)));
-exp->expType = a->expType;
-if(a->expType)
-a->expType->refCount++;
-}
-else if(!strcmp(id->string, "Abs"))
+if(!exp || exp->expType)
+return ;
+yylloc = exp->loc;
+switch(exp->type)
{
-ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))), MkListOne(MkExpOp((((void *)0)), '-', CopyExpression(tempExp1))), CopyExpression(tempExp1)));
-exp->expType = a->expType;
-if(a->expType)
-a->expType->refCount++;
+case 0:
+{
+struct Identifier * id = exp->__anon1.__anon1.identifier;
+
+if(!id || !topContext)
+return ;
+if(id->_class && id->_class->__anon1.__anon1.name)
+{
+id->classSym = id->_class->__anon1.__anon1.symbol;
}
-else if(!strcmp(id->string, "Sgn"))
+if(!strcmp(id->string, "__runtimePlatform"))
{
-ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp((((void *)0)), '!', CopyExpression(tempExp1)))), MkListOne(MkExpConstant("0")), MkExpBrackets(MkListOne(MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))), MkListOne(MkExpConstant("-1")), MkExpConstant("1"))))));
-exp->expType = ProcessTypeString("int", 0x0);
+exp->expType = ProcessTypeString("ecere::com::Platform", 1);
+break;
}
-FreeExpression(tempExp1);
-if(tempExp2)
-FreeExpression(tempExp2);
-FreeIdentifier(id);
+else if(strstr(id->string, "__ecereClass") == id->string)
+{
+exp->expType = ProcessTypeString("ecere::com::Class", 1);
break;
}
+else if(id->_class && (id->classSym || (id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property"))))
+{
+ReplaceClassMembers(exp, thisClass);
+if(exp->type != 0)
+{
+ProcessExpressionType(exp);
+break;
}
+if(id->classSym && ResolveIdWithClass(exp, id->classSym->__anon1.registered, 0))
+break;
}
+else
{
-struct Type * dummy = (dummy = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), dummy->count = 1, dummy->refCount = 1, dummy);
+struct Symbol * symbol = (((void *)0));
+unsigned int findInGlobal = 0;
-if(!exp->__anon1.call.exp->destType)
+if(!topContext->parent && exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && exp->destType->__anon1._class->__anon1.registered->type == 4)
+findInGlobal = 1;
+else
+symbol = FindSymbol(id->string, curContext, topContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
+if(!symbol)
{
-exp->__anon1.call.exp->destType = dummy;
-dummy->refCount++;
-}
-ProcessExpressionType(exp->__anon1.call.exp);
-if(exp->__anon1.call.exp->destType == dummy)
+if(exp->destType && CheckExpressionType(exp, exp->destType, 0, 0))
+break;
+else
{
-FreeType(dummy);
-exp->__anon1.call.exp->destType = (((void *)0));
+if(thisClass)
+{
+ReplaceClassMembers(exp, thisClass ? thisClass : currentClass);
+if(exp->type != 0)
+{
+ProcessExpressionType(exp);
+break;
}
-FreeType(dummy);
}
-functionType = exp->__anon1.call.exp->expType;
-if(functionType && functionType->kind == 16)
+else if(currentClass && !id->_class)
{
-methodType = functionType;
-functionType = methodType->__anon1.__anon3.method->dataType;
-if(exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass)
+if(ResolveIdWithClass(exp, currentClass, 1))
+break;
+}
+symbol = FindSymbol(id->string, topContext->parent, globalContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
+}
+}
+if(findInGlobal)
+symbol = FindSymbol(id->string, curContext, topContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
+if(symbol)
{
-char typeString[1024];
+struct Type * type = symbol->type;
+struct __ecereNameSpace__ecere__com__Class * _class = (type && type->kind == 8 && type->__anon1._class) ? type->__anon1._class->__anon1.registered : (((void *)0));
-typeString[0] = '\0';
+if(_class && !strcmp(id->string, "this") && !type->classObjectType)
{
-struct Symbol * back = functionType->__anon1.__anon2.thisClass;
+struct Context * context = SetupTemplatesContext(_class);
-functionType->__anon1.__anon2.thisClass = (((void *)0));
-PrintType(functionType, typeString, 0x1, 0x1);
-functionType->__anon1.__anon2.thisClass = back;
+type = ReplaceThisClassType(_class);
+FinishTemplatesContext(context);
+if(type)
+type->refCount = 0;
}
-if(strstr(typeString, "thisclass"))
+FreeSpecifier(id->_class);
+id->_class = (((void *)0));
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
+id->classSym = (((void *)0));
+exp->expType = type;
+if(type)
+type->refCount++;
+if(type && (type->kind == 15))
+exp->isConstant = 1;
+if(symbol->isParam || !strcmp(id->string, "this"))
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl;
-
+if(_class && _class->type == 1 && !type->declaredWithStruct)
+exp->byReference = 1;
+}
+if(symbol->isIterator)
{
-struct Context * context = SetupTemplatesContext(exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass);
-
-decl = SpecDeclFromString(typeString, specs, (((void *)0)));
-if(thisClass != (exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass->templateClass ? exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass->templateClass : exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass))
-thisClassParams = 0x0;
-ReplaceThisClassSpecifiers(specs, exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass);
+if(symbol->isIterator == 3)
{
-struct __ecereNameSpace__ecere__com__Class * backupThisClass = thisClass;
-
-thisClass = exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass;
-ProcessDeclarator(decl);
-thisClass = backupThisClass;
-}
-thisClassParams = 0x1;
-functionType = ProcessType(specs, decl);
-functionType->refCount = 0;
-FinishTemplatesContext(context);
+exp->type = 5;
+exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpIdentifier(exp->__anon1.__anon1.identifier)));
+((struct Expression *)(*exp->__anon1.list).first)->__anon1.op.exp2->expType = exp->expType;
+exp->expType = (((void *)0));
+ProcessExpressionType(exp);
}
-FreeList(specs, FreeSpecifier);
-FreeDeclarator(decl);
+else if(symbol->isIterator != 4)
+{
+exp->type = 8;
+exp->__anon1.member.exp = MkExpIdentifier(exp->__anon1.__anon1.identifier);
+exp->__anon1.member.exp->expType = exp->expType;
+exp->__anon1.member.member = MkIdentifier("data");
+exp->expType = (((void *)0));
+ProcessExpressionType(exp);
}
}
+break;
}
-if(functionType && functionType->kind == 13 && functionType->__anon1.type && functionType->__anon1.type->kind == 11)
+else
{
-struct Type * type = functionType->__anon1.type;
+struct __ecereNameSpace__ecere__com__DefinedExpression * definedExp = (((void *)0));
-if(!functionType->refCount)
+if(thisNameSpace && !(id->_class && !id->_class->__anon1.__anon1.name))
{
-functionType->__anon1.type = (((void *)0));
-FreeType(functionType);
-}
-functionType = type;
+char name[1024];
+
+strcpy(name, thisNameSpace);
+strcat(name, "::");
+strcat(name, id->string);
+definedExp = __ecereNameSpace__ecere__com__eSystem_FindDefine(privateModule, name);
}
-if(functionType && functionType->kind != 11)
+if(!definedExp)
+definedExp = __ecereNameSpace__ecere__com__eSystem_FindDefine(privateModule, id->string);
+if(definedExp)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "called object %s is not a function\n", (((void *)0))), name);
-}
-else if(functionType)
+int c;
+
+for(c = 0; c < definedExpStackPos; c++)
+if(definedExpStack[c] == definedExp)
+break;
+if(c == definedExpStackPos && c < sizeof (definedExpStack) / sizeof(void *))
{
-unsigned int emptyParams = 0x0, noParams = 0x0;
-struct Expression * e = exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).first : (((void *)0));
-struct Type * type = functionType->__anon1.__anon2.params.first;
-struct Expression * memberExp = (exp->__anon1.call.exp->type == 8) ? exp->__anon1.call.exp : (((void *)0));
-int extra = 0;
-struct Location oldyylloc = yylloc;
+struct Location backupYylloc = yylloc;
+struct __ecereNameSpace__ecere__com__Instance * backInput = fileInput;
-if(!type)
-emptyParams = 0x1;
-if(functionType->extraParam && e && functionType->__anon1.__anon2.thisClass)
+definedExpStack[definedExpStackPos++] = definedExp;
+fileInput = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
+(__extension__ ({
+int (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count);
+
+__internal_VirtualMethod = ((int (*)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write]);
+__internal_VirtualMethod ? __internal_VirtualMethod(fileInput, definedExp->value, 1, strlen(definedExp->value)) : (int)1;
+}));
+(__extension__ ({
+unsigned int (* __internal_VirtualMethod)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode);
+
+__internal_VirtualMethod = ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek]);
+__internal_VirtualMethod ? __internal_VirtualMethod(fileInput, 0, 0) : (unsigned int)1;
+}));
+echoOn = 0;
+parsedExpression = (((void *)0));
+resetScanner();
+expression_yyparse();
+(__ecereNameSpace__ecere__com__eInstance_DecRef(fileInput), fileInput = 0);
+if(backInput)
+fileInput = backInput;
+yylloc = backupYylloc;
+if(parsedExpression)
{
-e->destType = MkClassType(functionType->__anon1.__anon2.thisClass->string);
-e = e->next;
+FreeIdentifier(id);
+exp->type = 5;
+exp->__anon1.list = MkListOne(parsedExpression);
+ApplyLocation(parsedExpression, &yylloc);
+ProcessExpressionType(exp);
+definedExpStackPos--;
+return ;
}
-if(!functionType->__anon1.__anon2.staticMethod && !functionType->extraParam)
-{
-if(memberExp && memberExp->__anon1.member.exp && memberExp->__anon1.member.exp->expType && memberExp->__anon1.member.exp->expType->kind == 19 && memberExp->__anon1.member.exp->expType->__anon1._class)
-{
-type = MkClassType(memberExp->__anon1.member.exp->expType->__anon1._class->string);
-if(e)
-{
-e->destType = type;
-e = e->next;
-type = functionType->__anon1.__anon2.params.first;
+definedExpStackPos--;
}
else
-type->refCount = 0;
-}
-else if(!memberExp && (functionType->__anon1.__anon2.thisClass || (methodType && methodType->__anon1.__anon3.methodClass)))
{
-type = MkClassType(functionType->__anon1.__anon2.thisClass ? functionType->__anon1.__anon2.thisClass->string : (methodType ? methodType->__anon1.__anon3.methodClass->fullName : (((void *)0))));
-type->byReference = functionType->byReference;
-type->typedByReference = functionType->typedByReference;
-if(e)
+if(inCompiler)
{
-if(e->next && type->kind == 8 && (functionType && functionType->__anon1.__anon2.thisClass) && functionType->classObjectType == 2)
-e = e->next;
-e->destType = type;
-e = e->next;
-type = functionType->__anon1.__anon2.params.first;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Recursion in defined expression %s\n", (((void *)0))), id->string);
}
-else
-type->refCount = 0;
}
}
-if(type && type->kind == 0)
+else
{
-noParams = 0x1;
-if(!type->refCount)
-FreeType(type);
-type = (((void *)0));
-}
-for(; e; e = e->next)
+struct GlobalData * data = (((void *)0));
+
+if(thisNameSpace && !(id->_class && !id->_class->__anon1.__anon1.name))
{
-if(!type && !emptyParams)
+char name[1024];
+
+strcpy(name, thisNameSpace);
+strcat(name, "::");
+strcat(name, id->string);
+data = FindGlobalData(name);
+}
+if(!data)
+data = FindGlobalData(id->string);
+if(data)
{
-yylloc = e->loc;
-if(methodType && methodType->__anon1.__anon3.methodClass)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many arguments for method %s::%s (%d given, expected %d)\n", (((void *)0))), methodType->__anon1.__anon3.methodClass->fullName, methodType->__anon1.__anon3.method->name, (*exp->__anon1.call.arguments).count, noParams ? 0 : functionType->__anon1.__anon2.params.count);
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many arguments for function %s (%d given, expected %d)\n", (((void *)0))), name, (*exp->__anon1.call.arguments).count, noParams ? 0 : functionType->__anon1.__anon2.params.count);
+DeclareGlobalData(curExternal, data);
+exp->expType = data->dataType;
+if(data->dataType)
+data->dataType->refCount++;
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(data->fullName);
+FreeSpecifier(id->_class);
+id->_class = (((void *)0));
break;
}
-if(methodType && type && type->kind == 20 && type->__anon1.templateParameter->type == 0)
-{
-struct Type * templatedType = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * _class = methodType->__anon1.__anon3.usedClass;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
-int id = 0;
-
-if(_class && _class->templateArgs)
+else
{
-struct __ecereNameSpace__ecere__com__Class * sClass;
+struct __ecereNameSpace__ecere__com__GlobalFunction * function = (((void *)0));
-for(sClass = _class; sClass; sClass = sClass->base)
-{
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-id = 0;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+if(thisNameSpace && !(id->_class && !id->_class->__anon1.__anon1.name))
{
-if(curParam->type == 0 && !strcmp(type->__anon1.templateParameter->identifier->string, curParam->name))
+char name[1024];
+
+strcpy(name, thisNameSpace);
+strcat(name, "::");
+strcat(name, id->string);
+function = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, name);
+}
+if(!function)
+function = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, id->string);
+if(function)
{
-struct __ecereNameSpace__ecere__com__Class * nextClass;
+char name[1024];
-for(nextClass = sClass->base; nextClass; nextClass = nextClass->base)
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(function->name);
+name[0] = 0;
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType != 1 && (!function->dataType || !function->dataType->dllExport))
+strcpy(name, "__ecereFunction_");
+FullClassNameCat(name, id->string, 0);
+if(DeclareFunction(curExternal, function, name))
{
-if(nextClass->templateClass)
-nextClass = nextClass->templateClass;
-id += nextClass->templateParams.count;
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(name);
}
+exp->expType = function->dataType;
+if(function->dataType)
+function->dataType->refCount++;
+FreeSpecifier(id->_class);
+id->_class = (((void *)0));
break;
}
-id++;
}
-if(curParam)
-break;
}
}
-if(curParam && _class->templateArgs[id].__anon1.__anon1.dataTypeString)
-{
-unsigned int constant = type->constant;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = _class->templateArgs[id];
-
-{
-struct Context * context = SetupTemplatesContext(_class);
-
-templatedType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0);
-FinishTemplatesContext(context);
}
-if(templatedType->kind == 8 && constant)
-templatedType->constant = 0x1;
-else if(templatedType->kind == 13)
-{
-struct Type * t = templatedType->__anon1.type;
-
-while(t->kind == 13)
-t = t->__anon1.type;
-if(constant)
-t->constant = constant;
+unresolved = 1;
+break;
}
-e->destType = templatedType;
-if(templatedType)
+case 1:
+{
+if(!exp->__anon1.instance->_class)
+{
+if(exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class)
{
-templatedType->passAsTemplate = 0x1;
+exp->__anon1.instance->_class = MkSpecifierName(exp->destType->__anon1._class->string);
}
}
-else
+ProcessInstantiationType(exp->__anon1.instance);
+exp->isConstant = exp->__anon1.instance->isConstant;
+if(exp->__anon1.instance->_class)
{
-e->destType = type;
-if(type)
-type->refCount++;
+exp->expType = MkClassType(exp->__anon1.instance->_class->__anon1.__anon1.name);
}
+break;
}
-else
+case 2:
{
-if(type && type->kind == 14 && type->prev && type->prev->kind == 8 && type->prev->classObjectType)
+if(!exp->expType)
{
-e->destType = type->prev;
-e->destType->refCount++;
+char * constant = exp->__anon1.__anon1.constant;
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type->constant = 1, type);
+
+exp->expType = type;
+if(constant[0] == '\'')
+{
+if((int)((unsigned char *)constant)[1] > 127)
+{
+int nb;
+unsigned int ch = __ecereNameSpace__ecere__sys__UTF8GetChar(constant + 1, &nb);
+
+if(nb < 2)
+ch = constant[1];
+(__ecereNameSpace__ecere__com__eSystem_Delete(constant), constant = 0);
+exp->__anon1.__anon1.constant = PrintUInt(ch);
+type->kind = 8;
+type->__anon1._class = FindClass("unichar");
+type->isSigned = 0;
}
else
{
-e->destType = type;
-if(type)
-type->refCount++;
+type->kind = 1;
+type->isSigned = 1;
}
}
-if(type && type->kind != 14)
+else
{
-struct Type * next = type->next;
+char * dot = strchr(constant, '.');
+unsigned int isHex = (constant[0] == '0' && (constant[1] == 'x' || constant[1] == 'X'));
+char * exponent;
-if(!type->refCount)
-FreeType(type);
-type = next;
+if(isHex)
+{
+exponent = strchr(constant, 'p');
+if(!exponent)
+exponent = strchr(constant, 'P');
}
+else
+{
+exponent = strchr(constant, 'e');
+if(!exponent)
+exponent = strchr(constant, 'E');
}
-if(type && type->kind != 14)
+if(dot || exponent)
{
-if(methodType && methodType->__anon1.__anon3.methodClass)
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough arguments for method %s::%s (%d given, expected %d)\n", (((void *)0))), methodType->__anon1.__anon3.methodClass->fullName, methodType->__anon1.__anon3.method->name, exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).count : 0, functionType->__anon1.__anon2.params.count + extra);
+if(strchr(constant, 'f') || strchr(constant, 'F'))
+type->kind = 6;
else
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough arguments for function %s (%d given, expected %d)\n", (((void *)0))), name, exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).count : 0, functionType->__anon1.__anon2.params.count + extra);
-}
-yylloc = oldyylloc;
-if(type && !type->refCount)
-FreeType(type);
+type->kind = 7;
+type->isSigned = 1;
}
else
{
-functionType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+unsigned int isSigned = constant[0] == '-';
+char * endP = (((void *)0));
+long long i64 = strtoll(constant, &endP, 0);
+uint64 ui64 = strtoull(constant, &endP, 0);
+unsigned int is64Bit = endP && (!strcmp(endP, "LL") || !strcmp(endP, "ll") || !strcmp(endP, "LLU") || !strcmp(endP, "llu") || !strcmp(endP, "ull") || !strcmp(endP, "ULL"));
+unsigned int forceUnsigned = endP && (!strcmp(endP, "U") || !strcmp(endP, "u") || !strcmp(endP, "LLU") || !strcmp(endP, "llu") || !strcmp(endP, "ull") || !strcmp(endP, "ULL"));
-__ecereInstance1->refCount = 0, __ecereInstance1->kind = 11, __ecereInstance1;
-});
-if(exp->__anon1.call.exp->type == 0)
+if(isSigned)
{
-char * string = exp->__anon1.call.exp->__anon1.__anon1.identifier->string;
-
-if(inCompiler)
+if(i64 < (((int)0x80000000)))
+is64Bit = 1;
+}
+else
{
-struct Symbol * symbol;
-struct Location oldyylloc = yylloc;
-
-yylloc = exp->__anon1.call.exp->__anon1.__anon1.identifier->loc;
-if(strstr(string, "__builtin_") == string)
+if(ui64 > (((int)0x7fffffff)))
{
-if(exp->destType)
+if(ui64 > (0xffffffff))
{
-functionType->__anon1.__anon2.returnType = exp->destType;
-exp->destType->refCount++;
+is64Bit = 1;
+if(ui64 <= (((long long)0x7fffffffffffffffLL)) && (constant[0] != '0' || !constant[1]))
+isSigned = 1;
}
}
-else
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s undefined; assuming extern returning int\n", (((void *)0))), string);
-symbol = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->type = ProcessTypeString("int()", 0x1), __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol);
-if(strstr(symbol->string, "::"))
-globalContext->hasNameSpace = 0x1;
-yylloc = oldyylloc;
+else if(constant[0] != '0' || !constant[1])
+isSigned = 1;
}
+if(forceUnsigned)
+isSigned = 0;
+type->kind = is64Bit ? 4 : 3;
+type->isSigned = isSigned;
}
-else if(exp->__anon1.call.exp->type == 8)
-{
}
-else
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "callable object undefined; extern assuming returning int\n", (((void *)0))));
-if(!functionType->__anon1.__anon2.returnType)
+exp->isConstant = 1;
+if(exp->destType && exp->destType->kind == 7)
+type->kind = 7;
+else if(exp->destType && exp->destType->kind == 6)
+type->kind = 6;
+else if(exp->destType && exp->destType->kind == 4)
+type->kind = 4;
+}
+break;
+}
+case 3:
{
-functionType->__anon1.__anon2.returnType = __extension__ ({
+exp->isConstant = 1;
+exp->expType = __extension__ ({
+struct Type * __ecereInstance2 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance2->refCount = 1, __ecereInstance2->kind = 13, __ecereInstance2->__anon1.type = __extension__ ({
struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 3, __ecereInstance1;
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = exp->__anon1.__anon2.wideString ? 2 : 1, __ecereInstance1->constant = 1, __ecereInstance1->isSigned = exp->__anon1.__anon2.wideString ? 0 : 1, __ecereInstance1;
+}), __ecereInstance2;
});
+break;
}
-}
-if(functionType && functionType->kind == 11)
+case 13:
+case 26:
+ProcessExpressionType(exp->__anon1._new.size);
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = ProcessType(exp->__anon1._new.typeName->qualifiers, exp->__anon1._new.typeName->declarator), __ecereInstance1;
+});
+DeclareType(curExternal, exp->expType->__anon1.type, 1, 0);
+break;
+case 14:
+case 27:
+ProcessExpressionType(exp->__anon1._renew.size);
+ProcessExpressionType(exp->__anon1._renew.exp);
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = ProcessType(exp->__anon1._renew.typeName->qualifiers, exp->__anon1._renew.typeName->declarator), __ecereInstance1;
+});
+DeclareType(curExternal, exp->expType->__anon1.type, 1, 0);
+break;
+case 4:
{
-exp->expType = functionType->__anon1.__anon2.returnType;
-if(functionType->__anon1.__anon2.returnType)
-functionType->__anon1.__anon2.returnType->refCount++;
-if(!functionType->refCount)
-FreeType(functionType);
-}
-if(exp->__anon1.call.arguments)
+unsigned int assign = 0, boolResult = 0, boolOps = 0;
+struct Type * type1 = (((void *)0)), * type2 = (((void *)0));
+unsigned int useDestType = 0, useSideType = 0;
+struct Location oldyylloc = yylloc;
+unsigned int useSideUnit = 0;
+struct __ecereNameSpace__ecere__com__Class * destClass = (exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class) ? exp->destType->__anon1._class->__anon1.registered : (((void *)0));
+unsigned int powerOp = 0, relationOp = 0;
+struct __ecereNameSpace__ecere__com__Class * c1 = (((void *)0)), * c2 = (((void *)0));
+struct Type * dummy = (dummy = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), dummy->count = 1, dummy->refCount = 1, dummy);
+
+switch(exp->__anon1.op.op)
+{
+case '=':
+case MUL_ASSIGN:
+case DIV_ASSIGN:
+case MOD_ASSIGN:
+case ADD_ASSIGN:
+case SUB_ASSIGN:
+case LEFT_ASSIGN:
+case RIGHT_ASSIGN:
+case AND_ASSIGN:
+case XOR_ASSIGN:
+case OR_ASSIGN:
+assign = 1;
+break;
+case '!':
+break;
+case AND_OP:
+case OR_OP:
+boolOps = 1;
+boolResult = 1;
+break;
+case EQ_OP:
+case '<':
+case '>':
+case LE_OP:
+case GE_OP:
+case NE_OP:
+boolResult = 1;
+useSideType = 1;
+relationOp = 1;
+break;
+case '+':
+case '-':
+useSideUnit = 1;
+useSideType = 1;
+useDestType = 1;
+break;
+case LEFT_OP:
+case RIGHT_OP:
+break;
+case '|':
+case '^':
+useSideType = 1;
+useDestType = 1;
+break;
+case '/':
+case '%':
+useSideType = 1;
+useDestType = 1;
+if(exp->__anon1.op.op == '/')
+powerOp = 1;
+break;
+case '&':
+case '*':
+if(exp->__anon1.op.exp1)
{
-for(e = (*exp->__anon1.call.arguments).first; e; e = e->next)
-ProcessExpressionType(e);
+useSideType = 1;
+useDestType = 1;
+if(exp->__anon1.op.op == '*')
+powerOp = 1;
}
break;
}
-case 8:
+if(exp->__anon1.op.op == '&')
{
-struct Type * type;
-struct Location oldyylloc = yylloc;
-unsigned int thisPtr;
-struct Expression * checkExp = exp->__anon1.member.exp;
+if(!exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->type == 0 && exp->__anon1.op.exp2->__anon1.__anon1.identifier)
+{
+struct Identifier * id = exp->__anon1.op.exp2->__anon1.__anon1.identifier;
+struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0)));
-while(checkExp)
+if(symbol && symbol->isIterator == 2)
{
-if(checkExp->type == 11)
-checkExp = checkExp->__anon1.cast.exp;
-else if(checkExp->type == 5)
-checkExp = checkExp->__anon1.list ? (*checkExp->__anon1.list).first : (((void *)0));
-else
+exp->type = 8;
+exp->__anon1.member.exp = exp->__anon1.op.exp2;
+exp->__anon1.member.member = MkIdentifier("key");
+exp->expType = (((void *)0));
+exp->__anon1.op.exp2->expType = symbol->type;
+symbol->type->refCount++;
+ProcessExpressionType(exp);
+FreeType(dummy);
break;
}
-thisPtr = (checkExp && checkExp->type == 0 && !strcmp(checkExp->__anon1.__anon1.identifier->string, "this"));
-exp->thisPtr = thisPtr;
-if(exp->__anon1.member.member && exp->__anon1.member.member->_class && exp->__anon1.member.member->_class->__anon1.__anon1.name)
-{
-exp->__anon1.member.member->classSym = exp->__anon1.member.member->_class->__anon1.__anon1.symbol;
}
-ProcessExpressionType(exp->__anon1.member.exp);
-if(exp->__anon1.member.exp->expType && exp->__anon1.member.exp->expType->kind == 8 && exp->__anon1.member.exp->expType->__anon1._class && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered->type == 0)
-{
-exp->isConstant = 0x0;
}
-else
-exp->isConstant = exp->__anon1.member.exp->isConstant;
-type = exp->__anon1.member.exp->expType;
-yylloc = exp->loc;
-if(type && (type->kind == 20))
-{
-struct __ecereNameSpace__ecere__com__Class * _class = thisClass ? thisClass : currentClass;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param = (((void *)0));
-
-if(_class)
+if(exp->__anon1.op.exp1)
{
-for(param = _class->templateParams.first; param; param = param->next)
+if(exp->__anon1.op.exp2 && useSideUnit && useDestType && destClass && destClass->type == 3 && destClass->base->type != 3)
+useDestType = 0;
+if(destClass && useDestType && ((destClass->type == 3 && useSideUnit) || destClass->type == 4 || destClass->type == 2))
{
-if(param->type == 1 && exp->__anon1.member.member && exp->__anon1.member.member->string && !strcmp(param->name, exp->__anon1.member.member->string))
-break;
-}
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = exp->destType;
+exp->__anon1.op.exp1->opDestType = 1;
+if(exp->destType)
+exp->destType->refCount++;
}
-if(param && param->defaultArg.__anon1.__anon2.__anon1.member)
-{
-struct Expression * argExp = GetTemplateArgExpByName(param->name, thisClass, 1);
-
-if(argExp)
-{
-struct Expression * expMember = exp->__anon1.member.exp;
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-char thisClassTypeString[1024];
-
-FreeIdentifier(exp->__anon1.member.member);
-ProcessExpressionType(argExp);
-{
-char * colon = strstr(param->defaultArg.__anon1.__anon2.memberString, "::");
-
-if(colon)
+else if(!assign)
{
-memcpy(thisClassTypeString, param->defaultArg.__anon1.__anon2.memberString, colon - param->defaultArg.__anon1.__anon2.memberString);
-thisClassTypeString[colon - param->defaultArg.__anon1.__anon2.memberString] = '\0';
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = dummy;
+dummy->refCount++;
+if(powerOp)
+exp->__anon1.op.exp1->opDestType = 1;
+if(relationOp)
+exp->__anon1.op.exp1->usedInComparison = 1;
}
-else
-strcpy(thisClassTypeString, _class->fullName);
+if(exp->__anon1.op.op == '+' || exp->__anon1.op.op == '-')
+{
+if(exp->opDestType)
+exp->__anon1.op.exp1->parentOpDestType = 1;
+if(exp->usedInComparison)
+exp->__anon1.op.exp1->usedInComparison = 1;
}
-decl = SpecDeclFromString(param->defaultArg.__anon1.__anon2.__anon1.member->dataTypeString, specs, (((void *)0)));
-exp->expType = ProcessType(specs, decl);
-if(exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->templateClass)
+if(exp->__anon1.op.exp1->destType && exp->__anon1.op.op != '=')
+exp->__anon1.op.exp1->destType->count++;
+ProcessExpressionType(exp->__anon1.op.exp1);
+if(exp->__anon1.op.exp1->destType && exp->__anon1.op.op != '=')
+exp->__anon1.op.exp1->destType->count--;
+exp->__anon1.op.exp1->opDestType = 0;
+exp->__anon1.op.exp1->usedInComparison = 0;
+if(!exp->__anon1.op.exp2 && (exp->__anon1.op.op == INC_OP || exp->__anon1.op.op == DEC_OP) && exp->__anon1.op.exp1->expType && exp->__anon1.op.exp1->expType->kind == 8 && exp->__anon1.op.exp1->expType->__anon1._class && exp->__anon1.op.exp1->expType->__anon1._class->__anon1.registered && exp->__anon1.op.exp1->expType->__anon1._class->__anon1.registered->type == 3)
{
-struct __ecereNameSpace__ecere__com__Class * expClass = exp->expType->__anon1._class->__anon1.registered;
-struct __ecereNameSpace__ecere__com__Class * cClass = (((void *)0));
-int paramCount = 0;
-int lastParam = -1;
-char templateString[1024];
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-
-sprintf(templateString, "%s<", expClass->templateClass->fullName);
-for(cClass = expClass; cClass; cClass = cClass->base)
+exp->__anon1.op.exp2 = MkExpConstant("1");
+exp->__anon1.op.op = exp->__anon1.op.op == INC_OP ? ADD_ASSIGN : SUB_ASSIGN;
+assign = 1;
+}
+if(exp->__anon1.op.exp1->destType == dummy)
{
-int p = 0;
-
-for(param = cClass->templateParams.first; param; param = param->next)
+FreeType(dummy);
+exp->__anon1.op.exp1->destType = (((void *)0));
+}
+if(exp->__anon1.op.exp2)
{
-int id = p;
-struct __ecereNameSpace__ecere__com__Class * sClass;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg;
-
-for(sClass = cClass->base; sClass; sClass = sClass->base)
-id += sClass->templateParams.count;
-arg = expClass->templateArgs[id];
-for(sClass = _class; sClass; sClass = sClass->base)
+if(!assign && exp->__anon1.op.exp1->expType && (exp->__anon1.op.exp1->expType->kind == 1 || exp->__anon1.op.exp1->expType->kind == 2))
{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * cParam;
-int p = 0;
-struct __ecereNameSpace__ecere__com__Class * nextClass;
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 3, type->isSigned = 1, type->refCount = 1, type->signedBeforePromotion = exp->__anon1.op.exp1->expType->isSigned, type->bitMemberSize = exp->__anon1.op.exp1->expType->bitMemberSize, type->promotedFrom = exp->__anon1.op.exp1->expType->kind, type);
-for(nextClass = sClass->base; nextClass; nextClass = nextClass->base)
-p += nextClass->templateParams.count;
-for(cParam = sClass->templateParams.first; cParam; cParam = cParam->next, p++)
-{
-if(cParam->type == 0 && arg.__anon1.__anon1.dataTypeString && !strcmp(cParam->name, arg.__anon1.__anon1.dataTypeString))
-{
-if(_class->templateArgs && arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
-{
-arg.__anon1.__anon1.dataTypeString = _class->templateArgs[p].__anon1.__anon1.dataTypeString;
-arg.__anon1.__anon1.dataTypeClass = _class->templateArgs[p].__anon1.__anon1.dataTypeClass;
-break;
-}
+FreeType(exp->__anon1.op.exp1->expType);
+exp->__anon1.op.exp1->expType = type;
}
}
+type1 = exp->__anon1.op.exp1->expType;
}
+if(exp->__anon1.op.exp2)
{
-char argument[256];
+char expString[10240];
-argument[0] = '\0';
-switch(param->type)
+expString[0] = '\0';
+if(exp->__anon1.op.exp2->type == 1 && !exp->__anon1.op.exp2->__anon1.instance->_class)
{
-case 2:
+if(exp->__anon1.op.exp1)
{
-char expString[1024];
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
-struct Expression * exp;
-char * string = PrintHexUInt64(arg.__anon1.expression.__anon1.ui64);
-
-exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
-(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
-ProcessExpressionType(exp);
-ComputeExpression(exp);
-expString[0] = '\0';
-PrintExpression(exp, expString);
-strcat(argument, expString);
-FreeExpression(exp);
-break;
+exp->__anon1.op.exp2->destType = exp->__anon1.op.exp1->expType;
+if(exp->__anon1.op.exp1->expType)
+exp->__anon1.op.exp1->expType->refCount++;
}
-case 1:
+else
{
-strcat(argument, arg.__anon1.__anon2.__anon1.member->name);
-break;
+exp->__anon1.op.exp2->destType = exp->destType;
+if(!exp->__anon1.op.exp1 || (exp->__anon1.op.op != '&' && exp->__anon1.op.op != '^'))
+exp->__anon1.op.exp2->opDestType = 1;
+if(exp->destType)
+exp->destType->refCount++;
}
-case 0:
+if(type1)
+type1->refCount++;
+exp->expType = type1;
+}
+else if(assign)
{
-if(arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
+if(inCompiler)
+PrintExpression(exp->__anon1.op.exp2, expString);
+if(type1 && type1->kind == 13)
{
-if(!strcmp(arg.__anon1.__anon1.dataTypeString, "thisclass"))
-strcat(argument, thisClassTypeString);
-else
-strcat(argument, arg.__anon1.__anon1.dataTypeString);
-}
-break;
+if(exp->__anon1.op.op == MUL_ASSIGN || exp->__anon1.op.op == DIV_ASSIGN || exp->__anon1.op.op == MOD_ASSIGN || exp->__anon1.op.op == LEFT_ASSIGN || exp->__anon1.op.op == RIGHT_ASSIGN || exp->__anon1.op.op == AND_ASSIGN || exp->__anon1.op.op == OR_ASSIGN)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "operator %s illegal on pointer\n", (((void *)0))), exp->__anon1.op.op);
+else if(exp->__anon1.op.op == '=')
+{
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1;
+if(type1)
+type1->refCount++;
}
}
-if(argument[0])
+else
{
-if(paramCount)
-strcat(templateString, ", ");
-if(lastParam != p - 1)
+if(exp->__anon1.op.op == MUL_ASSIGN || exp->__anon1.op.op == DIV_ASSIGN || exp->__anon1.op.op == MOD_ASSIGN || exp->__anon1.op.op == LEFT_ASSIGN || exp->__anon1.op.op == RIGHT_ASSIGN)
+;
+else
{
-strcat(templateString, param->name);
-strcat(templateString, " = ");
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1;
+if(type1)
+type1->refCount++;
}
-strcat(templateString, argument);
-paramCount++;
-lastParam = p;
}
-p++;
+if(type1)
+type1->refCount++;
+exp->expType = type1;
}
+else if(destClass && ((destClass->type == 3 && useDestType && useSideUnit) || (destClass->type == 4 && useDestType)))
+{
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = exp->destType;
+if(exp->__anon1.op.op != '&' && exp->__anon1.op.op != '^')
+exp->__anon1.op.exp2->opDestType = 1;
+if(exp->destType)
+exp->destType->refCount++;
}
+else
+{
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = dummy;
+dummy->refCount++;
+if(powerOp)
+exp->__anon1.op.exp2->opDestType = 1;
+if(relationOp)
+exp->__anon1.op.exp2->usedInComparison = 1;
}
+if(type1 && boolResult && useSideType && type1->kind == 8 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && (type1->__anon1._class->__anon1.registered->type == 2 || type1->__anon1._class->__anon1.registered->type == 4))
{
-int len = strlen(templateString);
-
-if(templateString[len - 1] == '>')
-templateString[len++] = ' ';
-templateString[len++] = '>';
-templateString[len++] = '\0';
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1;
+type1->refCount++;
}
+if(exp->__anon1.op.exp2->destType && exp->__anon1.op.op != '=')
+exp->__anon1.op.exp2->destType->count++;
+if(exp->__anon1.op.op == SIZEOF)
{
-struct Context * context = SetupTemplatesContext(_class);
+struct Expression * e = exp->__anon1.op.exp2;
-FreeType(exp->expType);
-exp->expType = ProcessTypeString(templateString, 0x0);
-FinishTemplatesContext(context);
-}
+while((e->type == 5 || e->type == 32 || e->type == 23) && e->__anon1.list)
+{
+if(e->type == 5 || e->type == 32 || e->type == 23)
+{
+if(e->type == 23)
+e = (*((struct Statement *)(*e->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last;
+else
+e = (*e->__anon1.list).last;
}
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), MkExpBrackets(MkListOne(MkExpOp(MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), expMember))), '+', MkExpOp(MkExpMember(MkExpMember(argExp, MkIdentifier("member")), MkIdentifier("offset")), '+', MkExpMember(MkExpMember(MkExpMember(CopyExpression(argExp), MkIdentifier("member")), MkIdentifier("_class")), MkIdentifier("offset")))))))));
}
+if(e->type == 11 && e->__anon1.cast.exp)
+e->__anon1.cast.exp->needCast = 1;
}
-else if(type->__anon1.templateParameter && type->__anon1.templateParameter->type == 0 && (type->__anon1.templateParameter->__anon1.dataType || type->__anon1.templateParameter->dataTypeString))
+if(exp->__anon1.op.op == '+' || exp->__anon1.op.op == '-')
{
-type = ProcessTemplateParameterType(type->__anon1.templateParameter);
+if(exp->opDestType)
+exp->__anon1.op.exp2->parentOpDestType = 1;
+if(exp->usedInComparison)
+exp->__anon1.op.exp2->usedInComparison = 1;
}
-}
-if(type && (type->kind == 20))
-;
-else if(type && (type->kind == 8 || type->kind == 19 || type->kind == 3 || type->kind == 15 || type->kind == 4 || type->kind == 2 || type->kind == 5 || type->kind == 1 || type->kind == 24 || type->kind == 22 || type->kind == 23 || type->kind == 6 || type->kind == 7 || (type->kind == 13 && type->__anon1.type->kind == 1)))
+ProcessExpressionType(exp->__anon1.op.exp2);
+exp->__anon1.op.exp2->opDestType = 0;
+exp->__anon1.op.exp2->usedInComparison = 0;
+if(exp->__anon1.op.exp2->destType && exp->__anon1.op.op != '=')
+exp->__anon1.op.exp2->destType->count--;
+if(!assign && (exp->__anon1.op.exp1 || exp->__anon1.op.op == '~'))
{
-struct Identifier * id = exp->__anon1.member.member;
-int typeKind = type->kind;
-struct __ecereNameSpace__ecere__com__Class * _class = (id && (!id->_class || id->_class->__anon1.__anon1.name)) ? (id->classSym ? id->classSym->__anon1.registered : (type->__anon1._class ? type->__anon1._class->__anon1.registered : (((void *)0)))) : (((void *)0));
-
-if(typeKind == 19 && exp->__anon1.member.exp->type == 24)
+if(exp->__anon1.op.exp2->expType && (exp->__anon1.op.exp2->expType->kind == 1 || exp->__anon1.op.exp2->expType->kind == 2))
{
-_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::com::Class");
-typeKind = 8;
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 3, type->isSigned = 1, type->refCount = 1, type->signedBeforePromotion = exp->__anon1.op.exp2->expType->isSigned, type->bitMemberSize = exp->__anon1.op.exp2->expType->bitMemberSize, type->promotedFrom = exp->__anon1.op.exp2->expType->kind, type);
+
+FreeType(exp->__anon1.op.exp2->expType);
+exp->__anon1.op.exp2->expType = type;
}
-if(id)
-{
-if(typeKind == 3 || typeKind == 15)
-_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "int");
-else if(!_class)
+}
+if(assign && type1 && type1->kind == 13 && exp->__anon1.op.exp2->expType)
{
-if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
+if(exp->__anon1.op.exp2->expType->kind == 23 || exp->__anon1.op.exp2->expType->kind == 22 || exp->__anon1.op.exp2->expType->kind == 4 || exp->__anon1.op.exp2->expType->kind == 3 || exp->__anon1.op.exp2->expType->kind == 2 || exp->__anon1.op.exp2->expType->kind == 1)
{
-_class = type->__anon1._class->__anon1.registered;
+if(exp->__anon1.op.op != '=' && type1->__anon1.type->kind == 0)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "void *: unknown size\n", (((void *)0))));
}
-else if((type->kind == 12 || type->kind == 13) && type->__anon1.type && type->__anon1.type->kind == 1)
+else if(exp->__anon1.op.exp2->expType->kind == 13 || exp->__anon1.op.exp2->expType->kind == 12 || exp->__anon1.op.exp2->expType->kind == 11 || exp->__anon1.op.exp2->expType->kind == 16 || (type1->__anon1.type->kind == 0 && exp->__anon1.op.exp2->expType->kind == 8 && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered && (exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 0 || exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 1 || exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 5)))
{
-_class = FindClass("char *")->__anon1.registered;
+if(exp->__anon1.op.op == ADD_ASSIGN)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0))));
}
-else if(type->kind == 13)
+else if((exp->__anon1.op.exp2->expType->kind == 8 && type1->kind == 13 && type1->__anon1.type->kind == 8 && type1->__anon1.type->__anon1._class == exp->__anon1.op.exp2->expType->__anon1._class && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 1))
{
-_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr");
-FreeType(exp->expType);
-exp->expType = ProcessTypeString("uintptr", 0x0);
-exp->byReference = 0x1;
+if(exp->__anon1.op.op == ADD_ASSIGN)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0))));
}
-else
+else if(inCompiler)
{
-char string[1024] = "";
-struct Symbol * classSym;
+char type1String[1024];
+char type2String[1024];
-PrintTypeNoConst(type, string, 0x0, 0x1);
-classSym = FindClass(string);
-if(classSym)
-_class = classSym->__anon1.registered;
-}
+type1String[0] = '\0';
+type2String[0] = '\0';
+PrintType(exp->__anon1.op.exp2->expType, type1String, 0, 1);
+PrintType(type1, type2String, 0, 1);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expression %s (%s); expected %s\n", (((void *)0))), expString, type1String, type2String);
}
}
-if(_class && id)
+if(exp->__anon1.op.exp2->destType == dummy)
{
-struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
-struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
-struct __ecereNameSpace__ecere__com__Property * revConvert = (((void *)0));
-struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0));
-
-if(id && id->_class && id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property"))
-exp->__anon1.member.memberType = 1;
-if(id && id->_class && type->__anon1._class && !__ecereNameSpace__ecere__com__eClass_IsDerived(type->__anon1._class->__anon1.registered, _class))
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "invalid class specifier %s for object of class %s\n", (((void *)0))), _class->fullName, type->__anon1._class->string);
-if(typeKind != 19)
+FreeType(dummy);
+exp->__anon1.op.exp2->destType = (((void *)0));
+}
+if(exp->__anon1.op.op == '-' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2->expType && !exp->__anon1.op.exp2->expType->isSigned)
{
-if((exp->__anon1.member.memberType == 0 && thisPtr) || exp->__anon1.member.memberType == 3)
+type2 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+type2->refCount = 1;
+CopyTypeInto(type2, exp->__anon1.op.exp2->expType);
+type2->isSigned = 1;
+}
+else if(exp->__anon1.op.op == '~' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2->expType && (!exp->__anon1.op.exp2->expType->isSigned || exp->__anon1.op.exp2->expType->kind != 3))
{
-member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)));
-if(member && member->_class != (_class->templateClass ? _class->templateClass : _class) && exp->__anon1.member.memberType != 3)
+type2 = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->kind = 3, __ecereInstance1;
+});
+type2->refCount = 1;
+type2->isSigned = 1;
+}
+else
{
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
-if(prop)
-member = (((void *)0));
+type2 = exp->__anon1.op.exp2->expType;
+if(type2)
+type2->refCount++;
}
-if(!member && !prop)
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
-if((member && member->_class == (_class->templateClass ? _class->templateClass : _class)) || (prop && prop->_class == (_class->templateClass ? _class->templateClass : _class)))
-exp->__anon1.member.thisPtr = 0x1;
}
+c1 = type1 && type1->kind == 8 && type1->__anon1._class ? type1->__anon1._class->__anon1.registered : (((void *)0));
+c2 = type2 && type2->kind == 8 && type2->__anon1._class ? type2->__anon1._class->__anon1.registered : (((void *)0));
+if(relationOp && ((exp->__anon1.op.exp1 && exp->__anon1.op.exp1->ambiguousUnits && (!c2 || c2->type != 3)) || (exp->__anon1.op.exp2 && exp->__anon1.op.exp2->ambiguousUnits && (!c1 || c1->type != 3))))
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "ambiguous units in relational operation\n", (((void *)0))));
+if(!relationOp && ((exp->__anon1.op.exp1 && exp->__anon1.op.exp1->ambiguousUnits) || (exp->__anon1.op.exp2 && exp->__anon1.op.exp2->ambiguousUnits)) && (!powerOp || !c1 || c1->type != 3 || !c2 || c2->type != 3 || !RelatedUnits(c1, c2)))
+{
+if(exp->opDestType || exp->usedInComparison)
+exp->ambiguousUnits = 1;
else
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "ambiguous units\n", (((void *)0))));
+}
+dummy->kind = 0;
+if(exp->__anon1.op.op == SIZEOF)
{
-unsigned int useMemberForNonConst = 0x0;
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-if(!id->classSym)
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1;
+});
+exp->isConstant = 1;
+}
+else if(exp->__anon1.op.op == '*' && !exp->__anon1.op.exp1)
{
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, (((void *)0)));
-useMemberForNonConst = prop && exp->destType && ((exp->destType->kind == 8 && !exp->destType->constant) || ((exp->destType->kind == 13 || exp->destType->kind == 12) && exp->destType->__anon1.type && !exp->destType->__anon1.type->constant)) && !strncmp(prop->dataTypeString, "const ", 6);
-if(useMemberForNonConst || !id->_class || !id->_class->__anon1.__anon1.name || strcmp(id->_class->__anon1.__anon1.name, "property"))
-member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, (((void *)0)), (((void *)0)), (((void *)0)));
+exp->expType = Dereference(type2);
+if(type2 && type2->kind == 8)
+notByReference = 1;
}
-if((!prop || useMemberForNonConst) && !member)
+else if(exp->__anon1.op.op == '&' && !exp->__anon1.op.exp1)
+exp->expType = Reference(type2);
+else if(exp->__anon1.op.op == LEFT_OP || exp->__anon1.op.op == RIGHT_OP)
{
-method = useMemberForNonConst ? (((void *)0)) : __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, (((void *)0)));
-if(!method)
+if(exp->__anon1.op.exp1->expType)
{
-prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
-useMemberForNonConst |= prop && exp->destType && ((exp->destType->kind == 8 && !exp->destType->constant) || ((exp->destType->kind == 13 || exp->destType->kind == 12) && exp->destType->__anon1.type && !exp->destType->__anon1.type->constant)) && !strncmp(prop->dataTypeString, "const ", 6);
-if(useMemberForNonConst || !id->_class || !id->_class->__anon1.__anon1.name || strcmp(id->_class->__anon1.__anon1.name, "property"))
-member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)));
+exp->expType = exp->__anon1.op.exp1->expType;
+exp->expType->refCount++;
}
}
-if(member && prop)
+else if(!assign)
{
-if(useMemberForNonConst || (member->_class != prop->_class && !id->_class && __ecereNameSpace__ecere__com__eClass_IsDerived(member->_class, prop->_class)))
-prop = (((void *)0));
+if(c1 && !c1->dataType)
+c1->dataType = ProcessTypeString(c1->dataTypeString, 0);
+if(c2 && !c2->dataType)
+c2->dataType = ProcessTypeString(c2->dataTypeString, 0);
+if(boolOps)
+{
+if(exp->__anon1.op.exp1)
+{
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = MkClassType("bool");
+exp->__anon1.op.exp1->destType->truth = 1;
+if(!exp->__anon1.op.exp1->expType)
+ProcessExpressionType(exp->__anon1.op.exp1);
else
-member = (((void *)0));
+CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0);
+FreeType(exp->__anon1.op.exp1->expType);
+exp->__anon1.op.exp1->expType = MkClassType("bool");
+exp->__anon1.op.exp1->expType->truth = 1;
}
+if(exp->__anon1.op.exp2)
+{
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = MkClassType("bool");
+exp->__anon1.op.exp2->destType->truth = 1;
+if(!exp->__anon1.op.exp2->expType)
+ProcessExpressionType(exp->__anon1.op.exp2);
+else
+CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0);
+FreeType(exp->__anon1.op.exp2->expType);
+exp->__anon1.op.exp2->expType = MkClassType("bool");
+exp->__anon1.op.exp2->expType->truth = 1;
}
}
-if(!prop && !member && !method)
-method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule);
-if(!prop && !member && !method)
-{
-if(typeKind == 19)
+else if(powerOp && exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && ((c1 && c1->type == 3) || (c2 && c2->type == 3)))
{
-classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(type->__anon1._class->__anon1.registered, exp->__anon1.member.member->string);
-if(classProp)
+if(c1 && c1->type == 3 && c2 && c2->type == 3)
{
-exp->__anon1.member.memberType = 5;
-exp->expType = ProcessTypeString(classProp->dataTypeString, 0x0);
+if(c1->dataType->kind == 7)
+exp->expType = c1->dataType;
+else if(c2->dataType->kind == 7)
+exp->expType = c2->dataType;
+else if(c1->dataType->kind == 6)
+exp->expType = c1->dataType;
+else if(c2->dataType->kind == 6)
+exp->expType = c2->dataType;
+else
+exp->expType = c1->dataType;
}
+else if((c1 && c1->type == 3) || exp->__anon1.op.op == '/')
+exp->expType = type1;
else
+exp->expType = type2;
+if(exp->expType)
+exp->expType->refCount++;
+}
+else if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && ((useSideType) || ((!type1 || type1->kind != 8 || !strcmp(type1->__anon1._class->string, "String")) && (!type2 || type2->kind != 8 || !strcmp(type2->__anon1._class->string, "String")))))
{
-char structName[1024];
-struct Identifier * id = exp->__anon1.member.member;
-struct Expression * classExp = exp->__anon1.member.exp;
+if(type1 && type2 && ((type1->kind == 8 && type1->__anon1._class && strcmp(type1->__anon1._class->string, "String")) == (type2->kind == 8 && type2->__anon1._class && strcmp(type2->__anon1._class->string, "String"))))
+{
+if(exp->__anon1.op.op == '-' && ((c1 && c1->type == 4) || (c2 && c2->type == 4)))
+{
+struct Type * intType = ProcessTypeString((c1 && c1->dataType->kind == 4) || (c2 && c2->dataType->kind == 4) ? "int64" : "int", 0);
-type->refCount++;
-FreeType(classExp->expType);
-classExp->expType = ProcessTypeString("ecere::com::Class", 0x0);
-strcpy(structName, "__ecereClassData_");
-FullClassNameCat(structName, type->__anon1._class->string, 0x0);
-exp->type = 9;
-exp->__anon1.member.member = id;
-exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpMember(classExp, MkIdentifier("data"))), '+', MkExpMember(MkExpClass(MkListOne(MkSpecifierName(type->__anon1._class->string)), (((void *)0))), MkIdentifier("offsetClass"))))))));
-FreeType(type);
-ProcessExpressionType(exp);
-return ;
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp1->destType = intType;
+exp->__anon1.op.exp2->destType = intType;
+intType->refCount++;
}
+else
+{
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1;
+type1->refCount++;
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = type2;
+type2->refCount++;
}
+if(!boolResult && !exp->opDestType && (!exp->destType || exp->destType->kind != 8) && c1 && c1->type == 3 && c2 && c2->type == 3 && c1 != c2)
+{
+if(exp->usedInComparison || exp->parentOpDestType)
+exp->ambiguousUnits = 1;
else
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "operating on %s and %s with an untyped result, assuming %s\n", (((void *)0))), type1->__anon1._class->string, type2->__anon1._class->string, type1->__anon1._class->string);
+}
+if(type1->kind == 13 && type1->__anon1.type->kind == 20 && type2->kind != 13)
{
-struct Symbol * classSym = FindClass(id->string);
+struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 1);
-if(classSym)
+if(argExp)
{
-struct __ecereNameSpace__ecere__com__Class * convertClass = classSym->__anon1.registered;
+struct Expression * classExp = MkExpMember(argExp, MkIdentifier("dataTypeClass"));
-if(convertClass)
-revConvert = __ecereNameSpace__ecere__com__eClass_FindProperty(convertClass, _class->fullName, privateModule);
+exp->__anon1.op.exp1 = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), exp->__anon1.op.exp1)));
+ProcessExpressionType(exp->__anon1.op.exp1);
+if(type2->kind != 13)
+{
+ProcessExpressionType(classExp);
+exp->__anon1.op.exp2 = MkExpBrackets(MkListOne(MkExpOp(exp->__anon1.op.exp2, '*', MkExpMember(classExp, MkIdentifier("typeSize")))));
+if(!exp->__anon1.op.exp2->expType)
+{
+if(type2)
+FreeType(type2);
+type2 = exp->__anon1.op.exp2->expType = ProcessTypeString("int", 0);
+c2 = (((void *)0));
+type2->refCount++;
+}
+ProcessExpressionType(exp->__anon1.op.exp2);
+}
+}
+}
+if(!boolResult && ((type1->kind == 13 || type1->kind == 12 || (type1->kind == 8 && !strcmp(type1->__anon1._class->string, "String"))) && (type2->kind == 23 || type2->kind == 22 || type2->kind == 4 || type2->kind == 3 || type2->kind == 2 || type2->kind == 1)))
+{
+if(type1->kind != 8 && type1->__anon1.type->kind == 0)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "void *: unknown size\n", (((void *)0))));
+exp->expType = type1;
+if(type1)
+type1->refCount++;
}
+else if(!boolResult && ((type2->kind == 13 || type2->kind == 12 || (type2->kind == 8 && !strcmp(type2->__anon1._class->string, "String"))) && (type1->kind == 23 || type1->kind == 22 || type1->kind == 4 || type1->kind == 3 || type1->kind == 2 || type1->kind == 1)))
+{
+if(type2->kind != 8 && type2->__anon1.type->kind == 0)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "void *: unknown size\n", (((void *)0))));
+exp->expType = type2;
+if(type2)
+type2->refCount++;
}
+else if((type1->kind == 13 && type2->kind != 13 && type2->kind != 12 && type2->kind != 11 && type2->kind != 16 && type2->kind != 8 && type2->kind != 19) || (type2->kind == 13 && type1->kind != 13 && type1->kind != 12 && type1->kind != 11 && type1->kind != 16 && type1->kind != 8 && type1->kind != 19))
+{
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "different levels of indirection\n", (((void *)0))));
}
-if(!exp->__anon1.member.exp->destType)
+else
+{
+unsigned int success = 0;
+
+if(type1->kind == 13 && type2->kind == 13)
+{
+if(exp->__anon1.op.op == '+')
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0))));
+else if(exp->__anon1.op.op == '-')
{
-if(method && !method->_class->symbol)
-method->_class->symbol = FindClass(method->_class->fullName);
-exp->__anon1.member.exp->destType = __extension__ ({
+if(MatchTypes(type1->__anon1.type, type2->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 0, 0, 0, 0, 0))
+{
+exp->expType = __extension__ ({
struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 8, __ecereInstance1->__anon1._class = prop ? prop->_class->symbol : method ? method->_class->symbol : _class->symbol, __ecereInstance1;
+__ecereInstance1->kind = 3, __ecereInstance1->refCount = 1, __ecereInstance1;
});
-}
-if(prop)
+success = 1;
+if(type1->__anon1.type->kind == 20)
{
-exp->__anon1.member.memberType = 1;
-if(!prop->dataType)
-ProcessPropertyType(prop);
-exp->expType = prop->dataType;
-if(!strcmp(_class->base->fullName, "eda::Row") && !exp->expType->constant && !exp->destType)
+struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 1);
+
+if(argExp)
{
-struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Expression * classExp = MkExpMember(argExp, MkIdentifier("dataTypeClass"));
-CopyTypeInto(type, exp->expType);
-type->refCount = 1;
-type->constant = 0x1;
-exp->expType = type;
+ProcessExpressionType(classExp);
+exp->type = 5;
+exp->__anon1.list = MkListOne(MkExpOp(MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(exp->__anon1.op.exp1))), exp->__anon1.op.op, MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(exp->__anon1.op.exp2)))))), '/', MkExpMember(classExp, MkIdentifier("typeSize"))));
+ProcessExpressionType(((struct Expression *)(*exp->__anon1.list).first)->__anon1.op.exp2);
+FreeType(dummy);
+return ;
}
-else if(prop->dataType)
-prop->dataType->refCount++;
}
-else if(member)
-{
-if(exp->__anon1.member.exp->expType->classObjectType == 2 && !strcmp(exp->__anon1.member.member->string, "_class"))
-{
-FreeExpContents(exp);
-exp->type = 0;
-exp->__anon1.__anon1.identifier = MkIdentifier("class");
-ProcessExpressionType(exp);
-return ;
}
-exp->__anon1.member.memberType = 3;
-DeclareStruct(_class->fullName, 0x0);
-if(!member->dataType)
-{
-struct Context * context = SetupTemplatesContext(_class);
-
-member->dataType = ProcessTypeString(member->dataTypeString, 0x0);
-FinishTemplatesContext(context);
}
-exp->expType = member->dataType;
-if(member->dataType)
-member->dataType->refCount++;
}
-else if(revConvert)
+if(!success && exp->__anon1.op.exp1->type == 2)
{
-exp->__anon1.member.memberType = 4;
-exp->expType = MkClassType(revConvert->_class->fullName);
-}
-else if(method)
+if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0))
{
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp1->destType;
+if(exp->__anon1.op.exp1->destType)
+exp->__anon1.op.exp1->destType->refCount++;
+success = 1;
+}
+else if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0))
{
-exp->__anon1.member.memberType = 2;
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp2->destType;
+if(exp->__anon1.op.exp2->destType)
+exp->__anon1.op.exp2->destType->refCount++;
+success = 1;
}
-if(!method->dataType)
-ProcessMethodType(method);
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 16, __ecereInstance1->__anon1.__anon3.method = method, __ecereInstance1;
-});
-exp->expType->__anon1.__anon3.methodClass = (id && id->_class) ? _class : (((void *)0));
-exp->expType->__anon1.__anon3.usedClass = _class;
}
-else if(!classProp)
+else if(!success)
{
-if(exp->__anon1.member.exp->expType->classObjectType == 2 && !strcmp(exp->__anon1.member.member->string, "_class"))
+if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0))
{
-FreeExpContents(exp);
-exp->type = 0;
-exp->__anon1.__anon1.identifier = MkIdentifier("class");
+if(exp->expType)
FreeType(exp->expType);
-exp->expType = MkClassType("ecere::com::Class");
-return ;
-}
-yylloc = exp->__anon1.member.member->loc;
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find member %s in class %s\n", (((void *)0))), id->string, _class->fullName);
-if(inCompiler)
-__ecereNameSpace__ecere__com__eClass_AddDataMember(_class, id->string, "int", 0, 0, 1);
+exp->expType = exp->__anon1.op.exp2->destType;
+if(exp->__anon1.op.exp2->destType)
+exp->__anon1.op.exp2->destType->refCount++;
+success = 1;
}
-if(_class && exp->expType)
+else if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0))
{
-struct __ecereNameSpace__ecere__com__Class * tClass;
-
-tClass = type->__anon1._class && type->__anon1._class->__anon1.registered ? type->__anon1._class->__anon1.registered : _class;
-while(tClass && !tClass->templateClass)
-tClass = tClass->base;
-if(tClass && exp->expType->kind == 20 && exp->expType->__anon1.templateParameter->type == 0)
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp1->destType;
+if(exp->__anon1.op.exp1->destType)
+exp->__anon1.op.exp1->destType->refCount++;
+success = 1;
+}
+}
+if(!success)
{
-int id = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * sClass;
+char expString1[10240];
+char expString2[10240];
+char type1[1024];
+char type2[1024];
-for(sClass = tClass; sClass; sClass = sClass->base)
-{
-id = 0;
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
-{
-if(curParam->type == 0 && !strcmp(exp->expType->__anon1.templateParameter->identifier->string, curParam->name))
+expString1[0] = '\0';
+expString2[0] = '\0';
+type1[0] = '\0';
+type2[0] = '\0';
+if(inCompiler)
{
-for(sClass = sClass->base; sClass; sClass = sClass->base)
-id += sClass->templateParams.count;
-break;
+PrintExpression(exp->__anon1.op.exp1, expString1);
+__ecereNameSpace__ecere__sys__ChangeCh(expString1, '\n', ' ');
+PrintExpression(exp->__anon1.op.exp2, expString2);
+__ecereNameSpace__ecere__sys__ChangeCh(expString2, '\n', ' ');
+PrintType(exp->__anon1.op.exp1->expType, type1, 0, 1);
+PrintType(exp->__anon1.op.exp2->expType, type2, 0, 1);
}
-id++;
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expressions %s (%s) and %s (%s)\n", (((void *)0))), expString1, type1, expString2, type2);
}
-if(curParam)
-break;
}
-if(curParam && tClass->templateArgs[id].__anon1.__anon1.dataTypeString)
+}
+else if(!boolResult && !useSideUnit && c2 && c2->type == 3 && type1 && type1->kind != 8)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = tClass->templateArgs[id];
-struct Context * context = SetupTemplatesContext(tClass);
-unsigned int constant = exp->expType->constant;
-
-FreeType(exp->expType);
-exp->expType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0);
-if(exp->expType->kind == 8 && constant)
-exp->expType->constant = 0x1;
-else if(exp->expType->kind == 13)
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType;
+if(type2->__anon1._class->__anon1.registered->dataType)
+type2->__anon1._class->__anon1.registered->dataType->refCount++;
+CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0);
+exp->expType = type2;
+if(type2)
+type2->refCount++;
+}
+else if(!boolResult && !useSideUnit && c1 && c1->type == 3 && type2 && type2->kind != 8)
{
-struct Type * t = exp->expType->__anon1.type;
-
-while(t->kind == 13)
-t = t->__anon1.type;
-if(constant)
-t->constant = constant;
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType;
+if(type1->__anon1._class->__anon1.registered->dataType)
+type1->__anon1._class->__anon1.registered->dataType->refCount++;
+CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0);
+exp->expType = type1;
+if(type1)
+type1->refCount++;
}
-if(exp->expType)
+else if(type1)
{
-if(exp->expType->kind == 21)
+unsigned int valid = 0;
+
+if(!boolResult && useSideUnit && c1 && c1->type == 3 && type2 && type2->kind != 8)
{
-FreeType(exp->expType);
-exp->expType = ReplaceThisClassType(_class);
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = c1->dataType;
+exp->__anon1.op.exp2->destType->refCount++;
+CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0);
+if(type2)
+FreeType(type2);
+type2 = exp->__anon1.op.exp2->destType;
+c2 = type2 && type2->kind == 8 && type2->__anon1._class ? type2->__anon1._class->__anon1.registered : (((void *)0));
+if(type2)
+type2->refCount++;
+exp->expType = type2;
+type2->refCount++;
}
-if(tClass->templateClass && (exp->expType->kind != 20 || (!exp->expType->__anon1.templateParameter || (!exp->expType->__anon1.templateParameter->dataTypeString && !exp->expType->__anon1.templateParameter->__anon1.dataType))))
-exp->expType->passAsTemplate = 0x1;
-if(!exp->destType)
+if(!boolResult && useSideUnit && c2 && c2->type == 3 && type1 && type1->kind != 8)
{
-exp->destType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0);
-if(exp->destType->kind == 8 && constant)
-exp->destType->constant = 0x1;
-else if(exp->destType->kind == 13)
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = c2->dataType;
+exp->__anon1.op.exp1->destType->refCount++;
+CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0);
+type1 = exp->__anon1.op.exp1->destType;
+c1 = type1 && type1->kind == 8 && type1->__anon1._class ? type1->__anon1._class->__anon1.registered : (((void *)0));
+exp->expType = type1;
+type1->refCount++;
+}
+if(!boolResult || exp->__anon1.op.op == '>' || exp->__anon1.op.op == '<' || exp->__anon1.op.op == GE_OP || exp->__anon1.op.op == LE_OP)
{
-struct Type * t = exp->destType->__anon1.type;
+unsigned int op1IsEnum = c1 && c1->type == 4;
+unsigned int op2IsEnum = c2 && c2->type == 4;
-while(t->kind == 13)
-t = t->__anon1.type;
-if(constant)
-t->constant = constant;
-}
-if(exp->destType->kind == 21)
+if(exp->__anon1.op.op == '*' || exp->__anon1.op.op == '/' || exp->__anon1.op.op == '-' || exp->__anon1.op.op == '|' || exp->__anon1.op.op == '^')
{
-FreeType(exp->destType);
-exp->destType = ReplaceThisClassType(_class);
+if(op1IsEnum && exp->__anon1.op.exp2->expType)
+{
+if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0, 0))
+{
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp2->expType;
+if(exp->__anon1.op.exp2->expType)
+exp->__anon1.op.exp2->expType->refCount++;
+valid = 1;
}
}
+else if(op2IsEnum && exp->__anon1.op.exp1->expType)
+{
+if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0, 0))
+{
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp1->expType;
+if(exp->__anon1.op.exp1->expType)
+exp->__anon1.op.exp1->expType->refCount++;
+valid = 1;
}
-FinishTemplatesContext(context);
}
}
-else if(tClass && exp->expType->kind == 13 && exp->expType->__anon1.type && exp->expType->__anon1.type->kind == 20 && exp->expType->__anon1.type->__anon1.templateParameter->type == 0)
+else
{
-int id = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * sClass;
-
-for(sClass = tClass; sClass; sClass = sClass->base)
+if(op1IsEnum && exp->__anon1.op.exp2->expType)
{
-id = 0;
-if(sClass->templateClass)
-sClass = sClass->templateClass;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0, 0))
{
-if(curParam->type == 0 && !strcmp(exp->expType->__anon1.type->__anon1.templateParameter->identifier->string, curParam->name))
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp1->expType;
+if(exp->__anon1.op.exp1->expType)
+exp->__anon1.op.exp1->expType->refCount++;
+valid = 1;
+}
+}
+else if(op2IsEnum && exp->__anon1.op.exp1->expType)
{
-for(sClass = sClass->base; sClass; sClass = sClass->base)
-id += sClass->templateParams.count;
-break;
+if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0, 0))
+{
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp2->expType;
+if(exp->__anon1.op.exp2->expType)
+exp->__anon1.op.exp2->expType->refCount++;
+valid = 1;
}
-id++;
}
-if(curParam)
-break;
}
-if(curParam)
+}
+if(!valid)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = tClass->templateArgs[id];
-struct Context * context = SetupTemplatesContext(tClass);
-struct Type * basicType;
-
-basicType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0);
-if(basicType)
+if(c2 && c2->type == 3 && (!c1 || c1->type != 3))
{
-if(basicType->kind == 21)
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = type2;
+type2->refCount++;
+if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0))
{
-FreeType(basicType);
-basicType = ReplaceThisClassType(_class);
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp1->destType;
+if(exp->__anon1.op.exp1->destType)
+exp->__anon1.op.exp1->destType->refCount++;
+}
}
+else
+{
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1;
+type1->refCount++;
+if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0))
+{
+if(exp->expType)
FreeType(exp->expType);
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+exp->expType = exp->__anon1.op.exp2->destType;
+if(exp->__anon1.op.exp2->destType)
+exp->__anon1.op.exp2->destType->refCount++;
+}
+else if(type1 && type2)
+{
+char expString1[10240];
+char expString2[10240];
+char type1String[1024];
+char type2String[1024];
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = basicType, __ecereInstance1;
-});
-if(!exp->destType)
+expString1[0] = '\0';
+expString2[0] = '\0';
+type1String[0] = '\0';
+type2String[0] = '\0';
+if(inCompiler)
{
-exp->destType = exp->expType;
-exp->destType->refCount++;
+PrintExpression(exp->__anon1.op.exp1, expString1);
+__ecereNameSpace__ecere__sys__ChangeCh(expString1, '\n', ' ');
+PrintExpression(exp->__anon1.op.exp2, expString2);
+__ecereNameSpace__ecere__sys__ChangeCh(expString2, '\n', ' ');
+PrintType(exp->__anon1.op.exp1->expType, type1String, 0, 1);
+PrintType(exp->__anon1.op.exp2->expType, type2String, 0, 1);
}
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expressions %s (%s) and %s (%s)\n", (((void *)0))), expString1, type1String, expString2, type2String);
+if(c1 && c1->type == 4)
{
-struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl;
-
-decl = SpecDeclFromString(arg.__anon1.__anon1.dataTypeString, specs, (((void *)0)));
-*newExp = *exp;
-if(exp->destType)
-exp->destType->refCount++;
-if(exp->expType)
-exp->expType->refCount++;
-exp->type = 11;
-exp->__anon1.cast.typeName = MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl));
-exp->__anon1.cast.exp = newExp;
+exp->expType = exp->__anon1.op.exp1->expType;
+if(exp->__anon1.op.exp1->expType)
+exp->__anon1.op.exp1->expType->refCount++;
}
+else if(c2 && c2->type == 4)
+{
+exp->expType = exp->__anon1.op.exp2->expType;
+if(exp->__anon1.op.exp2->expType)
+exp->__anon1.op.exp2->expType->refCount++;
}
-FinishTemplatesContext(context);
}
}
-else if(tClass && exp->expType->kind == 8 && exp->expType->__anon1._class && strchr(exp->expType->__anon1._class->string, '<'))
-{
-struct __ecereNameSpace__ecere__com__Class * expClass = exp->expType->__anon1._class->__anon1.registered;
-
-if(expClass)
-{
-struct __ecereNameSpace__ecere__com__Class * cClass = (((void *)0));
-int p = 0;
-int paramCount = 0;
-int lastParam = -1;
-char templateString[1024];
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-
-sprintf(templateString, "%s<", expClass->templateClass->fullName);
-while(cClass != expClass)
-{
-struct __ecereNameSpace__ecere__com__Class * sClass;
-
-for(sClass = expClass; sClass && sClass->base != cClass; sClass = sClass->base)
-;
-cClass = sClass;
-for(param = cClass->templateParams.first; param; param = param->next)
+}
+}
+else if(type2)
{
-struct __ecereNameSpace__ecere__com__Class * cClassCur = (((void *)0));
-int cp = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * paramCur = (((void *)0));
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg;
-
-while(cClassCur != tClass && !paramCur)
+if(c2 && c2->type == 4)
{
-struct __ecereNameSpace__ecere__com__Class * sClassCur;
+struct Type * oldType = exp->__anon1.op.exp1->expType;
-for(sClassCur = tClass; sClassCur && sClassCur->base != cClassCur; sClassCur = sClassCur->base)
-;
-cClassCur = sClassCur;
-for(paramCur = cClassCur->templateParams.first; paramCur; paramCur = paramCur->next)
-{
-if(!strcmp(paramCur->name, param->name))
+exp->__anon1.op.exp1->expType = (((void *)0));
+if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0))
+FreeType(oldType);
+else
+exp->__anon1.op.exp1->expType = oldType;
+}
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = type2;
+type2->refCount++;
+if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0))
{
-break;
+if(exp->expType)
+FreeType(exp->expType);
+exp->expType = exp->__anon1.op.exp1->destType;
+if(exp->__anon1.op.exp1->destType)
+exp->__anon1.op.exp1->destType->refCount++;
}
-cp++;
}
}
-if(paramCur && paramCur->type == 0)
-arg = tClass->templateArgs[cp];
-else
-arg = expClass->templateArgs[p];
-{
-char argument[256];
-
-argument[0] = '\0';
-switch(param->type)
+else if(type2 && (!type1 || (type2->kind == 8 && type1->kind != 8)))
{
-case 2:
+if(type1 && c2 && c2->type == 3)
{
-char expString[1024];
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
-struct Expression * exp;
-char * string = PrintHexUInt64(arg.__anon1.expression.__anon1.ui64);
-
-exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
-(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
-ProcessExpressionType(exp);
-ComputeExpression(exp);
-expString[0] = '\0';
-PrintExpression(exp, expString);
-strcat(argument, expString);
-FreeExpression(exp);
-break;
+if(exp->__anon1.op.exp1->destType)
+FreeType(exp->__anon1.op.exp1->destType);
+exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType;
+if(type2->__anon1._class->__anon1.registered->dataType)
+type2->__anon1._class->__anon1.registered->dataType->refCount++;
+CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0);
}
-case 1:
+if(exp->__anon1.op.op == '!')
{
-strcat(argument, arg.__anon1.__anon2.__anon1.member->name);
-break;
+exp->expType = MkClassType("bool");
+exp->expType->truth = 1;
}
-case 0:
+else
{
-if(arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
-strcat(argument, arg.__anon1.__anon1.dataTypeString);
-break;
+exp->expType = type2;
+if(type2)
+type2->refCount++;
}
}
-if(argument[0])
+else if(type1 && (!type2 || (type1->kind == 8 && type2->kind != 8)))
{
-if(paramCount)
-strcat(templateString, ", ");
-if(lastParam != p - 1)
+if(c2 && c2->type == 3)
{
-strcat(templateString, param->name);
-strcat(templateString, " = ");
+if(exp->__anon1.op.exp2->destType)
+FreeType(exp->__anon1.op.exp2->destType);
+exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType;
+if(type1->__anon1._class->__anon1.registered->dataType)
+type1->__anon1._class->__anon1.registered->dataType->refCount++;
+CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0);
}
-strcat(templateString, argument);
-paramCount++;
-lastParam = p;
+exp->expType = type1;
+if(type1)
+type1->refCount++;
}
}
-p++;
+yylloc = exp->loc;
+if(exp->__anon1.op.exp1 && !exp->__anon1.op.exp1->expType)
+{
+char expString[10000];
+
+expString[0] = '\0';
+if(inCompiler)
+{
+PrintExpression(exp->__anon1.op.exp1, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
}
+if(expString[0])
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
}
+if(exp->__anon1.op.exp2 && !exp->__anon1.op.exp2->expType)
{
-int len = strlen(templateString);
+char expString[10240];
-if(templateString[len - 1] == '>')
-templateString[len++] = ' ';
-templateString[len++] = '>';
-templateString[len++] = '\0';
+expString[0] = '\0';
+if(inCompiler)
+{
+PrintExpression(exp->__anon1.op.exp2, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+}
+if(expString[0])
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
}
+if(boolResult)
+{
FreeType(exp->expType);
+exp->expType = MkClassType("bool");
+exp->expType->truth = 1;
+}
+if(exp->__anon1.op.op != SIZEOF)
+exp->isConstant = (!exp->__anon1.op.exp1 || exp->__anon1.op.exp1->isConstant) && (!exp->__anon1.op.exp2 || exp->__anon1.op.exp2->isConstant);
+if(exp->__anon1.op.op == SIZEOF && exp->__anon1.op.exp2->expType)
{
-struct Context * context = SetupTemplatesContext(tClass);
-
-exp->expType = ProcessTypeString(templateString, 0x0);
-FinishTemplatesContext(context);
+DeclareType(curExternal, exp->__anon1.op.exp2->expType, 1, 0);
}
+if(exp->__anon1.op.op == DELETE && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->expType && __ecereProp_Type_Get_specConst(exp->__anon1.op.exp2->expType))
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "deleting const qualified object\n", (((void *)0))));
+yylloc = oldyylloc;
+FreeType(dummy);
+if(type2)
+FreeType(type2);
+break;
}
+case 5:
+case 32:
+{
+struct Expression * e;
+
+exp->isConstant = 1;
+for(e = (*exp->__anon1.list).first; e; e = e->next)
+{
+if(!e->next)
+{
+FreeType(e->destType);
+e->opDestType = exp->opDestType;
+e->usedInComparison = exp->usedInComparison;
+e->parentOpDestType = exp->parentOpDestType;
+e->destType = exp->destType;
+if(e->destType)
+{
+exp->destType->refCount++;
}
}
+ProcessExpressionType(e);
+if(e->ambiguousUnits)
+exp->ambiguousUnits = 1;
+if(!exp->expType && !e->next)
+{
+exp->expType = e->expType;
+if(e->expType)
+e->expType->refCount++;
+exp->needCast = e->needCast;
}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "undefined class %s\n", (((void *)0))), (id && (!id->_class || id->_class->__anon1.__anon1.name)) ? (id->classSym ? id->classSym->string : (type->__anon1._class ? type->__anon1._class->string : (((void *)0)))) : "(null)");
+if(!e->isConstant)
+exp->isConstant = 0;
}
-else if(type && (type->kind == 9 || type->kind == 10))
+e = (*exp->__anon1.list).first;
+if(!e->next && e->type == 8)
{
-struct Type * memberType = exp->__anon1.member.member ? FindMember(type, exp->__anon1.member.member->string) : (((void *)0));
+struct Expression * next = exp->next, * prev = exp->prev;
-if(memberType)
-{
-exp->expType = memberType;
-if(memberType)
-memberType->refCount++;
+FreeType(exp->expType);
+FreeType(exp->destType);
+(__ecereNameSpace__ecere__com__eSystem_Delete(exp->__anon1.list), exp->__anon1.list = 0);
+*exp = *e;
+exp->prev = prev;
+exp->next = next;
+((e ? __extension__ ({
+void * __ecerePtrToDelete = (e);
+
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), e = 0);
+ProcessExpressionType(exp);
}
+break;
}
-else
+case 6:
{
-char expString[10240];
+struct Expression * e;
-expString[0] = '\0';
-if(inCompiler)
+exp->isConstant = 1;
+ProcessExpressionType(exp->__anon1.index.exp);
+if(!exp->__anon1.index.exp->isConstant)
+exp->isConstant = 0;
+if(exp->__anon1.index.exp->expType)
{
-PrintExpression(exp, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
-}
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "member operator on non-structure type expression %s\n", (((void *)0))), expString);
-}
-if(exp->expType && exp->expType->kind == 21 && (!exp->destType || exp->destType->kind != 21))
+struct Type * source = exp->__anon1.index.exp->expType;
+
+if(source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered)
{
-if(type && (type->kind == 8 || type->kind == 19 || type->kind == 3 || type->kind == 15))
+struct __ecereNameSpace__ecere__com__Class * _class = source->__anon1._class->__anon1.registered;
+struct __ecereNameSpace__ecere__com__Class * c = _class->templateClass ? _class->templateClass : _class;
+
+if(_class != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(c, containerClass) && _class->templateArgs)
{
-struct Identifier * id = exp->__anon1.member.member;
-struct __ecereNameSpace__ecere__com__Class * _class = (id && (!id->_class || id->_class->__anon1.__anon1.name)) ? (id->classSym ? id->classSym->__anon1.registered : (type->__anon1._class ? type->__anon1._class->__anon1.registered : (((void *)0)))) : (((void *)0));
+exp->expType = ProcessTypeString(_class->templateArgs[2].__anon1.__anon1.dataTypeString, 0);
+if(exp->__anon1.index.index && (*exp->__anon1.index.index).last)
+{
+struct Type * type = ProcessTypeString(_class->templateArgs[1].__anon1.__anon1.dataTypeString, 0);
-if(_class)
+if(type->kind == 8)
+type->constant = 1;
+else if(type->kind == 13)
{
-FreeType(exp->expType);
-exp->expType = ReplaceThisClassType(_class);
+struct Type * t = type;
+
+while(t->kind == 13)
+t = t->__anon1.type;
+t->constant = 1;
}
+((struct Expression *)(*exp->__anon1.index.index).last)->destType = type;
}
}
-yylloc = oldyylloc;
-break;
}
-case 9:
+}
+for(e = (*exp->__anon1.index.index).first; e; e = e->next)
{
-struct Type * destType = exp->destType;
-
-if(exp->__anon1.member.member && exp->__anon1.member.member->_class && exp->__anon1.member.member->_class->__anon1.__anon1.name)
+if(!e->next && exp->__anon1.index.exp->expType && exp->__anon1.index.exp->expType->kind == 12 && exp->__anon1.index.exp->expType->__anon1.__anon4.enumClass)
{
-exp->__anon1.member.member->classSym = exp->__anon1.member.member->_class->__anon1.__anon1.symbol;
+if(e->destType)
+FreeType(e->destType);
+e->destType = MkClassType(exp->__anon1.index.exp->expType->__anon1.__anon4.enumClass->string);
}
-exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpOp((((void *)0)), '*', exp->__anon1.member.exp)));
-exp->type = 8;
-if(destType)
-destType->count++;
-ProcessExpressionType(exp);
-if(destType)
-destType->count--;
+ProcessExpressionType(e);
+if(!e->next)
+{
+}
+if(!e->isConstant)
+exp->isConstant = 0;
+}
+if(!exp->expType)
+exp->expType = Dereference(exp->__anon1.index.exp->expType);
+if(exp->expType)
+DeclareType(curExternal, exp->expType, 1, 0);
break;
}
-case 15:
-{
-struct Symbol * classSym = exp->__anon1._class->__anon1.__anon1.symbol;
-
-if(classSym && classSym->__anon1.registered)
-{
-if(classSym->__anon1.registered->type == 5)
+case 7:
{
+struct Expression * e;
+struct Type * functionType;
+struct Type * methodType = (((void *)0));
char name[1024];
name[0] = '\0';
-DeclareStruct(classSym->string, 0x0);
-FreeSpecifier(exp->__anon1._class);
-exp->type = 10;
-FullClassNameCat(name, classSym->string, 0x0);
-exp->__anon1.typeName = MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(name), (((void *)0)))), (((void *)0)));
-}
-else
-{
-if(classSym->__anon1.registered->fixed)
+if(inCompiler)
{
-FreeSpecifier(exp->__anon1._class);
-exp->__anon1.__anon1.constant = PrintUInt(classSym->__anon1.registered->templateClass ? classSym->__anon1.registered->templateClass->structSize : classSym->__anon1.registered->structSize);
-exp->type = 2;
-}
-else
+PrintExpression(exp->__anon1.call.exp, name);
+if(exp->__anon1.call.exp->expType && !exp->__anon1.call.exp->expType->__anon1.__anon2.returnType)
{
-char className[1024];
-
-strcpy(className, "__ecereClass_");
-FullClassNameCat(className, classSym->string, 0x1);
-DeclareClass(classSym, className);
-FreeExpContents(exp);
-exp->type = 9;
-exp->__anon1.member.exp = MkExpIdentifier(MkIdentifier(className));
-exp->__anon1.member.member = MkIdentifier("structSize");
-}
+PrintExpression(exp->__anon1.call.exp, name);
}
}
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+if(exp->__anon1.call.exp->type == 0)
+{
+struct Expression * idExp = exp->__anon1.call.exp;
+struct Identifier * id = idExp->__anon1.__anon1.identifier;
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1;
-});
+if(!strcmp(id->string, "__builtin_frame_address"))
+{
+exp->expType = ProcessTypeString("void *", 1);
+if(exp->__anon1.call.arguments && (*exp->__anon1.call.arguments).first)
+ProcessExpressionType((*exp->__anon1.call.arguments).first);
break;
}
-case 10:
+else if(!strcmp(id->string, "__ENDIAN_PAD"))
{
-struct Type * type = ProcessType(exp->__anon1.typeName->qualifiers, exp->__anon1.typeName->declarator);
-
-exp->expType = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1;
-});
-exp->isConstant = 0x1;
-DeclareType(type, 0x0, 0x0);
-FreeType(type);
+exp->expType = ProcessTypeString("int", 1);
+if(exp->__anon1.call.arguments && (*exp->__anon1.call.arguments).first)
+ProcessExpressionType((*exp->__anon1.call.arguments).first);
break;
}
-case 11:
+else if(!strcmp(id->string, "Max") || !strcmp(id->string, "Min") || !strcmp(id->string, "Sgn") || !strcmp(id->string, "Abs"))
{
-struct Type * type = ProcessType(exp->__anon1.cast.typeName->qualifiers, exp->__anon1.cast.typeName->declarator);
+struct Expression * a = (((void *)0));
+struct Expression * b = (((void *)0));
+struct Expression * tempExp1 = (((void *)0)), * tempExp2 = (((void *)0));
-type->count = 1;
-FreeType(exp->__anon1.cast.exp->destType);
-exp->__anon1.cast.exp->destType = type;
-type->refCount++;
-type->casted = 0x1;
-ProcessExpressionType(exp->__anon1.cast.exp);
-type->casted = 0x0;
-type->count = 0;
-exp->expType = type;
-if(!exp->__anon1.cast.exp->needCast && !NeedCast(exp->__anon1.cast.exp->expType, type))
+if((!strcmp(id->string, "Max") || !strcmp(id->string, "Min")) && (*exp->__anon1.call.arguments).count == 2)
{
-void * prev = exp->prev, * next = exp->next;
-struct Type * expType = exp->__anon1.cast.exp->destType;
-struct Expression * castExp = exp->__anon1.cast.exp;
-struct Type * destType = exp->destType;
+a = (*exp->__anon1.call.arguments).first;
+b = (*exp->__anon1.call.arguments).last;
+tempExp1 = a;
+tempExp2 = b;
+}
+else if((*exp->__anon1.call.arguments).count == 1)
+{
+a = (*exp->__anon1.call.arguments).first;
+tempExp1 = a;
+}
+if(a)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear((&*exp->__anon1.call.arguments));
+idExp->__anon1.__anon1.identifier = (((void *)0));
+FreeExpContents(exp);
+ProcessExpressionType(a);
+if(b)
+ProcessExpressionType(b);
+exp->type = 5;
+exp->__anon1.list = MkList();
+if(a->expType && (!b || b->expType))
+{
+if((!a->isConstant && a->type != 0) || (b && !b->isConstant && b->type != 0))
+{
+if(inCompiler)
+{
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct __ecereNameSpace__ecere__sys__OldList * decls = MkList();
+struct Declaration * decl;
+char temp1[1024], temp2[1024];
-if(expType)
-expType->refCount++;
-FreeType(exp->expType);
-FreeTypeName(exp->__anon1.cast.typeName);
-*exp = *castExp;
-FreeType(exp->expType);
-FreeType(exp->destType);
-exp->expType = expType;
-exp->destType = destType;
-((castExp ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)castExp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(castExp)) : 0), castExp = 0);
-exp->prev = prev;
-exp->next = next;
+GetTypeSpecs(a->expType, specs);
+if(a && !a->isConstant && a->type != 0)
+{
+sprintf(temp1, "__simpleStruct%d", curContext->simpleID++);
+ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(temp1)), (((void *)0))));
+tempExp1 = QMkExpId(temp1);
+tempExp1->expType = a->expType;
+if(a->expType)
+a->expType->refCount++;
+ListAdd(exp->__anon1.list, MkExpOp(CopyExpression(tempExp1), '=', a));
}
-else
+if(b && !b->isConstant && b->type != 0)
{
-exp->isConstant = exp->__anon1.cast.exp->isConstant;
+sprintf(temp2, "__simpleStruct%d", curContext->simpleID++);
+ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(temp2)), (((void *)0))));
+tempExp2 = QMkExpId(temp2);
+tempExp2->expType = b->expType;
+if(b->expType)
+b->expType->refCount++;
+ListAdd(exp->__anon1.list, MkExpOp(CopyExpression(tempExp2), '=', b));
}
-break;
+decl = MkDeclaration(specs, decls);
+if(!curCompound->__anon1.compound.declarations)
+curCompound->__anon1.compound.declarations = MkList();
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*curCompound->__anon1.compound.declarations), (((void *)0)), decl);
}
-case 33:
+}
+}
+if(!strcmp(id->string, "Max") || !strcmp(id->string, "Min"))
{
-struct Type * type = ProcessType(exp->__anon1.initializer.typeName->qualifiers, exp->__anon1.initializer.typeName->declarator);
+int op = (!strcmp(id->string, "Max")) ? '>' : '<';
-exp->expType = type;
-break;
+ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), op, CopyExpression(tempExp2)))), MkListOne(CopyExpression(tempExp1)), CopyExpression(tempExp2)));
+exp->expType = a->expType;
+if(a->expType)
+a->expType->refCount++;
+}
+else if(!strcmp(id->string, "Abs"))
+{
+ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))), MkListOne(MkExpOp((((void *)0)), '-', CopyExpression(tempExp1))), CopyExpression(tempExp1)));
+exp->expType = a->expType;
+if(a->expType)
+a->expType->refCount++;
}
-case 34:
+else if(!strcmp(id->string, "Sgn"))
{
-struct Type * type = ProcessType(exp->__anon1.vaArg.typeName->qualifiers, exp->__anon1.vaArg.typeName->declarator);
-
-ProcessExpressionType(exp->__anon1.vaArg.exp);
-exp->expType = type;
+ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp((((void *)0)), '!', CopyExpression(tempExp1)))), MkListOne(MkExpConstant("0")), MkExpBrackets(MkListOne(MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))), MkListOne(MkExpConstant("-1")), MkExpConstant("1"))))));
+exp->expType = ProcessTypeString("int", 0);
+}
+FreeExpression(tempExp1);
+if(tempExp2)
+FreeExpression(tempExp2);
+FreeIdentifier(id);
break;
}
-case 12:
+}
+}
{
-struct Expression * e;
+struct Type * dummy = (dummy = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), dummy->count = 1, dummy->refCount = 1, dummy);
-exp->isConstant = 0x1;
-FreeType(exp->__anon1.cond.cond->destType);
-exp->__anon1.cond.cond->destType = MkClassType("bool");
-exp->__anon1.cond.cond->destType->truth = 0x1;
-ProcessExpressionType(exp->__anon1.cond.cond);
-if(!exp->__anon1.cond.cond->isConstant)
-exp->isConstant = 0x0;
-for(e = (*exp->__anon1.cond.exp).first; e; e = e->next)
-{
-if(!e->next)
+if(!exp->__anon1.call.exp->destType)
{
-FreeType(e->destType);
-e->destType = exp->destType;
-if(e->destType)
-e->destType->refCount++;
+exp->__anon1.call.exp->destType = dummy;
+dummy->refCount++;
}
-ProcessExpressionType(e);
-if(!e->next)
+ProcessExpressionType(exp->__anon1.call.exp);
+if(exp->__anon1.call.exp->destType == dummy)
{
-exp->expType = e->expType;
-if(e->expType)
-e->expType->refCount++;
-}
-if(!e->isConstant)
-exp->isConstant = 0x0;
+FreeType(dummy);
+exp->__anon1.call.exp->destType = (((void *)0));
}
-FreeType(exp->__anon1.cond.elseExp->destType);
-exp->__anon1.cond.elseExp->destType = exp->destType ? exp->destType : exp->expType;
-if(exp->__anon1.cond.elseExp->destType)
-exp->__anon1.cond.elseExp->destType->refCount++;
-ProcessExpressionType(exp->__anon1.cond.elseExp);
-if(!exp->__anon1.cond.elseExp->isConstant)
-exp->isConstant = 0x0;
-break;
+FreeType(dummy);
}
-case 23:
+functionType = exp->__anon1.call.exp->expType;
+if(functionType && functionType->kind == 16)
{
-if(exp->__anon1.compound && exp->__anon1.compound->__anon1.compound.statements && (*exp->__anon1.compound->__anon1.compound.statements).last)
+methodType = functionType;
+functionType = methodType->__anon1.__anon3.method->dataType;
+if(exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass)
{
-struct Statement * last = (*exp->__anon1.compound->__anon1.compound.statements).last;
+char typeString[1024];
-if(last->type == 3 && last->__anon1.expressions && (*last->__anon1.expressions).last)
+typeString[0] = '\0';
{
-((struct Expression *)(*last->__anon1.expressions).last)->destType = exp->destType;
-if(exp->destType)
-exp->destType->refCount++;
-}
-ProcessStatement(exp->__anon1.compound);
-exp->expType = (last->__anon1.expressions && (*last->__anon1.expressions).last) ? ((struct Expression *)(*last->__anon1.expressions).last)->expType : (((void *)0));
-if(exp->expType)
-exp->expType->refCount++;
+struct Symbol * back = functionType->__anon1.__anon2.thisClass;
+
+functionType->__anon1.__anon2.thisClass = (((void *)0));
+PrintType(functionType, typeString, 1, 1);
+functionType->__anon1.__anon2.thisClass = back;
}
-break;
+if(strstr(typeString, "thisclass"))
+{
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl;
+
+{
+struct Context * context = SetupTemplatesContext(exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass);
+
+decl = SpecDeclFromString(typeString, specs, (((void *)0)));
+if(thisClass != (exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass->templateClass ? exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass->templateClass : exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass))
+thisClassParams = 0;
+ReplaceThisClassSpecifiers(specs, exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass);
+{
+struct __ecereNameSpace__ecere__com__Class * backupThisClass = thisClass;
+
+thisClass = exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass;
+ProcessDeclarator(decl, 1);
+thisClass = backupThisClass;
}
-case 24:
+thisClassParams = 1;
+functionType = ProcessType(specs, decl);
+functionType->refCount = 0;
+FinishTemplatesContext(context);
{
-struct Specifier * spec = (*exp->__anon1._classExp.specifiers).first;
+struct Type * p, * op;
-if(spec && spec->type == 1)
+for(p = functionType->__anon1.__anon2.params.first, op = methodType->__anon1.__anon3.method->dataType->__anon1.__anon2.params.first; p && op; p = p->next, op = op->next)
{
-exp->expType = MkClassType(spec->__anon1.__anon1.name);
-exp->expType->kind = 19;
-exp->byReference = 0x1;
+if(op->kind == 21)
+p->thisClassFrom = methodType->__anon1.__anon3.method->_class;
}
-else
+}
+if(methodType->__anon1.__anon3.method->dataType->__anon1.__anon2.returnType->kind == 21)
{
-exp->expType = MkClassType("ecere::com::Class");
-exp->byReference = 0x1;
+functionType->__anon1.__anon2.returnType->thisClassFrom = methodType->__anon1.__anon3.method->_class;
}
-break;
}
-case 25:
+FreeList(specs, (void *)(FreeSpecifier));
+FreeDeclarator(decl);
+}
+}
+}
+if(functionType && functionType->kind == 13 && functionType->__anon1.type && functionType->__anon1.type->kind == 11)
{
-struct __ecereNameSpace__ecere__com__Class * _class = thisClass ? thisClass : currentClass;
+struct Type * type = functionType->__anon1.type;
-if(_class)
+if(!functionType->refCount)
{
-struct Identifier * id = exp->__anon1.classData.id;
-char structName[1024];
-struct Expression * classExp;
-
-strcpy(structName, "__ecereClassData_");
-FullClassNameCat(structName, _class->fullName, 0x0);
-exp->type = 9;
-exp->__anon1.member.member = id;
-if(curCompound && FindSymbol("this", curContext, curCompound->__anon1.compound.context, 0x0, 0x0))
-classExp = MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class"));
-else
-classExp = MkExpIdentifier(MkIdentifier("class"));
-exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpMember(classExp, MkIdentifier("data"))), '+', MkExpMember(MkExpClass(MkListOne(MkSpecifierName(_class->fullName)), (((void *)0))), MkIdentifier("offsetClass"))))))));
-ProcessExpressionType(exp);
-return ;
+functionType->__anon1.type = (((void *)0));
+FreeType(functionType);
}
-break;
+functionType = type;
}
-case 35:
-{
-struct Type * type = (((void *)0));
-const char * typeString = (((void *)0));
-char typeStringBuf[1024];
-
-if(exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && exp->destType->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(exp->destType->__anon1._class->__anon1.registered, containerClass))
+if(functionType && functionType->kind != 11)
{
-struct __ecereNameSpace__ecere__com__Class * templateClass = exp->destType->__anon1._class->__anon1.registered;
-
-typeString = templateClass->templateArgs[2].__anon1.__anon1.dataTypeString;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "called object %s is not a function\n", (((void *)0))), name);
}
-else if(exp->__anon1.list)
+else if(functionType)
{
-struct Expression * e;
+unsigned int emptyParams = 0, noParams = 0;
+struct Expression * e = exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).first : (((void *)0));
+struct Type * type = functionType->__anon1.__anon2.params.first;
+struct Expression * memberExp = (exp->__anon1.call.exp->type == 8) ? exp->__anon1.call.exp : (((void *)0));
+int extra = 0;
+struct Location oldyylloc = yylloc;
-for(e = (*exp->__anon1.list).first; e; e = e->next)
-{
-ProcessExpressionType(e);
-if(e->expType)
-{
if(!type)
+emptyParams = 1;
+if(functionType->extraParam && e && functionType->__anon1.__anon2.thisClass)
{
-type = e->expType;
-type->refCount++;
+e->destType = MkClassType(functionType->__anon1.__anon2.thisClass->string);
+e = e->next;
}
-else
-{
-if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1))
+if(!functionType->__anon1.__anon2.staticMethod && !functionType->extraParam)
{
-FreeType(type);
-type = e->expType;
-e->expType = (((void *)0));
-e = (*exp->__anon1.list).first;
-ProcessExpressionType(e);
-if(e->expType)
+if(memberExp && memberExp->__anon1.member.exp && memberExp->__anon1.member.exp->expType && memberExp->__anon1.member.exp->expType->kind == 19 && memberExp->__anon1.member.exp->expType->__anon1._class)
{
-if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1))
+type = MkClassType(memberExp->__anon1.member.exp->expType->__anon1._class->string);
+if(e)
{
-FreeType(e->expType);
-e->expType = (((void *)0));
-FreeType(type);
-type = (((void *)0));
-break;
-}
-}
+e->destType = type;
+e = e->next;
+type = functionType->__anon1.__anon2.params.first;
}
+else
+type->refCount = 0;
}
-if(e->expType)
+else if(!memberExp && (functionType->__anon1.__anon2.thisClass || (methodType && methodType->__anon1.__anon3.methodClass)))
{
-FreeType(e->expType);
-e->expType = (((void *)0));
+type = MkClassType(functionType->__anon1.__anon2.thisClass ? functionType->__anon1.__anon2.thisClass->string : (methodType ? methodType->__anon1.__anon3.methodClass->fullName : (((void *)0))));
+type->byReference = functionType->byReference;
+type->typedByReference = functionType->typedByReference;
+if(e)
+{
+if(e->next && type->kind == 8 && (functionType && functionType->__anon1.__anon2.thisClass) && functionType->classObjectType == 2)
+e = e->next;
+e->destType = type;
+e = e->next;
+type = functionType->__anon1.__anon2.params.first;
}
+else
+type->refCount = 0;
}
}
-if(type)
+if(type && type->kind == 0)
{
-typeStringBuf[0] = '\0';
-PrintTypeNoConst(type, typeStringBuf, 0x0, 0x1);
-typeString = typeStringBuf;
+noParams = 1;
+if(!type->refCount)
FreeType(type);
type = (((void *)0));
}
+for(; e; e = e->next)
+{
+if(!type && !emptyParams)
+{
+yylloc = e->loc;
+if(methodType && methodType->__anon1.__anon3.methodClass)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many arguments for method %s::%s (%d given, expected %d)\n", (((void *)0))), methodType->__anon1.__anon3.methodClass->fullName, methodType->__anon1.__anon3.method->name, (*exp->__anon1.call.arguments).count, noParams ? 0 : functionType->__anon1.__anon2.params.count);
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many arguments for function %s (%d given, expected %d)\n", (((void *)0))), name, (*exp->__anon1.call.arguments).count, noParams ? 0 : functionType->__anon1.__anon2.params.count);
+break;
}
-if(typeString)
+if(methodType && type && type->kind == 20 && type->__anon1.templateParameter->type == 0)
{
-char templateString[1024];
-struct __ecereNameSpace__ecere__sys__OldList * initializers = MkList();
-struct __ecereNameSpace__ecere__sys__OldList * structInitializers = MkList();
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Expression * expExt;
-struct Declarator * decl = SpecDeclFromString(typeString, specs, (((void *)0)));
+struct Type * templatedType = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * _class = methodType->__anon1.__anon3.usedClass;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
+int id = 0;
-sprintf(templateString, "Container<%s>", typeString);
-if(exp->__anon1.list)
+if(_class && _class->templateArgs)
{
-struct Expression * e;
+struct __ecereNameSpace__ecere__com__Class * sClass;
-type = ProcessTypeString(typeString, 0x0);
-while((e = (*exp->__anon1.list).first))
+for(sClass = _class; sClass; sClass = sClass->base)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->__anon1.list), e);
-e->destType = type;
-type->refCount++;
-ProcessExpressionType(e);
-ListAdd(initializers, MkInitializerAssignment(e));
-}
-FreeType(type);
-(__ecereNameSpace__ecere__com__eSystem_Delete(exp->__anon1.list), exp->__anon1.list = 0);
-}
-DeclareStruct("ecere::com::BuiltInContainer", 0x0);
-ListAdd(structInitializers, MkInitializerAssignment(MkExpMember(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))), MkIdentifier("_vTbl"))));
-ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
-ListAdd(structInitializers, MkInitializerAssignment(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0)))));
-ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
-ListAdd(structInitializers, MkInitializerAssignment(MkExpConstant("0")));
-ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
-ListAdd(structInitializers, MkInitializerAssignment(MkExpExtensionInitializer(MkTypeName(specs, MkDeclaratorArray(decl, (((void *)0)))), MkInitializerList(initializers))));
-ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
-ListAdd(structInitializers, MkInitializerAssignment(__extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+id = 0;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+{
+if(curParam->type == 0 && !strcmp(type->__anon1.templateParameter->identifier->string, curParam->name))
+{
+struct __ecereNameSpace__ecere__com__Class * nextClass;
-__ecereInstance1->type = 2, __ecereInstance1->__anon1.__anon1.constant = __ecereNameSpace__ecere__com__PrintString(__ecereClass_int, &(*initializers).count, (void *)0), __ecereInstance1;
-})));
-ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
-ListAdd(structInitializers, MkInitializerAssignment(MkExpClass(CopyList(specs, CopySpecifier), CopyDeclarator(decl))));
-ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
-exp->expType = ProcessTypeString(templateString, 0x0);
-exp->type = 5;
-exp->__anon1.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(templateString)), (((void *)0))), MkExpOp((((void *)0)), '&', expExt = MkExpExtensionInitializer(MkTypeName(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))), MkInitializerList(structInitializers)))));
-ProcessExpressionType(expExt);
-}
-else
+for(nextClass = sClass->base; nextClass; nextClass = nextClass->base)
{
-exp->expType = ProcessTypeString("Container", 0x0);
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Couldn't determine type of array elements\n", (((void *)0))));
+if(nextClass->templateClass)
+nextClass = nextClass->templateClass;
+id += nextClass->templateParams.count;
}
break;
}
+id++;
}
-if(exp->expType && exp->expType->kind == 21 && thisClass && (!exp->destType || exp->destType->kind != 21))
-{
-FreeType(exp->expType);
-exp->expType = ReplaceThisClassType(thisClass);
+if(curParam)
+break;
}
-if(exp->expType && (exp->expType->kind == 9 || exp->expType->kind == 10 || exp->expType->kind == 15) && !exp->expType->__anon1.__anon1.members.first && exp->expType->__anon1.__anon1.enumName)
+}
+if(curParam && _class->templateArgs[id].__anon1.__anon1.dataTypeString)
{
-struct Symbol * symbol = FindSymbol(exp->expType->__anon1.__anon1.enumName, curContext, globalContext, 0x1, 0x0);
+unsigned int constant = type->constant;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = _class->templateArgs[id];
-if(symbol)
-{
-if(exp->expType->kind != 15)
{
-struct Type * member;
-char * enumName = __ecereNameSpace__ecere__sys__CopyString(exp->expType->__anon1.__anon1.enumName);
+struct Context * context = SetupTemplatesContext(_class);
-FreeType(exp->expType);
-exp->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-exp->expType->kind = symbol->type->kind;
-exp->expType->refCount++;
-exp->expType->__anon1.__anon1.enumName = enumName;
-exp->expType->__anon1.__anon1.members = symbol->type->__anon1.__anon1.members;
-for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next)
-member->refCount++;
+templatedType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0);
+FinishTemplatesContext(context);
}
-else
+if(templatedType->kind == 8 && constant)
+templatedType->constant = 1;
+else if(templatedType->kind == 13)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * member;
+struct Type * t = templatedType->__anon1.type;
-for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next)
+while(t->kind == 13)
+t = t->__anon1.type;
+if(constant)
+t->constant = constant;
+}
+e->destType = templatedType;
+if(templatedType)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * value = (value = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), value->name = __ecereNameSpace__ecere__sys__CopyString(member->name), value);
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&exp->expType->__anon1.__anon1.members, value);
+templatedType->passAsTemplate = 1;
}
}
+else
+{
+e->destType = type;
+if(type)
+type->refCount++;
}
}
-yylloc = exp->loc;
-if(exp->destType && (exp->destType->kind == 18))
-;
-else if(exp->destType && !exp->destType->keepCast)
-{
-if(!exp->needTemplateCast && exp->expType && (exp->expType->kind == 20 || exp->expType->passAsTemplate))
-exp->needTemplateCast = 1;
-if(exp->destType->kind == 0)
-;
-else if(!CheckExpressionType(exp, exp->destType, 0x0, !exp->destType->casted))
-{
-if(!exp->destType->count || unresolved)
+else
{
-if(!exp->expType)
+if(type && type->kind == 14 && type->prev && type->prev->kind == 8 && type->prev->classObjectType)
{
-yylloc = exp->loc;
-if(exp->destType->kind != 14)
+e->destType = type->prev;
+e->destType->refCount++;
+}
+else
{
-char type2[1024];
-
-type2[0] = '\0';
-if(inCompiler)
+e->destType = type;
+if(type)
+type->refCount++;
+}
+}
+if(type && type->kind != 14)
{
-char expString[10240];
+struct Type * next = type->next;
-expString[0] = '\0';
-PrintType(exp->destType, type2, 0x0, 0x1);
-if(inCompiler)
-{
-PrintExpression(exp, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+if(!type->refCount)
+FreeType(type);
+type = next;
}
-if(unresolved)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s; expected %s\n", (((void *)0))), expString, type2);
-else if(exp->type != 16)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s; expected %s\n", (((void *)0))), expString, type2);
}
+if(type && type->kind != 14)
+{
+if(methodType && methodType->__anon1.__anon3.methodClass)
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough arguments for method %s::%s (%d given, expected %d)\n", (((void *)0))), methodType->__anon1.__anon3.methodClass->fullName, methodType->__anon1.__anon3.method->name, exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).count : 0, functionType->__anon1.__anon2.params.count + extra);
+else
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough arguments for function %s (%d given, expected %d)\n", (((void *)0))), name, exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).count : 0, functionType->__anon1.__anon2.params.count + extra);
+}
+yylloc = oldyylloc;
+if(type && !type->refCount)
+FreeType(type);
}
else
{
-char expString[10240];
+functionType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 0, __ecereInstance1->kind = 11, __ecereInstance1;
+});
+if(exp->__anon1.call.exp->type == 0)
+{
+char * string = exp->__anon1.call.exp->__anon1.__anon1.identifier->string;
-expString[0] = '\0';
if(inCompiler)
{
-PrintExpression(exp, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
-}
-if(unresolved)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s\n", (((void *)0))), expString);
-else if(exp->type != 16)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
+struct Symbol * symbol;
+struct Location oldyylloc = yylloc;
+
+yylloc = exp->__anon1.call.exp->__anon1.__anon1.identifier->loc;
+if(strstr(string, "__builtin_") == string)
+{
+if(exp->destType)
+{
+functionType->__anon1.__anon2.returnType = exp->destType;
+exp->destType->refCount++;
}
}
else
-{
-char type1[1024];
-char type2[1024];
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s undefined; assuming extern returning int\n", (((void *)0))), string);
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-type1[0] = '\0';
-type2[0] = '\0';
-if(inCompiler)
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->type = ProcessTypeString("int()", 1), __ecereInstance1;
+});
+__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol);
+if(strstr(symbol->string, "::"))
+globalContext->hasNameSpace = 1;
+yylloc = oldyylloc;
+}
+}
+else if(exp->__anon1.call.exp->type == 8)
{
-PrintType(exp->expType, type1, 0x0, 0x1);
-PrintType(exp->destType, type2, 0x0, 0x1);
}
-if(exp->destType->truth && exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && !strcmp(exp->destType->__anon1._class->__anon1.registered->name, "bool") && exp->expType->kind != 0 && exp->expType->kind != 9 && exp->expType->kind != 10 && (exp->expType->kind != 8 || exp->expType->classObjectType || (exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type != 1)))
-;
else
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "callable object undefined; extern assuming returning int\n", (((void *)0))));
+if(!functionType->__anon1.__anon2.returnType)
{
-char expString[10240];
+functionType->__anon1.__anon2.returnType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-expString[0] = '\0';
-if(inCompiler)
-{
-PrintExpression(exp, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 3, __ecereInstance1;
+});
}
-if(!sourceFile || (strcmp(sourceFile, "src\\lexer.ec") && strcmp(sourceFile, "src/lexer.ec") && strcmp(sourceFile, "src\\grammar.ec") && strcmp(sourceFile, "src/grammar.ec")))
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expression %s (%s); expected %s\n", (((void *)0))), expString, type1, type2);
-FreeType(exp->expType);
-exp->destType->refCount++;
-exp->expType = exp->destType;
}
+if(functionType && functionType->kind == 11)
+{
+exp->expType = functionType->__anon1.__anon2.returnType;
+if(functionType->__anon1.__anon2.returnType)
+functionType->__anon1.__anon2.returnType->refCount++;
+if(!functionType->refCount)
+FreeType(functionType);
+}
+if(exp->__anon1.call.arguments)
+{
+for(e = (*exp->__anon1.call.arguments).first; e; e = e->next)
+ProcessExpressionType(e);
}
+break;
}
+case 8:
+{
+struct Type * type;
+struct Location oldyylloc = yylloc;
+unsigned int thisPtr;
+struct Expression * checkExp = exp->__anon1.member.exp;
+
+while(checkExp)
+{
+if(checkExp->type == 11)
+checkExp = checkExp->__anon1.cast.exp;
+else if(checkExp->type == 5)
+checkExp = checkExp->__anon1.list ? (*checkExp->__anon1.list).first : (((void *)0));
+else
+break;
}
+thisPtr = (checkExp && checkExp->type == 0 && !strcmp(checkExp->__anon1.__anon1.identifier->string, "this"));
+exp->thisPtr = thisPtr;
+if(exp->__anon1.member.member && exp->__anon1.member.member->_class && exp->__anon1.member.member->_class->__anon1.__anon1.name)
+{
+exp->__anon1.member.member->classSym = exp->__anon1.member.member->_class->__anon1.__anon1.symbol;
}
-else if(unresolved)
+ProcessExpressionType(exp->__anon1.member.exp);
+if(exp->__anon1.member.exp->expType && exp->__anon1.member.exp->expType->kind == 8 && exp->__anon1.member.exp->expType->__anon1._class && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered->type == 0)
{
-if(exp->__anon1.__anon1.identifier->_class && exp->__anon1.__anon1.identifier->_class->__anon1.__anon1.name)
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s::%s\n", (((void *)0))), exp->__anon1.__anon1.identifier->_class->__anon1.__anon1.name, exp->__anon1.__anon1.identifier->string);
-else if(exp->__anon1.__anon1.identifier->string && exp->__anon1.__anon1.identifier->string[0])
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s\n", (((void *)0))), exp->__anon1.__anon1.identifier->string);
+exp->isConstant = 0;
}
-else if(!exp->expType && exp->type != 16)
+else
+exp->isConstant = exp->__anon1.member.exp->isConstant;
+type = exp->__anon1.member.exp->expType;
+yylloc = exp->loc;
+if(type && (type->kind == 20))
{
-char expString[10240];
+struct __ecereNameSpace__ecere__com__Class * _class = thisClass ? thisClass : currentClass;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param = (((void *)0));
-expString[0] = '\0';
-if(inCompiler)
+if(_class)
{
-PrintExpression(exp, expString);
-__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+for(param = _class->templateParams.first; param; param = param->next)
+{
+if(param->type == 1 && exp->__anon1.member.member && exp->__anon1.member.member->string && !strcmp(param->name, exp->__anon1.member.member->string))
+break;
}
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
}
-if(inCompiler)
-ApplyAnyObjectLogic(exp);
-if(!notByReference && exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 5 && (!exp->destType || (exp->destType->kind != 3 && exp->destType->kind != 4 && exp->destType->kind != 22 && exp->destType->kind != 23 && exp->destType->kind != 5 && exp->destType->kind != 2 && exp->destType->kind != 1 && exp->destType->kind != 24)))
+if(param && param->defaultArg.__anon1.__anon2.__anon1.member)
+{
+struct Expression * argExp = GetTemplateArgExpByName(param->name, thisClass, 1);
+
+if(argExp)
+{
+struct Expression * expMember = exp->__anon1.member.exp;
+struct Declarator * decl;
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+char thisClassTypeString[1024];
+
+FreeIdentifier(exp->__anon1.member.member);
+ProcessExpressionType(argExp);
+{
+char * colon = strstr(param->defaultArg.__anon1.__anon2.memberString, "::");
+
+if(colon)
{
-exp->byReference = 0x1;
+memcpy(thisClassTypeString, param->defaultArg.__anon1.__anon2.memberString, colon - param->defaultArg.__anon1.__anon2.memberString);
+thisClassTypeString[colon - param->defaultArg.__anon1.__anon2.memberString] = '\0';
}
-yylloc = oldyylloc;
+else
+strcpy(thisClassTypeString, _class->fullName);
}
+decl = SpecDeclFromString(param->defaultArg.__anon1.__anon2.__anon1.member->dataTypeString, specs, (((void *)0)));
+exp->expType = ProcessType(specs, decl);
+if(exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->templateClass)
+{
+struct __ecereNameSpace__ecere__com__Class * expClass = exp->expType->__anon1._class->__anon1.registered;
+struct __ecereNameSpace__ecere__com__Class * cClass = (((void *)0));
+int paramCount = 0;
+int lastParam = -1;
+char templateString[1024];
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-static void FindNextDataMember(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos)
+sprintf(templateString, "%s<", expClass->templateClass->fullName);
+for(cClass = expClass; cClass; cClass = cClass->base)
{
-if(*curMember)
+int p = 0;
+
+for(param = cClass->templateParams.first; param; param = param->next)
{
-*curMember = (*curMember)->next;
-if(subMemberStackPos && *subMemberStackPos > 0 && subMemberStack[*subMemberStackPos - 1]->type == 1)
+int id = p;
+struct __ecereNameSpace__ecere__com__Class * sClass;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg;
+
+for(sClass = cClass->base; sClass; sClass = sClass->base)
+id += sClass->templateParams.count;
+arg = expClass->templateArgs[id];
+for(sClass = _class; sClass; sClass = sClass->base)
{
-*curMember = subMemberStack[--(*subMemberStackPos)];
-*curMember = (*curMember)->next;
-}
-while((*curMember) && (*curMember)->isProperty)
-*curMember = (*curMember)->next;
-if(subMemberStackPos)
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * cParam;
+int p = 0;
+struct __ecereNameSpace__ecere__com__Class * nextClass;
+
+for(nextClass = sClass->base; nextClass; nextClass = nextClass->base)
+p += nextClass->templateParams.count;
+for(cParam = sClass->templateParams.first; cParam; cParam = cParam->next, p++)
{
-while((*curMember) && !(*curMember)->isProperty && !(*curMember)->name && ((*curMember)->type == 2 || (*curMember)->type == 1))
+if(cParam->type == 0 && arg.__anon1.__anon1.dataTypeString && !strcmp(cParam->name, arg.__anon1.__anon1.dataTypeString))
{
-subMemberStack[(*subMemberStackPos)++] = *curMember;
-*curMember = (*curMember)->members.first;
-while(*curMember && (*curMember)->isProperty)
-*curMember = (*curMember)->next;
+if(_class->templateArgs && arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
+{
+arg.__anon1.__anon1.dataTypeString = _class->templateArgs[p].__anon1.__anon1.dataTypeString;
+arg.__anon1.__anon1.dataTypeClass = _class->templateArgs[p].__anon1.__anon1.dataTypeClass;
+break;
+}
}
}
}
-while(!*curMember)
{
-if(!*curMember)
+char argument[256];
+
+argument[0] = '\0';
+switch(param->type)
{
-if(subMemberStackPos && *subMemberStackPos)
+case 2:
{
-*curMember = subMemberStack[--(*subMemberStackPos)];
-*curMember = (*curMember)->next;
+char expString[1024];
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
+struct Expression * exp;
+char * string = PrintHexUInt64(arg.__anon1.expression.__anon1.ui64);
+
+exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
+(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
+ProcessExpressionType(exp);
+ComputeExpression(exp);
+expString[0] = '\0';
+PrintExpression(exp, expString);
+strcat(argument, expString);
+FreeExpression(exp);
+break;
}
-else
+case 1:
{
-struct __ecereNameSpace__ecere__com__Class * lastCurClass = *curClass;
-
-if(*curClass == _class)
+strcat(argument, arg.__anon1.__anon2.__anon1.member->name);
break;
-for(*curClass = _class; (*curClass)->base != lastCurClass && (*curClass)->base->type != 1000; *curClass = (*curClass)->base)
-;
-*curMember = (*curClass)->membersAndProperties.first;
}
-while((*curMember) && (*curMember)->isProperty)
-*curMember = (*curMember)->next;
-if(subMemberStackPos)
+case 0:
{
-while((*curMember) && !(*curMember)->isProperty && !(*curMember)->name && ((*curMember)->type == 2 || (*curMember)->type == 1))
+if(arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
{
-subMemberStack[(*subMemberStackPos)++] = *curMember;
-*curMember = (*curMember)->members.first;
-while(*curMember && (*curMember)->isProperty)
-*curMember = (*curMember)->next;
-}
-}
+if(!strcmp(arg.__anon1.__anon1.dataTypeString, "thisclass"))
+strcat(argument, thisClassTypeString);
+else
+strcat(argument, arg.__anon1.__anon1.dataTypeString);
}
+break;
}
}
-
-static void ProcessInitializer(struct Initializer * init, struct Type * type)
-{
-switch(init->type)
-{
-case 0:
-if(!init->__anon1.exp || init->__anon1.exp->type != 1 || !init->__anon1.exp->__anon1.instance || init->__anon1.exp->__anon1.instance->_class || !type || type->kind == 8)
+if(argument[0])
{
-if(init->__anon1.exp && !init->__anon1.exp->destType)
+if(paramCount)
+strcat(templateString, ", ");
+if(lastParam != p - 1)
{
-FreeType(init->__anon1.exp->destType);
-init->__anon1.exp->destType = type;
-if(type)
-type->refCount++;
+strcat(templateString, param->name);
+strcat(templateString, " = ");
+}
+strcat(templateString, argument);
+paramCount++;
+lastParam = p;
+}
+p++;
}
-if(init->__anon1.exp)
-{
-ProcessExpressionType(init->__anon1.exp);
-init->isConstant = init->__anon1.exp->isConstant;
}
-break;
}
-else
{
-struct Expression * exp = init->__anon1.exp;
-struct Instantiation * inst = exp->__anon1.instance;
-struct MembersInit * members;
+int len = strlen(templateString);
-init->type = 1;
-init->__anon1.list = MkList();
-if(inst->members)
-{
-for(members = (*inst->members).first; members; members = members->next)
-{
-if(members->type == 0)
+if(templateString[len - 1] == '>')
+templateString[len++] = ' ';
+templateString[len++] = '>';
+templateString[len++] = '\0';
+}
{
-struct MemberInit * member;
+struct Context * context = SetupTemplatesContext(_class);
-for(member = (*members->__anon1.dataMembers).first; member; member = member->next)
-{
-ListAdd(init->__anon1.list, member->initializer);
-member->initializer = (((void *)0));
+FreeType(exp->expType);
+exp->expType = ProcessTypeString(templateString, 0);
+FinishTemplatesContext(context);
}
}
+if(!__ecereProp_Type_Get_isPointerType(expMember->expType))
+expMember = MkExpCast(MkTypeName(MkListOne(MkSpecifierName("uintptr")), (((void *)0))), expMember);
+exp->type = 5;
+exp->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), MkExpBrackets(MkListOne(MkExpOp(MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), expMember))), '+', MkExpOp(MkExpMember(MkExpMember(argExp, MkIdentifier("member")), MkIdentifier("offset")), '+', MkExpMember(MkExpMember(MkExpMember(CopyExpression(argExp), MkIdentifier("member")), MkIdentifier("_class")), MkIdentifier("offset")))))))));
}
}
-FreeExpression(exp);
+else if(type->__anon1.templateParameter && type->__anon1.templateParameter->type == 0 && (type->__anon1.templateParameter->__anon1.dataType || type->__anon1.templateParameter->dataTypeString))
+{
+type = ProcessTemplateParameterType(type->__anon1.templateParameter);
}
-case 1:
+}
+if(type && (type->kind == 20))
+;
+else if(type && (type->kind == 8 || type->kind == 19 || type->kind == 3 || type->kind == 15 || type->kind == 4 || type->kind == 2 || type->kind == 5 || type->kind == 1 || type->kind == 24 || type->kind == 22 || type->kind == 23 || type->kind == 6 || type->kind == 7 || (type->kind == 13 && type->__anon1.type->kind == 1)))
{
-struct Initializer * i;
-struct Type * initializerType = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256];
-int subMemberStackPos = 0;
+struct Identifier * id = exp->__anon1.member.member;
+int typeKind = type->kind;
+struct __ecereNameSpace__ecere__com__Class * _class = (id && (!id->_class || id->_class->__anon1.__anon1.name)) ? (id->classSym ? id->classSym->__anon1.registered : (type->__anon1._class ? type->__anon1._class->__anon1.registered : (((void *)0)))) : (((void *)0));
-if(type && type->kind == 12)
-initializerType = Dereference(type);
-else if(type && (type->kind == 9 || type->kind == 10))
-initializerType = type->__anon1.__anon1.members.first;
-for(i = (*init->__anon1.list).first; i; i = i->next)
+if(typeKind == 19 && exp->__anon1.member.exp->type == 24)
{
-if(type && type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::com::Class");
+typeKind = 8;
+}
+if(id)
{
-FindNextDataMember(type->__anon1._class->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos);
-if(curMember)
+if(typeKind == 3 || typeKind == 15)
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "int");
+else if(!_class)
{
-if(!curMember->dataType)
-curMember->dataType = ProcessTypeString(curMember->dataTypeString, 0x0);
-initializerType = curMember->dataType;
-}
+if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered)
+{
+_class = type->__anon1._class->__anon1.registered;
}
-ProcessInitializer(i, initializerType);
-if(initializerType && type && (type->kind == 9 || type->kind == 10))
-initializerType = initializerType->next;
-if(!i->isConstant)
-init->isConstant = 0x0;
+else if((type->kind == 12 || type->kind == 13) && type->__anon1.type && type->__anon1.type->kind == 1)
+{
+_class = FindClass("char *")->__anon1.registered;
}
-if(type && type->kind == 12)
-FreeType(initializerType);
-if(type && type->kind != 12 && type->kind != 9 && type->kind != 10 && (type->kind != 8 || !type->__anon1._class->__anon1.registered || type->__anon1._class->__anon1.registered->type != 1))
+else if(type->kind == 13)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Assigning list initializer to non list\n", (((void *)0))));
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr");
+FreeType(exp->expType);
+exp->expType = ProcessTypeString("uintptr", 0);
+exp->byReference = 1;
}
-break;
+else
+{
+char string[1024] = "";
+struct Symbol * classSym;
+
+PrintTypeNoConst(type, string, 0, 1);
+classSym = FindClass(string);
+if(classSym)
+_class = classSym->__anon1.registered;
}
}
}
-
-extern struct Symbol * FindType(struct Context * ctx, const char * name);
-
-static void ProcessClass(struct __ecereNameSpace__ecere__sys__OldList * definitions, struct Symbol * symbol);
-
-static void ProcessSpecifier(struct Specifier * spec, unsigned int declareStruct)
-{
-switch(spec->type)
-{
-case 0:
+if(_class && id)
{
-if(spec->__anon1.specifier == THISCLASS)
+struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0));
+struct __ecereNameSpace__ecere__com__Method * method = (((void *)0));
+struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
+struct __ecereNameSpace__ecere__com__Property * revConvert = (((void *)0));
+struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0));
+
+if(id && id->_class && id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property"))
+exp->__anon1.member.memberType = 1;
+if(id && id->_class && type->__anon1._class && !__ecereNameSpace__ecere__com__eClass_IsDerived(type->__anon1._class->__anon1.registered, _class))
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "invalid class specifier %s for object of class %s\n", (((void *)0))), _class->fullName, type->__anon1._class->string);
+if(typeKind != 19)
{
-if(thisClass)
+if((exp->__anon1.member.memberType == 0 && thisPtr) || exp->__anon1.member.memberType == 3)
{
-spec->type = 1;
-spec->__anon1.__anon1.name = ReplaceThisClass(thisClass);
-spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name);
-ProcessSpecifier(spec, declareStruct);
-}
+member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)));
+if(member && member->_class != (_class->templateClass ? _class->templateClass : _class) && exp->__anon1.member.memberType != 3)
+{
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
+if(prop)
+member = (((void *)0));
}
-break;
+if(!member && !prop)
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
+if((member && member->_class == (_class->templateClass ? _class->templateClass : _class)) || (prop && prop->_class == (_class->templateClass ? _class->templateClass : _class)))
+exp->__anon1.member.thisPtr = 1;
}
-case 1:
+else
{
-struct Symbol * symbol = FindType(curContext, spec->__anon1.__anon1.name);
+unsigned int useMemberForNonConst = 0;
-if(symbol)
-DeclareType(symbol->type, 0x1, 0x1);
-else if((symbol = spec->__anon1.__anon1.symbol) && symbol->__anon1.registered && symbol->__anon1.registered->type == 1 && declareStruct)
-DeclareStruct(spec->__anon1.__anon1.name, 0x0);
-break;
-}
-case 2:
+if(!id->classSym)
{
-struct Enumerator * e;
-
-if(spec->__anon1.__anon2.list)
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, (((void *)0)));
+useMemberForNonConst = prop && exp->destType && ((exp->destType->kind == 8 && !exp->destType->constant) || ((exp->destType->kind == 13 || exp->destType->kind == 12) && exp->destType->__anon1.type && !exp->destType->__anon1.type->constant)) && !strncmp(prop->dataTypeString, "const ", 6);
+if(useMemberForNonConst || !id->_class || !id->_class->__anon1.__anon1.name || strcmp(id->_class->__anon1.__anon1.name, "property"))
+member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, (((void *)0)), (((void *)0)), (((void *)0)));
+}
+if((!prop || useMemberForNonConst) && !member)
{
-for(e = (*spec->__anon1.__anon2.list).first; e; e = e->next)
+method = useMemberForNonConst ? (((void *)0)) : __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, (((void *)0)));
+if(!method)
{
-if(e->exp)
-ProcessExpressionType(e->exp);
-}
+prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule);
+useMemberForNonConst |= prop && exp->destType && ((exp->destType->kind == 8 && !exp->destType->constant) || ((exp->destType->kind == 13 || exp->destType->kind == 12) && exp->destType->__anon1.type && !exp->destType->__anon1.type->constant)) && !strncmp(prop->dataTypeString, "const ", 6);
+if(useMemberForNonConst || !id->_class || !id->_class->__anon1.__anon1.name || strcmp(id->_class->__anon1.__anon1.name, "property"))
+member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0)));
}
-break;
}
-case 3:
-case 4:
-{
-if(spec->__anon1.__anon2.definitions)
+if(member && prop)
{
-struct Symbol * symbol = spec->__anon1.__anon2.id ? FindClass(spec->__anon1.__anon2.id->string) : (((void *)0));
-
-ProcessClass(spec->__anon1.__anon2.definitions, symbol);
-}
-break;
+if(useMemberForNonConst || (member->_class != prop->_class && !id->_class && __ecereNameSpace__ecere__com__eClass_IsDerived(member->_class, prop->_class)))
+prop = (((void *)0));
+else
+member = (((void *)0));
}
}
}
-
-static void ProcessDeclarator(struct Declarator * decl)
+if(!prop && !member && !method)
+method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule);
+if(!prop && !member && !method)
{
-switch(decl->type)
+if(typeKind == 19)
{
-case 1:
-if(decl->__anon1.identifier->classSym)
+classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(type->__anon1._class->__anon1.registered, exp->__anon1.member.member->string);
+if(classProp)
{
-FreeSpecifier(decl->__anon1.identifier->_class);
-decl->__anon1.identifier->_class = (((void *)0));
+exp->__anon1.member.memberType = 5;
+exp->expType = ProcessTypeString(classProp->dataTypeString, 0);
}
-break;
-case 3:
-if(decl->__anon1.array.exp)
-ProcessExpressionType(decl->__anon1.array.exp);
-case 0:
-case 2:
-case 4:
-case 5:
-case 6:
-case 7:
-if(decl->declarator)
-ProcessDeclarator(decl->declarator);
-if(decl->type == 4)
-{
-struct Identifier * id = GetDeclId(decl);
-
-if(id && id->_class)
+else
{
-struct TypeName * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), param->qualifiers = MkListOne(id->_class), param->declarator = (((void *)0)), param);
+char structName[1024];
+struct Identifier * id = exp->__anon1.member.member;
+struct Expression * classExp = exp->__anon1.member.exp;
-if(!decl->__anon1.function.parameters)
-decl->__anon1.function.parameters = MkList();
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*decl->__anon1.function.parameters), (((void *)0)), param);
-id->_class = (((void *)0));
+type->refCount++;
+FreeType(classExp->expType);
+classExp->expType = ProcessTypeString("ecere::com::Class", 0);
+strcpy(structName, "__ecereClassData_");
+FullClassNameCat(structName, type->__anon1._class->string, 0);
+exp->type = 9;
+exp->__anon1.member.member = id;
+exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpMember(classExp, MkIdentifier("data"))), '+', MkExpMember(MkExpClass(MkListOne(MkSpecifierName(type->__anon1._class->string)), (((void *)0))), MkIdentifier("offsetClass"))))))));
+FreeType(type);
+ProcessExpressionType(exp);
+return ;
}
-if(decl->__anon1.function.parameters)
+}
+else
{
-struct TypeName * param;
+struct Symbol * classSym = FindClass(id->string);
-for(param = (*decl->__anon1.function.parameters).first; param; param = param->next)
-{
-if(param->qualifiers && (*param->qualifiers).first)
+if(classSym)
{
-struct Specifier * spec = (*param->qualifiers).first;
+struct __ecereNameSpace__ecere__com__Class * convertClass = classSym->__anon1.registered;
-if(spec && spec->__anon1.specifier == TYPED_OBJECT)
+if(convertClass)
+revConvert = __ecereNameSpace__ecere__com__eClass_FindProperty(convertClass, _class->fullName, privateModule);
+}
+}
+}
+if(exp->__anon1.member.exp->destType)
+FreeType(exp->__anon1.member.exp->destType);
{
-struct Declarator * d = param->declarator;
-struct TypeName * newParam = (newParam = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), newParam->qualifiers = MkListOne(MkSpecifier(VOID)), newParam->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d), newParam);
+if(method && !method->_class->symbol)
+method->_class->symbol = FindClass(method->_class->fullName);
+if(prop && !prop->_class->symbol)
+prop->_class->symbol = FindClass(prop->_class->fullName);
+exp->__anon1.member.exp->destType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-if(d->type != 5)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*newParam->qualifiers), (((void *)0)), MkSpecifier(CONST));
-FreeList(param->qualifiers, FreeSpecifier);
-param->qualifiers = MkListOne(MkStructOrUnion(3, MkIdentifier("__ecereNameSpace__ecere__com__Class"), (((void *)0))));
-param->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier("class")));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*decl->__anon1.function.parameters), param, newParam);
-param = newParam;
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 8, __ecereInstance1->__anon1._class = prop ? prop->_class->symbol : method ? method->_class->symbol : _class->symbol, __ecereInstance1->thisClassFrom = type ? type->thisClassFrom : (((void *)0)), __ecereInstance1;
+});
}
-else if(spec && spec->__anon1.specifier == ANY_OBJECT)
+if(prop)
{
-struct Declarator * d = param->declarator;
+exp->__anon1.member.memberType = 1;
+if(!prop->dataType)
+ProcessPropertyType(prop);
+exp->expType = prop->dataType;
+if(!strcmp(_class->base->fullName, "eda::Row") && !exp->expType->constant && !exp->destType)
+{
+struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-FreeList(param->qualifiers, FreeSpecifier);
-param->qualifiers = MkListOne(MkSpecifier(VOID));
-if(d->type != 5)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*param->qualifiers), (((void *)0)), MkSpecifier(CONST));
-param->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), d);
+CopyTypeInto(type, exp->expType);
+type->refCount = 1;
+type->constant = 1;
+exp->expType = type;
}
-else if(spec->__anon1.specifier == THISCLASS)
+else if(prop->dataType)
+prop->dataType->refCount++;
+}
+else if(member)
{
-if(thisClass)
+if(exp->__anon1.member.exp->expType->classObjectType == 2 && !strcmp(exp->__anon1.member.member->string, "_class"))
{
-spec->type = 1;
-spec->__anon1.__anon1.name = ReplaceThisClass(thisClass);
-spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name);
-ProcessSpecifier(spec, 0x0);
+FreeExpContents(exp);
+exp->type = 0;
+exp->__anon1.__anon1.identifier = MkIdentifier("class");
+ProcessExpressionType(exp);
+return ;
}
+exp->__anon1.member.memberType = 3;
+DeclareStruct(curExternal, _class->fullName, 0, 1);
+if(member->_class != _class)
+DeclareStruct(curExternal, member->_class->fullName, 0, 1);
+if(!member->dataType)
+{
+struct Context * context = SetupTemplatesContext(_class);
+
+member->dataType = ProcessTypeString(member->dataTypeString, 0);
+FinishTemplatesContext(context);
}
+if(exp->__anon1.member.exp->expType->kind == 8 && exp->__anon1.member.exp->expType->__anon1._class && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered->type == 2)
+member->dataType->bitMemberSize = ((struct __ecereNameSpace__ecere__com__BitMember *)member)->size;
+exp->expType = member->dataType;
+if(member->dataType)
+member->dataType->refCount++;
}
-if(param->declarator)
-ProcessDeclarator(param->declarator);
+else if(revConvert)
+{
+exp->__anon1.member.memberType = 4;
+exp->expType = MkClassType(revConvert->_class->fullName);
}
+else if(method)
+{
+{
+exp->__anon1.member.memberType = 2;
}
+if(!method->dataType)
+ProcessMethodType(method);
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 16, __ecereInstance1->__anon1.__anon3.method = method, __ecereInstance1;
+});
+exp->expType->__anon1.__anon3.methodClass = (id && id->_class) ? _class : (((void *)0));
+exp->expType->__anon1.__anon3.usedClass = _class;
}
-break;
+else if(!classProp)
+{
+if(exp->__anon1.member.exp->expType->classObjectType == 2 && !strcmp(exp->__anon1.member.member->string, "_class"))
+{
+FreeExpContents(exp);
+exp->type = 0;
+exp->__anon1.__anon1.identifier = MkIdentifier("class");
+FreeType(exp->expType);
+exp->expType = MkClassType("ecere::com::Class");
+return ;
}
+yylloc = exp->__anon1.member.member->loc;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find member %s in class %s\n", (((void *)0))), id->string, _class->fullName);
+if(inCompiler)
+__ecereNameSpace__ecere__com__eClass_AddDataMember(_class, id->string, "int", 0, 0, 1);
}
+if(_class && exp->expType)
+{
+struct __ecereNameSpace__ecere__com__Class * tClass;
-extern struct Identifier * CopyIdentifier(struct Identifier * id);
-
-extern void FreeInitDeclarator(struct InitDeclarator * decl);
+tClass = type->__anon1._class && type->__anon1._class->__anon1.registered ? type->__anon1._class->__anon1.registered : _class;
+while(tClass && !tClass->templateClass)
+tClass = tClass->base;
+if(tClass && exp->expType->kind == 20 && exp->expType->__anon1.templateParameter->type == 0)
+{
+int id = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * sClass;
-static void ProcessDeclaration(struct Declaration * decl)
+for(sClass = tClass; sClass; sClass = sClass->base)
{
-yylloc = decl->loc;
-switch(decl->type)
+id = 0;
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
{
-case 1:
+if(curParam->type == 0 && !strcmp(exp->expType->__anon1.templateParameter->identifier->string, curParam->name))
{
-unsigned int declareStruct = 0x0;
-
-if(decl->__anon1.__anon1.declarators)
+for(sClass = sClass->base; sClass; sClass = sClass->base)
+id += sClass->templateParams.count;
+break;
+}
+id++;
+}
+if(curParam)
+break;
+}
+if(curParam && tClass->templateArgs[id].__anon1.__anon1.dataTypeString)
{
-struct InitDeclarator * d;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = tClass->templateArgs[id];
+struct Context * context = SetupTemplatesContext(tClass);
+unsigned int constant = exp->expType->constant;
+unsigned int passAsTemplate = 0;
+struct __ecereNameSpace__ecere__com__Class * thisClassFrom = (((void *)0));
+struct Type * t = ProcessTypeString(exp->expType->__anon1.templateParameter->dataTypeString, 0);
-for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
+if(t && t->kind == 8 && t->__anon1._class)
+thisClassFrom = t->__anon1._class->__anon1.registered;
+else
+thisClassFrom = __ecereNameSpace__ecere__com__eSystem_FindClass(GetPrivateModule(), "class");
+FreeType(t);
+passAsTemplate = tClass->templateClass && (exp->expType->kind != 20 || (!exp->expType->__anon1.templateParameter || (!exp->expType->__anon1.templateParameter->dataTypeString && !exp->expType->__anon1.templateParameter->__anon1.dataType)));
+FreeType(exp->expType);
+exp->expType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0);
+exp->expType->thisClassFrom = thisClassFrom;
+if(exp->expType->kind == 8 && constant)
+exp->expType->constant = 1;
+else if(exp->expType->kind == 13)
{
-struct Type * type, * subType;
+struct Type * t = exp->expType->__anon1.type;
-ProcessDeclarator(d->declarator);
-type = ProcessType(decl->__anon1.__anon1.specifiers, d->declarator);
-if(d->initializer)
+while(t->kind == 13)
+t = t->__anon1.type;
+if(constant)
+t->constant = constant;
+}
+if(exp->expType)
{
-ProcessInitializer(d->initializer, type);
-if((*decl->__anon1.__anon1.declarators).count == 1 && d->initializer->type == 0 && d->initializer->__anon1.exp->type == 1)
+if(exp->expType->kind == 21)
+{
+FreeType(exp->expType);
+exp->expType = ReplaceThisClassType(_class);
+}
+if(passAsTemplate)
+exp->expType->passAsTemplate = 1;
+if(!exp->destType)
{
-if(type->kind == 8 && type->__anon1._class == d->initializer->__anon1.exp->expType->__anon1._class)
+exp->destType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0);
+if(exp->destType->kind == 8 && constant)
+exp->destType->constant = 1;
+else if(exp->destType->kind == 13)
{
-struct Instantiation * inst = d->initializer->__anon1.exp->__anon1.instance;
+struct Type * t = exp->destType->__anon1.type;
-inst->exp = MkExpIdentifier(CopyIdentifier(GetDeclId(d->declarator)));
-d->initializer->__anon1.exp->__anon1.instance = (((void *)0));
-if(decl->__anon1.__anon1.specifiers)
-FreeList(decl->__anon1.__anon1.specifiers, FreeSpecifier);
-FreeList(decl->__anon1.__anon1.declarators, FreeInitDeclarator);
-d = (((void *)0));
-decl->type = 2;
-decl->__anon1.inst = inst;
-}
-}
+while(t->kind == 13)
+t = t->__anon1.type;
+if(constant)
+t->constant = constant;
}
-for(subType = type; subType; )
-{
-if(subType->kind == 8)
+if(exp->destType->kind == 21)
{
-declareStruct = 0x1;
-break;
+FreeType(exp->destType);
+exp->destType = ReplaceThisClassType(_class);
}
-else if(subType->kind == 13)
-break;
-else if(subType->kind == 12)
-subType = subType->__anon1.__anon4.arrayType;
-else
-break;
}
-FreeType(type);
-if(!d)
-break;
+}
+FinishTemplatesContext(context);
}
}
-if(decl->__anon1.__anon1.specifiers)
+else if(tClass && exp->expType->kind == 13 && exp->expType->__anon1.type && exp->expType->__anon1.type->kind == 20 && exp->expType->__anon1.type->__anon1.templateParameter->type == 0)
{
-struct Specifier * s;
+int id = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * sClass;
-for(s = (*decl->__anon1.__anon1.specifiers).first; s; s = s->next)
+for(sClass = tClass; sClass; sClass = sClass->base)
{
-ProcessSpecifier(s, declareStruct);
-}
-}
+id = 0;
+if(sClass->templateClass)
+sClass = sClass->templateClass;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+{
+if(curParam->type == 0 && !strcmp(exp->expType->__anon1.type->__anon1.templateParameter->identifier->string, curParam->name))
+{
+for(sClass = sClass->base; sClass; sClass = sClass->base)
+id += sClass->templateParams.count;
break;
}
-case 2:
-{
-ProcessInstantiationType(decl->__anon1.inst);
+id++;
+}
+if(curParam)
break;
}
-case 0:
+if(curParam)
{
-struct Specifier * spec;
-struct Declarator * d;
-unsigned int declareStruct = 0x0;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = tClass->templateArgs[id];
+struct Context * context = SetupTemplatesContext(tClass);
+struct Type * basicType;
-if(decl->__anon1.__anon1.declarators)
+basicType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0);
+if(basicType)
{
-for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
+if(basicType->kind == 21)
{
-struct Type * type = ProcessType(decl->__anon1.__anon1.specifiers, d->declarator);
-struct Type * subType;
+FreeType(basicType);
+basicType = ReplaceThisClassType(_class);
+}
+FreeType(exp->expType);
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-ProcessDeclarator(d);
-for(subType = type; subType; )
-{
-if(subType->kind == 8)
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = basicType, __ecereInstance1;
+});
+if(!exp->destType)
{
-declareStruct = 0x1;
-break;
-}
-else if(subType->kind == 13)
-break;
-else if(subType->kind == 12)
-subType = subType->__anon1.__anon4.arrayType;
-else
-break;
-}
-FreeType(type);
-}
+exp->destType = exp->expType;
+exp->destType->refCount++;
}
-if(decl->__anon1.__anon1.specifiers)
{
-for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
-ProcessSpecifier(spec, declareStruct);
+struct Expression * newExp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl;
+
+decl = SpecDeclFromString(arg.__anon1.__anon1.dataTypeString, specs, (((void *)0)));
+*newExp = *exp;
+if(exp->destType)
+exp->destType->refCount++;
+if(exp->expType)
+exp->expType->refCount++;
+exp->type = 11;
+exp->__anon1.cast.typeName = MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl));
+exp->__anon1.cast.exp = newExp;
}
-break;
}
+FinishTemplatesContext(context);
}
}
+else if(tClass && exp->expType->kind == 8 && exp->expType->__anon1._class && strchr(exp->expType->__anon1._class->string, '<'))
+{
+struct __ecereNameSpace__ecere__com__Class * expClass = exp->expType->__anon1._class->__anon1.registered;
-static struct FunctionDefinition * curFunction;
+if(expClass)
+{
+struct __ecereNameSpace__ecere__com__Class * cClass = (((void *)0));
+int p = 0;
+int paramCount = 0;
+int lastParam = -1;
+char templateString[1024];
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param;
-static void CreateFireWatcher(struct __ecereNameSpace__ecere__com__Property * prop, struct Expression * object, struct Statement * stmt)
+sprintf(templateString, "%s<", expClass->templateClass->fullName);
+while(cClass != expClass)
{
-char propName[1024], propNameM[1024];
-char getName[1024], setName[1024];
-struct __ecereNameSpace__ecere__sys__OldList * args;
+struct __ecereNameSpace__ecere__com__Class * sClass;
-DeclareProperty(prop, setName, getName);
-strcpy(propName, "__ecereProp_");
-FullClassNameCat(propName, prop->_class->fullName, 0x0);
-strcat(propName, "_");
-FullClassNameCat(propName, prop->name, 0x1);
-strcpy(propNameM, "__ecerePropM_");
-FullClassNameCat(propNameM, prop->_class->fullName, 0x0);
-strcat(propNameM, "_");
-FullClassNameCat(propNameM, prop->name, 0x1);
-if(prop->isWatchable)
+for(sClass = expClass; sClass && sClass->base != cClass; sClass = sClass->base)
+;
+cClass = sClass;
+for(param = cClass->templateParams.first; param; param = param->next)
{
-args = MkList();
-ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireWatchers")), args));
-args = MkList();
-ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM)));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireWatchers")), args));
-}
+struct __ecereNameSpace__ecere__com__Class * cClassCur = (((void *)0));
+int cp = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * paramCur = (((void *)0));
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg;
+
+while(cClassCur != tClass && !paramCur)
{
-args = MkList();
-ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args));
-args = MkList();
-ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM)));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args));
+struct __ecereNameSpace__ecere__com__Class * sClassCur;
+
+for(sClassCur = tClass; sClassCur && sClassCur->base != cClassCur; sClassCur = sClassCur->base)
+;
+cClassCur = sClassCur;
+for(paramCur = cClassCur->templateParams.first; paramCur; paramCur = paramCur->next)
+{
+if(!strcmp(paramCur->name, param->name))
+{
+break;
}
-if(curFunction->propSet && !strcmp(curFunction->propSet->string, prop->name) && (!object || (object->type == 0 && !strcmp(object->__anon1.__anon1.identifier->string, "this"))))
-curFunction->propSet->fireWatchersDone = 0x1;
+cp++;
}
+}
+if(paramCur && paramCur->type == 0)
+arg = tClass->templateArgs[cp];
+else
+arg = expClass->templateArgs[p];
+{
+char argument[256];
-extern struct Declaration * MkDeclarationInst(struct Instantiation * inst);
-
-extern struct Instantiation * MkInstantiationNamed(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members);
-
-extern struct Statement * MkIfStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement, struct Statement * elseStmt);
-
-extern struct Statement * MkForStmt(struct Statement * init, struct Statement * check, struct __ecereNameSpace__ecere__sys__OldList * inc, struct Statement * statement);
-
-extern struct Statement * MkWhileStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement);
-
-extern struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList);
-
-extern void ProcessClassFunctionBody(struct ClassFunction * func, struct Statement * body);
-
-extern void FreePropertyWatch(struct PropertyWatch * watcher);
-
-static void ProcessStatement(struct Statement * stmt)
+argument[0] = '\0';
+switch(param->type)
{
-yylloc = stmt->loc;
-switch(stmt->type)
+case 2:
{
-case 0:
-ProcessStatement(stmt->__anon1.labeled.stmt);
+char expString[1024];
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl = SpecDeclFromString(param->__anon1.dataTypeString, specs, (((void *)0)));
+struct Expression * exp;
+char * string = PrintHexUInt64(arg.__anon1.expression.__anon1.ui64);
+
+exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
+(__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0);
+ProcessExpressionType(exp);
+ComputeExpression(exp);
+expString[0] = '\0';
+PrintExpression(exp, expString);
+strcat(argument, expString);
+FreeExpression(exp);
break;
+}
case 1:
-if(stmt->__anon1.caseStmt.exp)
{
-FreeType(stmt->__anon1.caseStmt.exp->destType);
-stmt->__anon1.caseStmt.exp->destType = curSwitchType;
-if(curSwitchType)
-curSwitchType->refCount++;
-ProcessExpressionType(stmt->__anon1.caseStmt.exp);
-ComputeExpression(stmt->__anon1.caseStmt.exp);
+strcat(argument, arg.__anon1.__anon2.__anon1.member->name);
+break;
}
-if(stmt->__anon1.caseStmt.stmt)
-ProcessStatement(stmt->__anon1.caseStmt.stmt);
+case 0:
+{
+if(arg.__anon1.__anon1.dataTypeString && (!param->defaultArg.__anon1.__anon1.dataTypeString || strcmp(arg.__anon1.__anon1.dataTypeString, param->defaultArg.__anon1.__anon1.dataTypeString)))
+strcat(argument, arg.__anon1.__anon1.dataTypeString);
break;
-case 2:
+}
+}
+if(argument[0])
{
-if(stmt->__anon1.compound.context)
+if(paramCount)
+strcat(templateString, ", ");
+if(lastParam != p - 1)
+{
+strcat(templateString, param->name);
+strcat(templateString, " = ");
+}
+strcat(templateString, argument);
+paramCount++;
+lastParam = p;
+}
+}
+p++;
+}
+}
{
-struct Declaration * decl;
-struct Statement * s;
-struct Statement * prevCompound = curCompound;
-struct Context * prevContext = curContext;
+int len = strlen(templateString);
-if(!stmt->__anon1.compound.isSwitch)
-curCompound = stmt;
-curContext = stmt->__anon1.compound.context;
-if(stmt->__anon1.compound.declarations)
-{
-for(decl = (*stmt->__anon1.compound.declarations).first; decl; decl = decl->next)
-ProcessDeclaration(decl);
+if(templateString[len - 1] == '>')
+templateString[len++] = ' ';
+templateString[len++] = '>';
+templateString[len++] = '\0';
}
-if(stmt->__anon1.compound.statements)
+FreeType(exp->expType);
{
-for(s = (*stmt->__anon1.compound.statements).first; s; s = s->next)
-ProcessStatement(s);
+struct Context * context = SetupTemplatesContext(tClass);
+
+exp->expType = ProcessTypeString(templateString, 0);
+FinishTemplatesContext(context);
}
-curContext = prevContext;
-curCompound = prevCompound;
}
-break;
}
-case 3:
+}
+}
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "undefined class %s\n", (((void *)0))), (id && (!id->_class || id->_class->__anon1.__anon1.name)) ? (id->classSym ? id->classSym->string : (type->__anon1._class ? type->__anon1._class->string : (((void *)0)))) : "(null)");
+}
+else if(type && (type->kind == 9 || type->kind == 10))
{
-struct Expression * exp;
+struct Type * memberType = exp->__anon1.member.member ? FindMember(type, exp->__anon1.member.member->string) : (((void *)0));
-if(stmt->__anon1.expressions)
+if(memberType)
{
-for(exp = (*stmt->__anon1.expressions).first; exp; exp = exp->next)
-ProcessExpressionType(exp);
+exp->expType = memberType;
+if(memberType)
+memberType->refCount++;
}
-break;
}
-case 4:
+else
{
-struct Expression * exp;
+char expString[10240];
-FreeType(((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType);
-((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType = MkClassType("bool");
-((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType->truth = 0x1;
-for(exp = (*stmt->__anon1.ifStmt.exp).first; exp; exp = exp->next)
+expString[0] = '\0';
+if(inCompiler)
{
-ProcessExpressionType(exp);
+PrintExpression(exp, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
}
-if(stmt->__anon1.ifStmt.stmt)
-ProcessStatement(stmt->__anon1.ifStmt.stmt);
-if(stmt->__anon1.ifStmt.elseStmt)
-ProcessStatement(stmt->__anon1.ifStmt.elseStmt);
-break;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "member operator on non-structure type expression %s\n", (((void *)0))), expString);
}
-case 5:
+if(exp->expType && exp->expType->kind == 21 && (!exp->destType || exp->destType->kind != 21))
{
-struct Type * oldSwitchType = curSwitchType;
-
-if(stmt->__anon1.switchStmt.exp)
+if(type && (type->kind == 8 || type->kind == 19 || type->kind == 3 || type->kind == 15))
{
-struct Expression * exp;
+struct Identifier * id = exp->__anon1.member.member;
+struct __ecereNameSpace__ecere__com__Class * _class = (id && (!id->_class || id->_class->__anon1.__anon1.name)) ? (id->classSym ? id->classSym->__anon1.registered : (type->__anon1._class ? type->__anon1._class->__anon1.registered : (((void *)0)))) : (((void *)0));
-for(exp = (*stmt->__anon1.switchStmt.exp).first; exp; exp = exp->next)
-{
-if(!exp->next)
+if(_class)
{
-ProcessExpressionType(exp);
+FreeType(exp->expType);
+exp->expType = ReplaceThisClassType(_class);
}
-if(!exp->next)
-curSwitchType = exp->expType;
}
}
-ProcessStatement(stmt->__anon1.switchStmt.stmt);
-curSwitchType = oldSwitchType;
+yylloc = oldyylloc;
break;
}
-case 6:
-{
-if(stmt->__anon1.whileStmt.exp)
+case 9:
{
-struct Expression * exp;
+struct Type * destType = exp->destType;
-FreeType(((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType);
-((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType = MkClassType("bool");
-((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType->truth = 0x1;
-for(exp = (*stmt->__anon1.whileStmt.exp).first; exp; exp = exp->next)
+if(exp->__anon1.member.member && exp->__anon1.member.member->_class && exp->__anon1.member.member->_class->__anon1.__anon1.name)
{
-ProcessExpressionType(exp);
-}
+exp->__anon1.member.member->classSym = exp->__anon1.member.member->_class->__anon1.__anon1.symbol;
}
-if(stmt->__anon1.whileStmt.stmt)
-ProcessStatement(stmt->__anon1.whileStmt.stmt);
+exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpOp((((void *)0)), '*', exp->__anon1.member.exp)));
+exp->type = 8;
+if(destType)
+destType->count++;
+ProcessExpressionType(exp);
+if(destType)
+destType->count--;
break;
}
-case 7:
+case 15:
{
-if(stmt->__anon1.doWhile.exp)
+struct Symbol * classSym = exp->__anon1._class->__anon1.__anon1.symbol;
+
+if(classSym && classSym->__anon1.registered)
{
-struct Expression * exp;
+if(classSym->__anon1.registered->type == 5 || (classSym->__anon1.registered->fixed && classSym->__anon1.registered->structSize))
+{
+char name[1024];
+struct __ecereNameSpace__ecere__com__Class * b = classSym->__anon1.registered;
-if((*stmt->__anon1.doWhile.exp).last)
+name[0] = '\0';
+DeclareStruct(curExternal, classSym->string, 0, 1);
+FreeSpecifier(exp->__anon1._class);
+FullClassNameCat(name, classSym->string, 0);
+if(b->offset == 0)
{
-FreeType(((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType);
-((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType = MkClassType("bool");
-((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType->truth = 0x1;
+exp->type = 10;
+exp->__anon1.typeName = MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(name), (((void *)0)))), (((void *)0)));
}
-for(exp = (*stmt->__anon1.doWhile.exp).first; exp; exp = exp->next)
+else
{
-ProcessExpressionType(exp);
+struct Expression * e;
+
+exp->type = 4;
+if(b->structSize == b->offset)
+exp->__anon1.op.exp1 = MkExpConstant("0");
+else
+exp->__anon1.op.exp1 = MkExpTypeSize(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(name), (((void *)0)))), (((void *)0))));
+exp->__anon1.op.op = '+';
+e = exp;
+while(b->offset != 0)
+{
+struct Symbol * sym;
+struct Expression * typeSize;
+
+b = b->base;
+sym = FindClass(b->fullName);
+name[0] = '\0';
+DeclareStruct(curExternal, sym->string, 0, 1);
+FullClassNameCat(name, sym->string, 0);
+if(b->structSize == b->offset)
+typeSize = MkExpConstant("0");
+else
+typeSize = MkExpTypeSize(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(name), (((void *)0)))), (((void *)0))));
+e->__anon1.op.exp2 = b->offset ? MkExpOp(typeSize, '+', (((void *)0))) : typeSize;
+e = e->__anon1.op.exp2;
}
}
-if(stmt->__anon1.doWhile.stmt)
-ProcessStatement(stmt->__anon1.doWhile.stmt);
-break;
}
-case 8:
+else
{
-struct Expression * exp;
-
-if(stmt->__anon1.forStmt.init)
-ProcessStatement(stmt->__anon1.forStmt.init);
-if(stmt->__anon1.forStmt.check && stmt->__anon1.forStmt.check->__anon1.expressions)
+if(classSym->__anon1.registered->fixed && !classSym->__anon1.registered->structSize)
{
-FreeType(((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType);
-((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType = MkClassType("bool");
-((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType->truth = 0x1;
+FreeSpecifier(exp->__anon1._class);
+exp->__anon1.__anon1.constant = PrintUInt(classSym->__anon1.registered->templateClass ? classSym->__anon1.registered->templateClass->structSize : classSym->__anon1.registered->structSize);
+exp->type = 2;
}
-if(stmt->__anon1.forStmt.check)
-ProcessStatement(stmt->__anon1.forStmt.check);
-if(stmt->__anon1.forStmt.increment)
+else
{
-for(exp = (*stmt->__anon1.forStmt.increment).first; exp; exp = exp->next)
-ProcessExpressionType(exp);
+char className[1024];
+
+strcpy(className, "__ecereClass_");
+FullClassNameCat(className, classSym->string, 1);
+DeclareClass(curExternal, classSym, className);
+FreeExpContents(exp);
+exp->type = 9;
+exp->__anon1.member.exp = MkExpIdentifier(MkIdentifier(className));
+exp->__anon1.member.member = MkIdentifier("structSize");
}
-if(stmt->__anon1.forStmt.stmt)
-ProcessStatement(stmt->__anon1.forStmt.stmt);
+}
+}
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1;
+});
break;
}
-case 18:
+case 10:
{
-struct Identifier * id = stmt->__anon1.forEachStmt.id;
-struct __ecereNameSpace__ecere__sys__OldList * exp = stmt->__anon1.forEachStmt.exp;
-struct __ecereNameSpace__ecere__sys__OldList * filter = stmt->__anon1.forEachStmt.filter;
-struct Statement * block = stmt->__anon1.forEachStmt.stmt;
-char iteratorType[1024];
-struct Type * source;
-struct Expression * e;
-unsigned int isBuiltin = exp && (*exp).last && (((struct Expression *)(*exp).last)->type == 35 || (((struct Expression *)(*exp).last)->type == 11 && ((struct Expression *)(*exp).last)->__anon1.cast.exp->type == 35));
-struct Expression * arrayExp;
-const char * typeString = (((void *)0));
-int builtinCount = 0;
+struct Type * type = ProcessType(exp->__anon1.typeName->qualifiers, exp->__anon1.typeName->declarator);
-for(e = exp ? (*exp).first : (((void *)0)); e; e = e->next)
-{
-if(!e->next)
-{
-FreeType(e->destType);
-e->destType = ProcessTypeString("Container", 0x0);
-}
-if(!isBuiltin || e->next)
-ProcessExpressionType(e);
+exp->expType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1;
+});
+exp->isConstant = 1;
+DeclareType(curExternal, type, 1, 0);
+FreeType(type);
+break;
}
-source = (exp && (*exp).last) ? ((struct Expression *)(*exp).last)->expType : (((void *)0));
-if(isBuiltin || (source && source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, containerClass)))
+case 11:
{
-struct __ecereNameSpace__ecere__com__Class * _class = source ? source->__anon1._class->__anon1.registered : (((void *)0));
-struct Symbol * symbol;
-struct Expression * expIt = (((void *)0));
-unsigned int isMap = 0x0, isArray = 0x0, isLinkList = 0x0, isList = 0x0, isCustomAVLTree = 0x0;
-struct __ecereNameSpace__ecere__com__Class * arrayClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Array");
-struct __ecereNameSpace__ecere__com__Class * linkListClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "LinkList");
-struct __ecereNameSpace__ecere__com__Class * customAVLTreeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "CustomAVLTree");
+struct Type * type = ProcessType(exp->__anon1.cast.typeName->qualifiers, exp->__anon1.cast.typeName->declarator);
-stmt->type = 2;
-stmt->__anon1.compound.context = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Context);
-stmt->__anon1.compound.context->parent = curContext;
-curContext = stmt->__anon1.compound.context;
-if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, customAVLTreeClass))
+type->count = 1;
+FreeType(exp->__anon1.cast.exp->destType);
+exp->__anon1.cast.exp->destType = type;
+type->refCount++;
+type->casted = 1;
+ProcessExpressionType(exp->__anon1.cast.exp);
+type->casted = 0;
+type->count = 0;
+exp->expType = type;
+if(!exp->__anon1.cast.exp->needCast && !NeedCast(exp->__anon1.cast.exp->expType, type))
{
-struct __ecereNameSpace__ecere__com__Class * mapClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Map");
+void * prev = exp->prev, * next = exp->next;
+struct Type * expType = exp->__anon1.cast.exp->destType;
+struct Expression * castExp = exp->__anon1.cast.exp;
+struct Type * destType = exp->destType;
-isCustomAVLTree = 0x1;
-if(__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, mapClass))
-isMap = 0x1;
-}
-else if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, arrayClass))
-isArray = 0x1;
-else if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, linkListClass))
-{
-struct __ecereNameSpace__ecere__com__Class * listClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "List");
+if(expType)
+expType->refCount++;
+FreeType(exp->expType);
+FreeTypeName(exp->__anon1.cast.typeName);
+*exp = *castExp;
+FreeType(exp->expType);
+FreeType(exp->destType);
+exp->expType = expType;
+exp->destType = destType;
+((castExp ? __extension__ ({
+void * __ecerePtrToDelete = (castExp);
-isLinkList = 0x1;
-isList = __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, listClass);
+__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)__ecerePtrToDelete) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(__ecerePtrToDelete);
+}) : 0), castExp = 0);
+exp->prev = prev;
+exp->next = next;
}
-if(isArray)
+else
{
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-
-decl = SpecDeclFromString(_class->templateArgs[2].__anon1.__anon1.dataTypeString, specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(id)));
-stmt->__anon1.compound.declarations = MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, (((void *)0))))));
-ListAdd(stmt->__anon1.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source->__anon1._class->__anon1.registered->fullName)), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalArray")), MkInitializerAssignment(MkExpBrackets(exp))))));
+exp->isConstant = exp->__anon1.cast.exp->isConstant;
+}
+break;
}
-else if(isBuiltin)
-{
-struct Type * type = (((void *)0));
-char typeStringBuf[1024];
-
-arrayExp = (((struct Expression *)(*exp).last)->type == 35) ? (struct Expression *)(*exp).last : ((struct Expression *)(*exp).last)->__anon1.cast.exp;
-if(((struct Expression *)(*exp).last)->type == 11)
+case 33:
{
-struct TypeName * typeName = ((struct Expression *)(*exp).last)->__anon1.cast.typeName;
+struct Type * type = ProcessType(exp->__anon1.initializer.typeName->qualifiers, exp->__anon1.initializer.typeName->declarator);
-if(typeName)
-arrayExp->destType = ProcessType(typeName->qualifiers, typeName->declarator);
+exp->expType = type;
+break;
}
-if(arrayExp->destType && arrayExp->destType->kind == 8 && arrayExp->destType->__anon1._class && arrayExp->destType->__anon1._class->__anon1.registered && arrayExp->destType->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(arrayExp->destType->__anon1._class->__anon1.registered, containerClass) && arrayExp->destType->__anon1._class->__anon1.registered->templateArgs)
+case 34:
{
-struct __ecereNameSpace__ecere__com__Class * templateClass = arrayExp->destType->__anon1._class->__anon1.registered;
+struct Type * type = ProcessType(exp->__anon1.vaArg.typeName->qualifiers, exp->__anon1.vaArg.typeName->declarator);
-typeString = templateClass->templateArgs[2].__anon1.__anon1.dataTypeString;
+ProcessExpressionType(exp->__anon1.vaArg.exp);
+exp->expType = type;
+break;
}
-else if(arrayExp->__anon1.list)
+case 12:
{
struct Expression * e;
+struct Type * t = exp->destType;
-for(e = (*arrayExp->__anon1.list).first; e; e = e->next)
-{
-ProcessExpressionType(e);
-if(e->expType)
+if(t && !exp->destType->casted)
{
-if(!type)
-{
-type = e->expType;
-type->refCount++;
+t = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+CopyTypeInto(t, exp->destType);
+t->count = 0;
}
-else
+else if(t)
+t->refCount++;
+exp->isConstant = 1;
+FreeType(exp->__anon1.cond.cond->destType);
+exp->__anon1.cond.cond->destType = MkClassType("bool");
+exp->__anon1.cond.cond->destType->truth = 1;
+ProcessExpressionType(exp->__anon1.cond.cond);
+if(!exp->__anon1.cond.cond->isConstant)
+exp->isConstant = 0;
+for(e = (*exp->__anon1.cond.exp).first; e; e = e->next)
{
-if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1))
+if(!e->next)
{
-FreeType(type);
-type = e->expType;
-e->expType = (((void *)0));
-e = (*arrayExp->__anon1.list).first;
+FreeType(e->destType);
+e->destType = t;
+if(e->destType)
+e->destType->refCount++;
+}
ProcessExpressionType(e);
-if(e->expType)
-{
-if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1))
+if(!e->next)
{
-FreeType(e->expType);
-e->expType = (((void *)0));
-FreeType(type);
-type = (((void *)0));
-break;
-}
-}
-}
-}
+exp->expType = e->expType;
if(e->expType)
-{
-FreeType(e->expType);
-e->expType = (((void *)0));
-}
-}
+e->expType->refCount++;
}
-if(type)
-{
-typeStringBuf[0] = '\0';
-PrintType(type, typeStringBuf, 0x0, 0x1);
-typeString = typeStringBuf;
-FreeType(type);
+if(!e->isConstant)
+exp->isConstant = 0;
}
+FreeType(exp->__anon1.cond.elseExp->destType);
+exp->__anon1.cond.elseExp->destType = t ? t : exp->expType;
+if(exp->__anon1.cond.elseExp->destType)
+exp->__anon1.cond.elseExp->destType->refCount++;
+ProcessExpressionType(exp->__anon1.cond.elseExp);
+if(!exp->__anon1.cond.elseExp->isConstant)
+exp->isConstant = 0;
+FreeType(t);
+break;
}
-if(typeString)
+case 23:
{
-struct __ecereNameSpace__ecere__sys__OldList * initializers = MkList();
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-
-if(arrayExp->__anon1.list)
+if(exp->__anon1.compound && exp->__anon1.compound->__anon1.compound.statements && (*exp->__anon1.compound->__anon1.compound.statements).last)
{
-struct Expression * e;
+struct Statement * last = (*exp->__anon1.compound->__anon1.compound.statements).last;
-builtinCount = (*arrayExp->__anon1.list).count;
-type = ProcessTypeString(typeString, 0x0);
-while((e = (*arrayExp->__anon1.list).first))
+if(last->type == 3 && last->__anon1.expressions && (*last->__anon1.expressions).last)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*arrayExp->__anon1.list), e);
-e->destType = type;
-type->refCount++;
-ProcessExpressionType(e);
-ListAdd(initializers, MkInitializerAssignment(e));
+((struct Expression *)(*last->__anon1.expressions).last)->destType = exp->destType;
+if(exp->destType)
+exp->destType->refCount++;
}
-FreeType(type);
-(__ecereNameSpace__ecere__com__eSystem_Delete(arrayExp->__anon1.list), arrayExp->__anon1.list = 0);
+ProcessStatement(exp->__anon1.compound);
+exp->expType = (last->__anon1.expressions && (*last->__anon1.expressions).last) ? ((struct Expression *)(*last->__anon1.expressions).last)->expType : (((void *)0));
+if(exp->expType)
+exp->expType->refCount++;
}
-decl = SpecDeclFromString(typeString, specs, MkDeclaratorIdentifier(id));
-stmt->__anon1.compound.declarations = MkListOne(MkDeclaration(CopyList(specs, CopySpecifier), MkListOne(MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl), (((void *)0))))));
-ListAdd(stmt->__anon1.compound.declarations, MkDeclaration(specs, MkListOne(MkInitDeclarator(PlugDeclarator(decl, MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__internalArray")), (((void *)0)))), MkInitializerList(initializers)))));
-FreeList(exp, FreeExpression);
+break;
+}
+case 24:
+{
+struct Specifier * spec = (*exp->__anon1._classExp.specifiers).first;
+
+if(spec && spec->type == 1)
+{
+exp->expType = MkClassType(spec->__anon1.__anon1.name);
+exp->expType->kind = 19;
+exp->byReference = 1;
}
else
{
-arrayExp->expType = ProcessTypeString("Container", 0x0);
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Couldn't determine type of array elements\n", (((void *)0))));
+exp->expType = MkClassType("ecere::com::Class");
+exp->byReference = 1;
}
+break;
}
-else if(isLinkList && !isList)
+case 25:
{
-struct Declarator * decl;
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct __ecereNameSpace__ecere__com__Class * _class = thisClass ? thisClass : currentClass;
-decl = SpecDeclFromString(_class->templateArgs[3].__anon1.__anon1.dataTypeString, specs, MkDeclaratorIdentifier(id));
-stmt->__anon1.compound.declarations = MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, (((void *)0))))));
-ListAdd(stmt->__anon1.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source->__anon1._class->__anon1.registered->fullName)), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalLinkList")), MkInitializerAssignment(MkExpBrackets(exp))))));
-}
-else if(_class->templateArgs)
+if(_class)
{
-if(isMap)
-sprintf(iteratorType, "MapIterator<%s, %s >", _class->templateArgs[5].__anon1.__anon1.dataTypeString, _class->templateArgs[6].__anon1.__anon1.dataTypeString);
+struct Identifier * id = exp->__anon1.classData.id;
+char structName[1024];
+struct Expression * classExp;
+
+strcpy(structName, "__ecereClassData_");
+FullClassNameCat(structName, _class->fullName, 0);
+exp->type = 9;
+exp->__anon1.member.member = id;
+if(curCompound && FindSymbol("this", curContext, curCompound->__anon1.compound.context, 0, 0))
+classExp = MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class"));
else
-sprintf(iteratorType, "Iterator<%s, %s >", _class->templateArgs[2].__anon1.__anon1.dataTypeString, _class->templateArgs[1].__anon1.__anon1.dataTypeString);
-stmt->__anon1.compound.declarations = MkListOne(MkDeclarationInst(MkInstantiationNamed(MkListOne(MkSpecifierName(iteratorType)), MkExpIdentifier(id), MkListOne(MkMembersInitList(MkListOne(MkMemberInit(isMap ? MkListOne(MkIdentifier("map")) : (((void *)0)), MkInitializerAssignment(MkExpBrackets(exp)))))))));
+classExp = MkExpIdentifier(MkIdentifier("class"));
+exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpMember(classExp, MkIdentifier("data"))), '+', MkExpMember(MkExpClass(MkListOne(MkSpecifierName(_class->fullName)), (((void *)0))), MkIdentifier("offsetClass"))))))));
+ProcessExpressionType(exp);
+return ;
}
-symbol = FindSymbol(id->string, curContext, curContext, 0x0, 0x0);
-if(block)
-{
-switch(block->type)
-{
-case 2:
-if(block->__anon1.compound.context)
-block->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-break;
-case 4:
-if(block->__anon1.ifStmt.stmt && block->__anon1.ifStmt.stmt->type == 2 && block->__anon1.ifStmt.stmt->__anon1.compound.context)
-block->__anon1.ifStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-if(block->__anon1.ifStmt.elseStmt && block->__anon1.ifStmt.elseStmt->type == 2 && block->__anon1.ifStmt.elseStmt->__anon1.compound.context)
-block->__anon1.ifStmt.elseStmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-break;
-case 5:
-if(block->__anon1.switchStmt.stmt && block->__anon1.switchStmt.stmt->type == 2 && block->__anon1.switchStmt.stmt->__anon1.compound.context)
-block->__anon1.switchStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-break;
-case 6:
-if(block->__anon1.whileStmt.stmt && block->__anon1.whileStmt.stmt->type == 2 && block->__anon1.whileStmt.stmt->__anon1.compound.context)
-block->__anon1.whileStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-break;
-case 7:
-if(block->__anon1.doWhile.stmt && block->__anon1.doWhile.stmt->type == 2 && block->__anon1.doWhile.stmt->__anon1.compound.context)
-block->__anon1.doWhile.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-break;
-case 8:
-if(block->__anon1.forStmt.stmt && block->__anon1.forStmt.stmt->type == 2 && block->__anon1.forStmt.stmt->__anon1.compound.context)
-block->__anon1.forStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
-break;
-case 18:
-if(block->__anon1.forEachStmt.stmt && block->__anon1.forEachStmt.stmt->type == 2 && block->__anon1.forEachStmt.stmt->__anon1.compound.context)
-block->__anon1.forEachStmt.stmt->__anon1.compound.context->parent = stmt->__anon1.compound.context;
break;
}
-}
-if(filter)
-{
-block = MkIfStmt(filter, block, (((void *)0)));
-}
-if(isArray)
+case 35:
{
-stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("array"))))), MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<', MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("array")), '+', MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("count")))))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, (((void *)0)))), block));
-ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.init);
-ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.check);
-ProcessExpressionType((*((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.increment).first);
-}
-else if(isBuiltin)
+struct Type * type = (((void *)0));
+const char * typeString = (((void *)0));
+char typeStringBuf[1024];
+
+if(exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && exp->destType->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(exp->destType->__anon1._class->__anon1.registered, containerClass))
{
-char count[128];
+struct __ecereNameSpace__ecere__com__Class * templateClass = exp->destType->__anon1._class->__anon1.registered;
-sprintf(count, "%d", builtinCount);
-stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpIdentifier(MkIdentifier("__internalArray"))))), MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<', MkExpOp(MkExpIdentifier(MkIdentifier("__internalArray")), '+', MkExpConstant(count))))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, (((void *)0)))), block));
-ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.init);
-ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.check);
-ProcessExpressionType((*((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.increment).first);
+typeString = templateClass->templateArgs[2].__anon1.__anon1.dataTypeString;
}
-else if(isLinkList && !isList)
+else if(exp->__anon1.list)
{
-struct __ecereNameSpace__ecere__com__Class * typeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, _class->templateArgs[3].__anon1.__anon1.dataTypeString);
-struct __ecereNameSpace__ecere__com__Class * listItemClass = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, "ListItem");
+struct Expression * e;
-if(typeClass && __ecereNameSpace__ecere__com__eClass_IsDerived(typeClass, listItemClass) && _class->templateArgs[5].__anon1.__anon1.dataTypeString && !strcmp(_class->templateArgs[5].__anon1.__anon1.dataTypeString, "LT::link"))
+for(e = (*exp->__anon1.list).first; e; e = e->next)
{
-stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("first"))))), MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(CopyIdentifier(id)), MkIdentifier("next")))), block));
-}
-else
+ProcessExpressionType(e);
+if(e->expType)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl = SpecDeclFromString(_class->templateArgs[3].__anon1.__anon1.dataTypeString, specs, (((void *)0)));
-
-stmt->__anon1.compound.statements = MkListOne(MkForStmt(MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("first"))))), MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))), MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpCast(MkTypeName(specs, decl), MkExpCall(MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("GetNext")), MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("IteratorPointer")), (((void *)0))), MkExpIdentifier(CopyIdentifier(id)))))))), block));
-}
-ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.init);
-ProcessStatement(((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.check);
-ProcessExpressionType((*((struct Statement *)(*stmt->__anon1.compound.statements).first)->__anon1.forStmt.increment).first);
-}
-else
+if(!type)
{
-stmt->__anon1.compound.statements = MkListOne(MkWhileStmt(MkListOne(MkExpCall(MkExpMember(expIt = MkExpIdentifier(CopyIdentifier(id)), MkIdentifier("Next")), (((void *)0)))), block));
-}
-ProcessExpressionType(expIt);
-if((*stmt->__anon1.compound.declarations).first)
-ProcessDeclaration((*stmt->__anon1.compound.declarations).first);
-if(symbol)
-symbol->isIterator = isMap ? 2 : ((isArray || isBuiltin) ? 3 : (isLinkList ? (isList ? 5 : 4) : (isCustomAVLTree ? 6 : 1)));
-ProcessStatement(stmt);
-curContext = stmt->__anon1.compound.context->parent;
-break;
+type = e->expType;
+type->refCount++;
}
else
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Expression is not a container\n", (((void *)0))));
-}
-break;
-}
-case 9:
-break;
-case 10:
-break;
-case 11:
-break;
-case 12:
-{
-struct Expression * exp;
-
-if(stmt->__anon1.expressions)
+if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1))
{
-for(exp = (*stmt->__anon1.expressions).first; exp; exp = exp->next)
+FreeType(type);
+type = e->expType;
+e->expType = (((void *)0));
+e = (*exp->__anon1.list).first;
+ProcessExpressionType(e);
+if(e->expType)
{
-if(!exp->next)
+if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1))
{
-if(curFunction && !curFunction->type)
-curFunction->type = ProcessType(curFunction->specifiers, curFunction->declarator);
-FreeType(exp->destType);
-exp->destType = (curFunction && curFunction->type && curFunction->type->kind == 11) ? curFunction->type->__anon1.__anon2.returnType : (((void *)0));
-if(exp->destType)
-exp->destType->refCount++;
+FreeType(e->expType);
+e->expType = (((void *)0));
+FreeType(type);
+type = (((void *)0));
+break;
}
-ProcessExpressionType(exp);
}
}
-break;
}
-case 14:
+if(e->expType)
{
-ProcessDeclaration(stmt->__anon1.decl);
-break;
+FreeType(e->expType);
+e->expType = (((void *)0));
}
-case 13:
-{
-struct AsmField * field;
-
-if(stmt->__anon1.asmStmt.inputFields)
-{
-for(field = (*stmt->__anon1.asmStmt.inputFields).first; field; field = field->next)
-if(field->expression)
-ProcessExpressionType(field->expression);
}
-if(stmt->__anon1.asmStmt.outputFields)
+}
+if(type)
{
-for(field = (*stmt->__anon1.asmStmt.outputFields).first; field; field = field->next)
-if(field->expression)
-ProcessExpressionType(field->expression);
+typeStringBuf[0] = '\0';
+PrintTypeNoConst(type, typeStringBuf, 0, 1);
+typeString = typeStringBuf;
+FreeType(type);
+type = (((void *)0));
}
-if(stmt->__anon1.asmStmt.clobberedFields)
+}
+if(typeString)
{
-for(field = (*stmt->__anon1.asmStmt.clobberedFields).first; field; field = field->next)
+char templateString[1024];
+struct __ecereNameSpace__ecere__sys__OldList * initializers = MkList();
+struct __ecereNameSpace__ecere__sys__OldList * structInitializers = MkList();
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Expression * expExt;
+struct Declarator * decl = SpecDeclFromString(typeString, specs, (((void *)0)));
+
+sprintf(templateString, "Container<%s>", typeString);
+if(exp->__anon1.list)
{
-if(field->expression)
-ProcessExpressionType(field->expression);
+struct Expression * e;
+
+type = ProcessTypeString(typeString, 0);
+while((e = (*exp->__anon1.list).first))
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->__anon1.list), e);
+e->destType = type;
+type->refCount++;
+ProcessExpressionType(e);
+ListAdd(initializers, MkInitializerAssignment(e));
}
+FreeType(type);
+(__ecereNameSpace__ecere__com__eSystem_Delete(exp->__anon1.list), exp->__anon1.list = 0);
}
-break;
+DeclareStruct(curExternal, "ecere::com::BuiltInContainer", 0, 1);
+ListAdd(structInitializers, MkInitializerAssignment(MkExpMember(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))), MkIdentifier("_vTbl"))));
+ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
+ListAdd(structInitializers, MkInitializerAssignment(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0)))));
+ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
+ListAdd(structInitializers, MkInitializerAssignment(MkExpConstant("0")));
+ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
+ListAdd(structInitializers, MkInitializerAssignment(MkExpExtensionInitializer(MkTypeName(specs, MkDeclaratorArray(decl, (((void *)0)))), MkInitializerList(initializers))));
+ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
+ListAdd(structInitializers, MkInitializerAssignment(__extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.__anon1.constant = __ecereNameSpace__ecere__com__PrintString(__ecereClass_int, (void *)&(*initializers).count, (void *)0), __ecereInstance1;
+})));
+ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
+ListAdd(structInitializers, MkInitializerAssignment(MkExpClass(CopyList(specs, (void *)(CopySpecifier)), CopyDeclarator(decl))));
+ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp);
+exp->expType = ProcessTypeString(templateString, 0);
+exp->type = 5;
+exp->__anon1.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(templateString)), (((void *)0))), MkExpOp((((void *)0)), '&', expExt = MkExpExtensionInitializer(MkTypeName(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))), MkInitializerList(structInitializers)))));
+ProcessExpressionType(expExt);
}
-case 17:
+else
{
-struct PropertyWatch * propWatch;
-struct __ecereNameSpace__ecere__sys__OldList * watches = stmt->__anon1._watch.watches;
-struct Expression * object = stmt->__anon1._watch.object;
-struct Expression * watcher = stmt->__anon1._watch.watcher;
-
-if(watcher)
-ProcessExpressionType(watcher);
-if(object)
-ProcessExpressionType(object);
-if(inCompiler)
+exp->expType = ProcessTypeString("Container", 0);
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Couldn't determine type of array elements\n", (((void *)0))));
+}
+break;
+}
+}
+if(exp->expType && exp->expType->kind == 21 && thisClass && (!exp->destType || exp->destType->kind != 21))
{
-if(watcher || thisClass)
+FreeType(exp->expType);
+exp->expType = ReplaceThisClassType(thisClass);
+}
+if(exp->expType && (exp->expType->kind == 9 || exp->expType->kind == 10 || exp->expType->kind == 15) && !exp->expType->__anon1.__anon1.members.first && exp->expType->__anon1.__anon1.enumName)
{
-struct External * external = curExternal;
-struct Context * context = curContext;
+struct Symbol * symbol = FindSymbol(exp->expType->__anon1.__anon1.enumName, curContext, globalContext, 1, 0);
-stmt->type = 3;
-stmt->__anon1.expressions = MkList();
-curExternal = external->prev;
-for(propWatch = (*watches).first; propWatch; propWatch = propWatch->next)
+if(symbol)
{
-struct ClassFunction * func;
-char watcherName[1024];
-struct __ecereNameSpace__ecere__com__Class * watcherClass = watcher ? ((watcher->expType && watcher->expType->kind == 8 && watcher->expType->__anon1._class) ? watcher->expType->__anon1._class->__anon1.registered : (((void *)0))) : thisClass;
-struct External * createdExternal;
-struct External * externalDecl = MkExternalDeclaration((((void *)0)));
+if(exp->expType->kind != 15)
+{
+struct Type * member;
+char * enumName = __ecereNameSpace__ecere__sys__CopyString(exp->expType->__anon1.__anon1.enumName);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, externalDecl);
-sprintf(watcherName, "__ecerePropertyWatcher_%d", propWatcherID++);
-if(propWatch->deleteWatch)
-strcat(watcherName, "_delete");
+FreeType(exp->expType);
+exp->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+exp->expType->kind = symbol->type->kind;
+exp->expType->refCount++;
+exp->expType->__anon1.__anon1.enumName = enumName;
+exp->expType->__anon1.__anon1.members = symbol->type->__anon1.__anon1.members;
+for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next)
+member->refCount++;
+}
else
{
-struct Identifier * propID;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * member;
-for(propID = (*propWatch->properties).first; propID; propID = propID->next)
+for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next)
{
-strcat(watcherName, "_");
-strcat(watcherName, propID->string);
+struct __ecereNameSpace__ecere__sys__NamedLink64 * value = (value = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__NamedLink64)), value->name = __ecereNameSpace__ecere__sys__CopyString(member->name), value);
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&exp->expType->__anon1.__anon1.members, value);
}
}
-if(object && object->expType && object->expType->kind == 8 && object->expType->__anon1._class && object->expType->__anon1._class->__anon1.registered)
+}
+}
+if(!notByReference && exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 5 && (!exp->destType || (exp->destType->kind != 3 && exp->destType->kind != 4 && exp->destType->kind != 22 && exp->destType->kind != 23 && exp->destType->kind != 5 && exp->destType->kind != 2 && exp->destType->kind != 1 && exp->destType->kind != 24)))
{
-func = MkClassFunction(MkListOne(MkSpecifier(VOID)), (((void *)0)), MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(watcherName)), MkListOne(MkTypeName(MkListOne(MkSpecifierName(object->expType->__anon1._class->string)), MkDeclaratorIdentifier(MkIdentifier("value"))))), (((void *)0)));
-ProcessClassFunctionBody(func, propWatch->compound);
-propWatch->compound = (((void *)0));
-createdExternal = ProcessClassFunction(watcherClass, func, ast, curExternal, 0x1);
-createdExternal->symbol->idCode = external->symbol->idCode;
-curExternal = createdExternal;
-ProcessFunction(createdExternal->__anon1.function);
+exp->byReference = 1;
+}
+yylloc = exp->loc;
+if(exp->destType && (exp->destType->kind == 18))
+;
+else if(exp->destType && !exp->destType->keepCast)
+{
+if(!exp->needTemplateCast && exp->expType && (exp->expType->kind == 20 || exp->expType->passAsTemplate))
+exp->needTemplateCast = 1;
+if(exp->destType->kind == 0)
+;
+else if(!CheckExpressionType(exp, exp->destType, 0, !exp->destType->casted))
{
-struct Declaration * decl = MkDeclaration(CopyList(createdExternal->__anon1.function->specifiers, CopySpecifier), MkListOne(MkInitDeclarator(CopyDeclarator(createdExternal->__anon1.function->declarator), (((void *)0)))));
+unsigned int invalidCast = 0;
-externalDecl->__anon1.declaration = decl;
-if(decl->symbol && !decl->symbol->__anon2.__anon1.pointerExternal)
-decl->symbol->__anon2.__anon1.pointerExternal = externalDecl;
-}
-if(propWatch->deleteWatch)
+if(inCompiler && exp->destType->count && exp->expType)
{
-struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
+struct __ecereNameSpace__ecere__com__Class * c1 = (exp->expType->kind == 8 && exp->expType->__anon1._class) ? exp->expType->__anon1._class->__anon1.registered : (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * c2 = (exp->destType->kind == 8 && exp->destType->__anon1._class) ? exp->destType->__anon1._class->__anon1.registered : (((void *)0));
-ListAdd(args, CopyExpression(object));
-ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(args, MkExpIdentifier(MkIdentifier(watcherName)));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_WatchDestruction")), args));
+if(c1 && c1->type != 1)
+c1 = (((void *)0));
+if(c2 && c2->type != 1)
+c2 = (((void *)0));
+if((c1 && !exp->expType->byReference && !c2 && !__ecereProp_Type_Get_isPointerType(exp->destType)) || (c2 && !exp->destType->byReference && !c1 && !__ecereProp_Type_Get_isPointerType(exp->expType)))
+invalidCast = 1;
}
-else
+if(!exp->destType->count || unresolved || invalidCast)
{
-struct __ecereNameSpace__ecere__com__Class * _class = object->expType->__anon1._class->__anon1.registered;
-struct Identifier * propID;
-
-for(propID = (*propWatch->properties).first; propID; propID = propID->next)
+if(!exp->expType)
{
-char propName[1024];
-struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, propID->string, privateModule);
+yylloc = exp->loc;
+if(exp->destType->kind != 14)
+{
+char type2[1024];
-if(prop)
+type2[0] = '\0';
+if(inCompiler)
{
-char getName[1024], setName[1024];
-struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
+char expString[10240];
-DeclareProperty(prop, setName, getName);
-strcpy(propName, "__ecereProp_");
-FullClassNameCat(propName, prop->_class->fullName, 0x0);
-strcat(propName, "_");
-FullClassNameCat(propName, prop->name, 0x1);
-ListAdd(args, CopyExpression(object));
-ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
-ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(args, MkExpIdentifier(MkIdentifier(watcherName)));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_Watch")), args));
-}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Property %s not found in class %s\n", (((void *)0))), propID->string, _class->fullName);
+expString[0] = '\0';
+PrintType(exp->destType, type2, 0, 1);
+if(inCompiler)
+{
+PrintExpression(exp, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
}
+if(unresolved)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s; expected %s\n", (((void *)0))), expString, type2);
+else if(exp->type != 16)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s; expected %s\n", (((void *)0))), expString, type2);
}
}
else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Invalid watched object\n", (((void *)0))));
+{
+char expString[10240];
+
+expString[0] = '\0';
+if(inCompiler)
+{
+PrintExpression(exp, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
}
-curExternal = external;
-curContext = context;
-if(watcher)
-FreeExpression(watcher);
-if(object)
-FreeExpression(object);
-FreeList(watches, FreePropertyWatch);
+if(unresolved)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s\n", (((void *)0))), expString);
+else if(exp->type != 16)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "No observer specified and not inside a _class\n", (((void *)0))));
}
else
{
-for(propWatch = (*watches).first; propWatch; propWatch = propWatch->next)
+char type1[1024];
+char type2[1024];
+
+type1[0] = '\0';
+type2[0] = '\0';
+if(inCompiler)
{
-ProcessStatement(propWatch->compound);
-}
-}
-break;
+PrintType(exp->expType, type1, 0, 1);
+PrintType(exp->destType, type2, 0, 1);
}
-case 15:
+if(exp->destType->truth && exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && !strcmp(exp->destType->__anon1._class->__anon1.registered->name, "bool") && exp->expType->kind != 0 && exp->expType->kind != 9 && exp->expType->kind != 10 && (exp->expType->kind != 8 || exp->expType->classObjectType || (exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type != 1)))
+;
+else
{
-struct __ecereNameSpace__ecere__sys__OldList * watches = stmt->__anon1._watch.watches;
-struct Expression * object = stmt->__anon1._watch.object;
-struct __ecereNameSpace__ecere__com__Class * _class;
+struct Expression * nbExp = GetNonBracketsExp(exp);
+unsigned int skipWarning = 0;
+int kind = exp->destType->kind;
-if(object)
-ProcessExpressionType(object);
-if(inCompiler)
+if(nbExp->type == 12 && nbExp->destType && !nbExp->destType->casted && nbExp->destType->kind == exp->destType->kind)
+skipWarning = 1;
+if((kind == 1 || kind == 2) && exp->destType->isSigned == exp->expType->signedBeforePromotion && nbExp->type == 4 && nbExp->__anon1.op.exp1 && nbExp->__anon1.op.exp2)
+{
+int op = nbExp->__anon1.op.op;
+struct Expression * nbExp1, * nbExp2;
+int from;
+
+switch(op)
+{
+case '%':
+case '/':
+nbExp1 = GetNonBracketsExp(nbExp->__anon1.op.exp1);
+from = nbExp1->expType->promotedFrom;
+if(from == 1 || (kind == 2 && from == 2))
+skipWarning = 1;
+break;
+case LEFT_OP:
+case RIGHT_OP:
+nbExp1 = GetNonBracketsExp(nbExp->__anon1.op.exp1);
+nbExp2 = GetNonBracketsExp(nbExp->__anon1.op.exp2);
+from = nbExp1->expType->promotedFrom;
+if(op == RIGHT_OP && (from == 1 || (kind == 2 && from == 2)))
+skipWarning = 1;
+else if(nbExp2->isConstant && nbExp2->type == 2 && (nbExp->__anon1.op.op == RIGHT_OP || nbExp1->expType->bitMemberSize))
+{
+int n = strtol(nbExp2->__anon1.__anon1.constant, (((void *)0)), 0);
+int s = from == 1 ? 8 : 16;
+
+if(nbExp1->expType->bitMemberSize && nbExp1->expType->bitMemberSize < s)
+s = nbExp1->expType->bitMemberSize;
+if(nbExp->__anon1.op.op == RIGHT_OP)
+s -= n;
+else
+s += n;
+if(s <= (kind == 1 ? 8 : 16))
+skipWarning = 1;
+}
+break;
+case '-':
+if(!exp->destType->isSigned)
{
-_class = object ? ((object->expType && object->expType->kind == 8 && object->expType->__anon1._class) ? object->expType->__anon1._class->__anon1.registered : (((void *)0))) : thisClass;
-if(_class)
+nbExp1 = GetNonBracketsExp(nbExp->__anon1.op.exp1);
+nbExp2 = GetNonBracketsExp(nbExp->__anon1.op.exp2);
+from = nbExp2->expType->promotedFrom;
+if((from == 1 || from == 2) && nbExp1->isConstant && nbExp1->type == 2)
{
-struct Identifier * propID;
+int n = strtol(nbExp1->__anon1.__anon1.constant, (((void *)0)), 0);
-stmt->type = 3;
-stmt->__anon1.expressions = MkList();
-if(!watches && curFunction->propSet && (!object || (object->type == 0 && !strcmp(object->__anon1.__anon1.identifier->string, "this"))))
-{
-watches = MkListOne(MkIdentifier(curFunction->propSet->string));
+if(n == (from == 1 ? 255 : 65535))
+skipWarning = 1;
}
-else if(!watches)
-{
}
-if(watches)
-{
-for(propID = (*watches).first; propID; propID = propID->next)
+break;
+case '|':
{
-struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, propID->string, privateModule);
+int kind1, kind2;
-if(prop)
+nbExp1 = GetNonBracketsExp(nbExp->__anon1.op.exp1);
+nbExp2 = GetNonBracketsExp(nbExp->__anon1.op.exp2);
+kind1 = nbExp1->expType->promotedFrom ? nbExp1->expType->promotedFrom : nbExp1->expType->kind;
+kind2 = nbExp2->expType->promotedFrom ? nbExp2->expType->promotedFrom : nbExp2->expType->kind;
+if(((kind1 == 1 || (kind1 == 2 && kind == 2)) || MatchTypeExpression(nbExp1, exp->destType, (((void *)0)), 0, 0)) && ((kind2 == 1 || (kind2 == 2 && kind == 2)) || MatchTypeExpression(nbExp2, exp->destType, (((void *)0)), 0, 0)))
+skipWarning = 1;
+break;
+}
+case '&':
{
-CreateFireWatcher(prop, object, stmt);
+int kind1, kind2;
+
+nbExp1 = GetNonBracketsExp(nbExp->__anon1.op.exp1);
+nbExp2 = GetNonBracketsExp(nbExp->__anon1.op.exp2);
+kind1 = nbExp1->expType->promotedFrom ? nbExp1->expType->promotedFrom : nbExp1->expType->kind;
+kind2 = nbExp2->expType->promotedFrom ? nbExp2->expType->promotedFrom : nbExp2->expType->kind;
+if(((kind1 == 1 || (kind1 == 2 && kind == 2)) || MatchTypeExpression(nbExp1, exp->destType, (((void *)0)), 0, 0)) || ((kind2 == 1 || (kind2 == 2 && kind == 2)) || MatchTypeExpression(nbExp2, exp->destType, (((void *)0)), 0, 0)))
+skipWarning = 1;
+break;
}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Property %s not found in class %s\n", (((void *)0))), propID->string, _class->fullName);
}
}
-else
+if(!skipWarning)
{
-struct __ecereNameSpace__ecere__com__Property * prop;
-struct __ecereNameSpace__ecere__com__Class * base;
+char expString[10240];
-for(base = _class; base; base = base->base)
-{
-for(prop = base->membersAndProperties.first; prop; prop = prop->next)
+expString[0] = '\0';
+if(inCompiler)
{
-if(prop->isProperty && prop->isWatchable)
+PrintExpression(exp, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
+}
+if(!sourceFile || (!strstr(sourceFile, "src\\lexer.ec") && !strstr(sourceFile, "src/lexer.ec") && !strstr(sourceFile, "src\\grammar.ec") && !strstr(sourceFile, "src/grammar.ec") && !strstr(sourceFile, "src\\type.ec") && !strstr(sourceFile, "src/type.ec") && !strstr(sourceFile, "src\\expression.ec") && !strstr(sourceFile, "src/expression.ec")))
{
-CreateFireWatcher(prop, object, stmt);
+if(invalidCast)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expression %s (%s); expected %s\n", (((void *)0))), expString, type1, type2);
+else
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expression %s (%s); expected %s\n", (((void *)0))), expString, type1, type2);
}
}
+if(!inCompiler)
+{
+FreeType(exp->expType);
+exp->destType->refCount++;
+exp->expType = exp->destType;
}
}
-if(object)
-FreeExpression(object);
-FreeList(watches, FreeIdentifier);
}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Invalid object specified and not inside a class\n", (((void *)0))));
}
-break;
}
-case 16:
-{
-struct __ecereNameSpace__ecere__sys__OldList * watches = stmt->__anon1._watch.watches;
-struct Expression * object = stmt->__anon1._watch.object;
-struct Expression * watcher = stmt->__anon1._watch.watcher;
-struct __ecereNameSpace__ecere__com__Class * _class;
-
-if(object)
-ProcessExpressionType(object);
-if(watcher)
-ProcessExpressionType(watcher);
-if(inCompiler)
-{
-_class = (object && object->expType && object->expType->kind == 8 && object->expType->__anon1._class) ? object->expType->__anon1._class->__anon1.registered : (((void *)0));
-if(watcher || thisClass)
-{
-if(_class)
+else if(exp->destType && exp->destType->kind == 13 && exp->destType->__anon1.type && exp->destType->__anon1.type->kind == 11 && exp->expType && (exp->expType->kind == 11 || exp->expType->kind == 16))
{
-struct Identifier * propID;
+struct Expression * nbExp = GetNonBracketsExp(exp);
-stmt->type = 3;
-stmt->__anon1.expressions = MkList();
-if(!watches)
+if(nbExp->type != 11 || !IsVoidPtrCast(nbExp->__anon1.cast.typeName))
{
-struct __ecereNameSpace__ecere__sys__OldList * args;
+struct Expression * e = MoveExpContents(exp);
-args = MkList();
-ListAdd(args, CopyExpression(object));
-ListAdd(args, MkExpConstant("0"));
-ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_StopWatching")), args));
+exp->__anon1.cast.exp = MkExpBrackets(MkListOne(e));
+exp->type = 11;
+exp->__anon1.cast.exp->destType = exp->destType;
+if(exp->destType)
+exp->destType->refCount++;
+exp->__anon1.cast.typeName = MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0))));
}
-else
+}
+}
+else if(unresolved)
{
-for(propID = (*watches).first; propID; propID = propID->next)
+if(exp->__anon1.__anon1.identifier->_class && exp->__anon1.__anon1.identifier->_class->__anon1.__anon1.name)
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s::%s\n", (((void *)0))), exp->__anon1.__anon1.identifier->_class->__anon1.__anon1.name, exp->__anon1.__anon1.identifier->string);
+else if(exp->__anon1.__anon1.identifier->string && exp->__anon1.__anon1.identifier->string[0])
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved identifier %s\n", (((void *)0))), exp->__anon1.__anon1.identifier->string);
+}
+else if(!exp->expType && exp->type != 16)
{
-char propName[1024];
-struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, propID->string, privateModule);
+char expString[10240];
-if(prop)
+expString[0] = '\0';
+if(inCompiler)
{
-char getName[1024], setName[1024];
-struct __ecereNameSpace__ecere__sys__OldList * args = MkList();
-
-DeclareProperty(prop, setName, getName);
-strcpy(propName, "__ecereProp_");
-FullClassNameCat(propName, prop->_class->fullName, 0x0);
-strcat(propName, "_");
-FullClassNameCat(propName, prop->name, 0x1);
-ListAdd(args, CopyExpression(object));
-ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
-ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
-ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_StopWatching")), args));
-}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Property %s not found in class %s\n", (((void *)0))), propID->string, _class->fullName);
-}
-}
-if(object)
-FreeExpression(object);
-if(watcher)
-FreeExpression(watcher);
-FreeList(watches, FreeIdentifier);
-}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Invalid object specified and not inside a class\n", (((void *)0))));
-}
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "No observer specified and not inside a class\n", (((void *)0))));
+PrintExpression(exp, expString);
+__ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' ');
}
-break;
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't determine type of %s\n", (((void *)0))), expString);
}
+if(inCompiler)
+ApplyAnyObjectLogic(exp);
+if(!notByReference && exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 5 && (!exp->destType || (exp->destType->kind != 3 && exp->destType->kind != 4 && exp->destType->kind != 22 && exp->destType->kind != 23 && exp->destType->kind != 5 && exp->destType->kind != 2 && exp->destType->kind != 1 && exp->destType->kind != 24)))
+{
+exp->byReference = 1;
}
+yylloc = oldyylloc;
}
-extern struct Expression * QBrackets(struct Expression * exp);
-
-extern struct TypeName * QMkType(const char * spec, struct Declarator * decl);
-
-extern struct Declarator * QMkPtrDecl(const char * id);
-
-extern struct Expression * MkExpPointer(struct Expression * expression, struct Identifier * member);
-
-extern struct Expression * QMkExpCond(struct Expression * cond, struct Expression * exp, struct Expression * elseExp);
-
-extern struct Statement * MkFireWatchersStmt(struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches);
-
static void ProcessFunction(struct FunctionDefinition * function)
{
struct Identifier * id = GetDeclId(function->declarator);
char structName[1024];
struct Declarator * funcDecl;
struct Symbol * thisSymbol;
-unsigned int typedObject = 0x0;
+unsigned int typedObject = 0;
if(_class && !_class->base)
{
if(_class && !_class->symbol)
_class->symbol = FindClass(_class->fullName);
classSym = _class ? _class->symbol : (((void *)0));
-typedObject = 0x1;
+typedObject = 1;
}
thisClass = _class;
if(inCompiler && _class)
if(type->classObjectType != 1)
{
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(&symbol->type->__anon1.__anon2.params, (((void *)0)), MkClassType(_class->fullName));
-symbol->type->__anon1.__anon2.staticMethod = 0x1;
+symbol->type->__anon1.__anon2.staticMethod = 1;
symbol->type->__anon1.__anon2.thisClass = (((void *)0));
-symbol->type->extraParam = 0x0;
+symbol->type->extraParam = 0;
}
}
strcpy(className, "__ecereClass_");
-FullClassNameCat(className, _class->fullName, 0x1);
-structName[0] = (char)0;
-FullClassNameCat(structName, _class->fullName, 0x0);
+FullClassNameCat(className, _class->fullName, 1);
+structName[0] = 0;
+FullClassNameCat(structName, _class->fullName, 0);
funcDecl = GetFuncDecl(function->declarator);
if(funcDecl)
{
}
if(!function->propertyNoThis)
{
-struct TypeName * thisParam;
+struct TypeName * thisParam = (((void *)0));
if(type->classObjectType != 1)
{
__ecereInstance1->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier("class"))), __ecereInstance1->qualifiers = MkListOne(MkStructOrUnion(3, MkIdentifier("__ecereNameSpace__ecere__com__Class"), (((void *)0)))), __ecereInstance1;
});
+DeclareStruct(curExternal, "ecere::com::Class", 0, 1);
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*funcDecl->__anon1.function.parameters), (((void *)0)), thisParam);
}
}
}
}
}
-if(inCompiler && _class && (_class->type == 0) && type->classObjectType != 1)
+if(inCompiler && _class && _class->type == 0 && type->classObjectType != 1)
{
struct __ecereNameSpace__ecere__com__DataMember * member = (((void *)0));
struct Expression * exp, * bytePtr;
strcpy(pointerName, "__ecerePointer_");
-FullClassNameCat(pointerName, _class->fullName, 0x0);
+FullClassNameCat(pointerName, _class->fullName, 0);
{
char className[1024];
strcpy(className, "__ecereClass_");
-FullClassNameCat(className, classSym->string, 0x1);
-DeclareClass(classSym, className);
+FullClassNameCat(className, classSym->string, 1);
+DeclareClass(curExternal, classSym, className);
}
bytePtr = QBrackets(MkExpCast(QMkType("char", QMkPtrDecl((((void *)0)))), QMkExpId("this")));
if(_class->fixed)
{
+struct Expression * e;
+
+if(_class->offset && _class->offset == (_class->base->type == 5 ? _class->base->memberOffset : _class->base->structSize))
+{
+e = MkExpClassSize(MkSpecifierName(_class->base->fullName));
+ProcessExpressionType(e);
+}
+else
+{
char string[256];
sprintf(string, "%d", _class->offset);
-exp = QBrackets(MkExpOp(bytePtr, '+', MkExpConstant(string)));
+e = MkExpConstant(string);
+}
+exp = QBrackets(MkExpOp(bytePtr, '+', e));
}
else
{
initializer = MkInitializerAssignment(MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), exp));
{
struct Context * prevContext = curContext;
+struct __ecereNameSpace__ecere__sys__OldList * list;
curContext = function->body->__anon1.compound.context;
-decl = MkDeclaration(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkListOne(MkInitDeclarator(QMkPtrDecl(pointerName), initializer)));
+decl = MkDeclaration((list = MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0))))), MkListOne(MkInitDeclarator(QMkPtrDecl(pointerName), initializer)));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*list), (((void *)0)), MkSpecifierExtended(MkExtDeclAttrib(MkAttrib(ATTRIB, MkListOne(MkAttribute(__ecereNameSpace__ecere__sys__CopyString("unused"), (((void *)0))))))));
curContext = prevContext;
}
decl->symbol = (((void *)0));
}
if(function->declarator)
{
-ProcessDeclarator(function->declarator);
+ProcessDeclarator(function->declarator, 1);
}
topContext = oldTopContext;
thisClass = oldThisClass;
}
-extern void FreeSymbol(struct Symbol * symbol);
-
-void __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Remove(struct __ecereNameSpace__ecere__sys__BinaryTree * this, struct __ecereNameSpace__ecere__sys__BTNode * node);
-
static void ProcessClass(struct __ecereNameSpace__ecere__sys__OldList * definitions, struct Symbol * symbol)
{
struct ClassDef * def;
if(regClass)
thisClass = regClass;
-ProcessDeclaration(def->__anon1.decl);
+ProcessDeclaration(def->__anon1.decl, symbol ? 1 : 0);
thisClass = backThisClass;
}
}
}
}
-void DeclareFunctionUtil(const char * s)
-{
-struct __ecereNameSpace__ecere__com__GlobalFunction * function = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, s);
-
-if(function)
-{
-char name[1024];
-
-name[0] = (char)0;
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1 && (!function->dataType || !function->dataType->dllExport))
-strcpy(name, "__ecereFunction_");
-FullClassNameCat(name, s, 0x0);
-DeclareFunction(function, name);
-}
-}
-
-extern struct __ecereNameSpace__ecere__com__Instance * GetPrivateModule(void);
-
-void ComputeDataTypes()
-{
-struct External * external;
-struct External * temp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
-struct External * after = (((void *)0));
-
-currentClass = (((void *)0));
-containerClass = __ecereNameSpace__ecere__com__eSystem_FindClass(GetPrivateModule(), "Container");
-for(external = (*ast).first; external; external = external->next)
-{
-if(external->type == 1)
-{
-struct Declaration * decl = external->__anon1.declaration;
-
-if(decl)
-{
-struct __ecereNameSpace__ecere__sys__OldList * decls = decl->__anon1.__anon1.declarators;
-
-if(decls)
-{
-struct InitDeclarator * initDecl = (*decls).first;
-
-if(initDecl)
-{
-struct Declarator * declarator = initDecl->declarator;
-
-if(declarator && declarator->type == 1)
-{
-struct Identifier * id = declarator->__anon1.identifier;
-
-if(id && id->string)
-{
-if(!strcmp(id->string, "uintptr_t") || !strcmp(id->string, "intptr_t") || !strcmp(id->string, "size_t") || !strcmp(id->string, "ssize_t"))
-{
-external->symbol->id = -1001, external->symbol->idCode = -1001;
-after = external;
-}
-}
-}
-}
-}
-}
-}
-}
-{
-struct External * e = MkExternalDeclaration(MkDeclaration(MkListOne(MkStructOrUnion(3, MkIdentifier("__ecereNameSpace__ecere__com__Instance"), (((void *)0)))), (((void *)0))));
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), after, e);
-after = e;
-}
-temp->symbol = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-
-__ecereInstance1->id = -1000, __ecereInstance1->idCode = -1000, __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), after, temp);
-curExternal = temp;
-DeclareFunctionUtil("eSystem_New");
-DeclareFunctionUtil("eSystem_New0");
-DeclareFunctionUtil("eSystem_Renew");
-DeclareFunctionUtil("eSystem_Renew0");
-DeclareFunctionUtil("eSystem_Delete");
-DeclareFunctionUtil("eClass_GetProperty");
-DeclareFunctionUtil("eClass_SetProperty");
-DeclareFunctionUtil("eInstance_FireSelfWatchers");
-DeclareFunctionUtil("eInstance_SetMethod");
-DeclareFunctionUtil("eInstance_IncRef");
-DeclareFunctionUtil("eInstance_StopWatching");
-DeclareFunctionUtil("eInstance_Watch");
-DeclareFunctionUtil("eInstance_FireWatchers");
-DeclareStruct("ecere::com::Class", 0x0);
-DeclareStruct("ecere::com::Instance", 0x0);
-DeclareStruct("ecere::com::Property", 0x0);
-DeclareStruct("ecere::com::DataMember", 0x0);
-DeclareStruct("ecere::com::Method", 0x0);
-DeclareStruct("ecere::com::SerialBuffer", 0x0);
-DeclareStruct("ecere::com::ClassTemplateArgument", 0x0);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*ast), temp);
-for(external = (*ast).first; external; external = external->next)
-{
-afterExternal = curExternal = external;
-if(external->type == 0)
-{
-currentClass = external->__anon1.function->_class;
-ProcessFunction(external->__anon1.function);
-}
-else if(external->type == 1)
-{
-currentClass = (((void *)0));
-if(external->__anon1.declaration)
-ProcessDeclaration(external->__anon1.declaration);
-}
-else if(external->type == 2)
-{
-struct ClassDefinition * _class = external->__anon1._class;
-
-currentClass = external->symbol->__anon1.registered;
-if(_class->definitions)
-{
-ProcessClass(_class->definitions, _class->symbol);
-}
-if(inCompiler)
-{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*ast), external);
-((external ? (__ecereClass_External->Destructor ? __ecereClass_External->Destructor((void *)external) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(external)) : 0), external = 0);
-}
-}
-else if(external->type == 4)
-{
-thisNameSpace = external->__anon1.id->string;
-}
-}
-currentClass = (((void *)0));
-thisNameSpace = (((void *)0));
-curExternal = (((void *)0));
-((temp->symbol ? (__ecereClass_Symbol->Destructor ? __ecereClass_Symbol->Destructor((void *)temp->symbol) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(temp->symbol)) : 0), temp->symbol = 0);
-((temp ? (__ecereClass_External->Destructor ? __ecereClass_External->Destructor((void *)temp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(temp)) : 0), temp = 0);
-}
-
-extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_RegisterFunction(const char * name, const 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, const char * name, const 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__Instance * __thisModule;
-
void __ecereRegisterModule_pass15(struct __ecereNameSpace__ecere__com__Instance * module)
{
struct __ecereNameSpace__ecere__com__Class __attribute__((unused)) * class;
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ComputeClassMembers", "void ComputeClassMembers(ecere::com::Class _class, bool isMember)", ComputeClassMembers, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ComputeModuleClasses", "void ComputeModuleClasses(ecere::com::Module module)", ComputeModuleClasses, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ComputeTypeSize", "int ComputeTypeSize(Type type)", ComputeTypeSize, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("AddMembers", "int AddMembers(ecere::sys::OldList * declarations, ecere::com::Class _class, bool isMember, uint * retSize, ecere::com::Class topClass, bool * addedPadding)", AddMembers, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareStruct", "void DeclareStruct(const char * name, bool skipNoHead)", DeclareStruct, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareProperty", "void DeclareProperty(ecere::com::Property prop, char * setName, char * getName)", DeclareProperty, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("AddMembers", "int AddMembers(External neededBy, ecere::sys::OldList * declarations, ecere::com::Class _class, bool isMember, uint * retSize, ecere::com::Class topClass, bool * addedPadding)", AddMembers, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareStruct", "External DeclareStruct(External neededBy, const char * name, bool skipNoHead, bool needDereference)", DeclareStruct, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_DeclareStruct", "External _DeclareStruct(External neededBy, const char * name, bool skipNoHead, bool needDereference, bool fwdDecl)", _DeclareStruct, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareProperty", "void DeclareProperty(External neededBy, ecere::com::Property prop, char * setName, char * getName)", DeclareProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("Dereference", "Type Dereference(Type source)", Dereference, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessMemberInitData", "void ProcessMemberInitData(MemberInit member, ecere::com::Class _class, ecere::com::Class * curClass, ecere::com::DataMember * curMember, ecere::com::DataMember * subMemberStack, int * subMemberStackPos)", ProcessMemberInitData, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessInstantiationType", "void ProcessInstantiationType(Instantiation inst)", ProcessInstantiationType, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareType", "void DeclareType(External neededFor, Type type, bool needDereference, bool forFunctionDef)", DeclareType, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareTypeForwardDeclare", "void DeclareTypeForwardDeclare(External neededFor, Type type, bool needDereference, bool forFunctionDef)", DeclareTypeForwardDeclare, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindTemplateArg", "ecere::com::ClassTemplateArgument * FindTemplateArg(ecere::com::Class _class, TemplateParameter param)", FindTemplateArg, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetupTemplatesContext", "Context SetupTemplatesContext(ecere::com::Class _class)", SetupTemplatesContext, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FinishTemplatesContext", "void FinishTemplatesContext(Context context)", FinishTemplatesContext, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessMethodType", "void ProcessMethodType(ecere::com::Method method)", ProcessMethodType, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessPropertyType", "void ProcessPropertyType(ecere::com::Property prop)", ProcessPropertyType, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareMethod", "void DeclareMethod(ecere::com::Method method, const char * name)", DeclareMethod, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareMethod", "void DeclareMethod(External neededFor, ecere::com::Method method, const char * name)", DeclareMethod, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ReplaceThisClass", "char * ReplaceThisClass(ecere::com::Class _class)", ReplaceThisClass, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ReplaceThisClassType", "Type ReplaceThisClassType(ecere::com::Class _class)", ReplaceThisClassType, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ReplaceThisClassSpecifiers", "void ReplaceThisClassSpecifiers(ecere::sys::OldList specs, ecere::com::Class _class)", ReplaceThisClassSpecifiers, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareFunction", "bool DeclareFunction(ecere::com::GlobalFunction function, char * name)", DeclareFunction, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareGlobalData", "void DeclareGlobalData(GlobalData data)", DeclareGlobalData, module, 2);
-class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "Conversion", 0, sizeof(struct Conversion), 0, 0, 0, module, 2, 1);
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareFunction", "bool DeclareFunction(External neededFor, ecere::com::GlobalFunction function, char * name)", DeclareFunction, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareGlobalData", "void DeclareGlobalData(External neededFor, GlobalData data)", DeclareGlobalData, module, 2);
+class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "Conversion", 0, sizeof(struct Conversion), 0, (void *)0, (void *)0, module, 2, 1);
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application && class)
__ecereClass_Conversion = class;
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MatchTypes", "bool MatchTypes(Type source, Type dest, ecere::sys::OldList conversions, ecere::com::Class owningClassSource, ecere::com::Class owningClassDest, bool doConversion, bool enumBaseType, bool acceptReversedParams, bool isConversionExploration, bool warnConst)", MatchTypes, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MatchWithEnums_NameSpace", "bool MatchWithEnums_NameSpace(ecere::com::NameSpace nameSpace, Expression sourceExp, Type dest, char * string, ecere::sys::OldList conversions)", MatchWithEnums_NameSpace, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ReplaceExpContents", "void ReplaceExpContents(Expression checkedExp, Expression newExp)", ReplaceExpContents, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ApplyAnyObjectLogic", "void ApplyAnyObjectLogic(Expression e)", ApplyAnyObjectLogic, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ApplyLocation", "void ApplyLocation(Expression exp, Location loc)", ApplyLocation, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("RelatedUnits", "bool RelatedUnits(ecere::com::Class c1, ecere::com::Class c2)", RelatedUnits, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessExpressionType", "void ProcessExpressionType(Expression exp)", ProcessExpressionType, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareFunctionUtil", "void DeclareFunctionUtil(const String s)", DeclareFunctionUtil, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclareFunctionUtil", "void DeclareFunctionUtil(External neededBy, const String s)", DeclareFunctionUtil, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ComputeDataTypes", "void ComputeDataTypes(void)", ComputeDataTypes, module, 1);
}
-void __ecereUnregisterModule_pass15(struct __ecereNameSpace__ecere__com__Instance * module)
-{
-
-}
-
Ecere Software / sdk / blobdiff