/* Code generated from eC source file: ast.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;
#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
+};
-#if /*defined(_W64) || */(defined(__WORDSIZE) && __WORDSIZE == 8) || defined(__x86_64__)
-#define _64BIT 1
-#else
-#define _64BIT 0
-#endif
-
-#define arch_PointerSize sizeof(void *)
-#define structSize_Instance (_64BIT ? 24 : 12)
-#define structSize_OldLink (_64BIT ? 24 : 12)
-#define structSize_NamedLink (_64BIT ? 32 : 16)
+extern char * yytext;
-extern void * __ecereNameSpace__ecere__com__eSystem_New(unsigned int size);
+const char * defaultNameSpace;
-extern void * __ecereNameSpace__ecere__com__eSystem_New0(unsigned int size);
+int defaultNameSpaceLen;
-extern void * __ecereNameSpace__ecere__com__eSystem_Renew(void * memory, unsigned int size);
+unsigned int strictNameSpaces;
-extern void * __ecereNameSpace__ecere__com__eSystem_Renew0(void * memory, unsigned int size);
+int declMode = 2;
-extern void __ecereNameSpace__ecere__com__eSystem_Delete(void * memory);
+int structDeclMode = 2;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
+int defaultDeclMode = 2;
-struct __ecereNameSpace__ecere__sys__BTNode;
+const char * currentNameSpace;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BinaryTree;
+int currentNameSpaceLen;
-struct __ecereNameSpace__ecere__sys__BinaryTree
+struct ContextStringPair
{
-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);
+char * string, * context;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldList;
+struct __ecereNameSpace__ecere__com__Instance * intlStrings;
+
+extern unsigned int inCompiler;
+
+extern const char * i18nModuleName;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__com__Iterator_data;
+
+extern unsigned int buildingECERECOMModule;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__sys__BinaryTree_first;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__sys__BTNode_next;
+
+extern int targetBits;
+
+extern int targetPlatform;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__com__MapIterator_map;
+
+extern struct __ecereNameSpace__ecere__com__Property * __ecereProp___ecereNameSpace__ecere__com__MapIterator_key;
+
+extern int yyparse();
+
+extern int yylex();
struct __ecereNameSpace__ecere__sys__OldList
{
unsigned int circ;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Method;
-
-struct __ecereNameSpace__ecere__com__Method
+struct __ecereNameSpace__ecere__com__DataValue
{
-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;
+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 struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Property;
-
-struct __ecereNameSpace__ecere__com__Property
+struct __ecereNameSpace__ecere__com__SerialBuffer
{
-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;
+unsigned char * _buffer;
+unsigned int count;
+unsigned int _size;
+unsigned int pos;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_CodePosition;
+extern void * __ecereNameSpace__ecere__com__eSystem_New(unsigned int size);
+
+extern void * __ecereNameSpace__ecere__com__eSystem_New0(unsigned int size);
+
+extern void * __ecereNameSpace__ecere__com__eSystem_Renew(void * memory, unsigned int size);
+
+extern void * __ecereNameSpace__ecere__com__eSystem_Renew0(void * memory, unsigned int size);
+
+extern void __ecereNameSpace__ecere__com__eSystem_Delete(void * memory);
struct CodePosition
{
int included;
} __attribute__ ((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 void * memcpy(void * , const void * , size_t size);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attrib;
+extern int strcmp(const char * , const char * );
-struct Attrib
-{
-struct Location loc;
-int type;
-struct __ecereNameSpace__ecere__sys__OldList * attribs;
-} __attribute__ ((gcc_struct));
+extern char * __ecereNameSpace__ecere__sys__CopyString(const char * string);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ExtDecl;
+struct ClassImport;
-struct ExtDecl
-{
-struct Location loc;
-int type;
-union
-{
-char * s;
-struct Attrib * attr;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
+extern char * QMkString(const char * source);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDefinition;
+extern char * strstr(const char * , const char * );
-struct ClassDefinition
+extern char * __ecereNameSpace__ecere__sys__RSearchString(const char * buffer, const char * subStr, int maxLen, unsigned int matchCase, unsigned int matchWord);
+
+struct __ecereNameSpace__ecere__com__DefinedExpression;
+
+extern void Compiler_Warning(const char * format, ...);
+
+extern const char * __ecereNameSpace__ecere__GetTranslatedString(const char * name, const char * string, const char * stringAndContext);
+
+extern int sprintf(char * , const char * , ...);
+
+extern void Compiler_Error(const char * format, ...);
+
+struct __ecereNameSpace__ecere__com__LinkList
{
-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;
+void * first;
+void * last;
+int count;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Context;
+extern char * strncpy(char * , const char * , size_t n);
-struct Context
+extern void ImportModule(const char * name, int importType, int importAccess, unsigned int loadDllOnly);
+
+extern char * strcpy(char * , const char * );
+
+extern char * strcat(char * , const char * );
+
+extern int strncmp(const char * , const char * , size_t n);
+
+extern char * strchr(const char * , int);
+
+extern long long strtoll(const char * nptr, char * * endptr, int base);
+
+extern unsigned long strtoul(const char * nptr, char * * endptr, int base);
+
+extern void FullClassNameCat(char * output, const char * className, unsigned int includeTemplateParams);
+
+struct __ecereNameSpace__ecere__com__CustomAVLTree
{
-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;
+struct __ecereNameSpace__ecere__com__AVLNode * root;
+int count;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Instantiation;
+extern const char * GetSourceFile(void);
-struct Instantiation
+extern const char * GetOutputFile(void);
+
+extern char * __ecereNameSpace__ecere__sys__ChangeExtension(const char * string, const char * ext, char * output);
+
+extern char * __ecereNameSpace__ecere__sys__GetSlashPathBuffer(char * d, const char * p);
+
+struct __ecereNameSpace__ecere__com__IteratorPointer;
+
+struct __ecereNameSpace__ecere__com__GlobalFunction;
+
+const char * GetYYText()
{
-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));
+return yytext;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declaration;
+void SetStrictNameSpaces(unsigned int b)
+{
+strictNameSpaces = b;
+}
-struct Declaration
+void SetDeclMode(int accessMode)
{
-struct Declaration * prev;
-struct Declaration * next;
-struct Location loc;
-int type;
-union
+structDeclMode = declMode = accessMode;
+}
+
+void SetDefaultDeclMode(int accessMode)
{
-struct
+defaultDeclMode = accessMode;
+}
+
+void ParseEc()
{
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct __ecereNameSpace__ecere__sys__OldList * declarators;
-} __attribute__ ((gcc_struct));
-struct Instantiation * inst;
-struct
+yyparse();
+}
+
+int LexEc()
{
-struct Identifier * id;
-struct Expression * exp;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-struct Specifier * extStorage;
-struct Symbol * symbol;
-int declMode;
-} __attribute__ ((gcc_struct));
+return yylex();
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Statement;
+extern struct __ecereNameSpace__ecere__sys__OldList * excludedSymbols;
-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
+extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* FreeFunction)(void * ));
+
+extern struct __ecereNameSpace__ecere__sys__OldList * imports;
+
+extern struct __ecereNameSpace__ecere__sys__OldList * ast;
+
+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_Clear(struct __ecereNameSpace__ecere__sys__OldList * this);
+
+struct __ecereNameSpace__ecere__sys__OldList * MkList()
{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-struct Statement * elseStmt;
-} __attribute__ ((gcc_struct)) ifStmt;
-struct
+return __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__OldList) * (1));
+}
+
+struct Location
{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) switchStmt;
-struct
+struct CodePosition start;
+struct CodePosition end;
+} __attribute__ ((gcc_struct));
+
+void SetDefaultNameSpace(const char * s)
{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) whileStmt;
-struct
+defaultNameSpace = s;
+defaultNameSpaceLen = s ? strlen(s) : 0;
+}
+
+void SetCurrentNameSpace(const char * s)
{
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) doWhile;
-struct
+currentNameSpace = s;
+currentNameSpaceLen = s ? strlen(s) : 0;
+}
+
+void SetAST(struct __ecereNameSpace__ecere__sys__OldList * list)
{
-struct Statement * init;
-struct Statement * check;
-struct __ecereNameSpace__ecere__sys__OldList * increment;
-struct Statement * stmt;
-} __attribute__ ((gcc_struct)) forStmt;
-struct
+ast = list;
+}
+
+struct __ecereNameSpace__ecere__sys__OldList * GetAST()
{
-struct Identifier * id;
-} __attribute__ ((gcc_struct)) gotoStmt;
-struct
+return ast;
+}
+
+struct __ecereNameSpace__ecere__sys__OldList * MkListOne(void * item)
{
-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 __ecereNameSpace__ecere__sys__OldList * list = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__OldList) * (1));
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*list), item);
+return list;
+}
+
+void ListAdd(struct __ecereNameSpace__ecere__sys__OldList * list, void * item)
{
-struct Expression * watcher;
-struct Expression * object;
-struct __ecereNameSpace__ecere__sys__OldList * watches;
-} __attribute__ ((gcc_struct)) _watch;
-struct
+if(item)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(list, item);
+}
+
+void ListAddFront(struct __ecereNameSpace__ecere__sys__OldList * list, void * item)
{
-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));
-} __attribute__ ((gcc_struct));
+if(item)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(list, (((void *)0)), item);
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TypeName;
+extern struct Location yylloc;
-struct TypeName
+struct Attrib
{
-struct TypeName * prev;
-struct TypeName * next;
struct Location loc;
-struct __ecereNameSpace__ecere__sys__OldList * qualifiers;
-struct Declarator * declarator;
-int classObjectType;
-struct Expression * bitCount;
+int type;
+struct __ecereNameSpace__ecere__sys__OldList * attribs;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Initializer;
-
-struct Initializer
+struct ExtDecl
{
-struct Initializer * prev;
-struct Initializer * next;
struct Location loc;
int type;
union
{
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * list;
-} __attribute__ ((gcc_struct));
-unsigned int isConstant;
-struct Identifier * id;
+char * s;
+struct Attrib * attr;
+} __attribute__ ((gcc_struct)) __anon1;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DataValue;
+struct Context;
-struct __ecereNameSpace__ecere__com__DataValue
-{
-union
+extern struct Context * curContext;
+
+extern struct Context * globalContext;
+
+extern void FreeContext(struct Context * context);
+
+struct __ecereNameSpace__ecere__com__Class;
+
+struct __ecereNameSpace__ecere__com__Instance
{
-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));
+void * * _vTbl;
+struct __ecereNameSpace__ecere__com__Class * _class;
+int _refCount;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Expression;
+extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name);
-struct Expression
-{
-struct Expression * prev;
-struct Expression * next;
-struct Location loc;
-int type;
-union
-{
-struct
+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 * thisClass;
+
+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 struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__sys__FileOpen(const char * fileName, int mode);
+
+struct __ecereNameSpace__ecere__com__MapIterator
{
-char * constant;
-struct Identifier * identifier;
+struct __ecereNameSpace__ecere__com__Instance * container;
+struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
} __attribute__ ((gcc_struct));
-struct Statement * compound;
-struct Instantiation * instance;
-struct
+
+struct __ecereNameSpace__ecere__com__Iterator
{
-char * string;
-unsigned int intlString;
+struct __ecereNameSpace__ecere__com__Instance * container;
+struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
} __attribute__ ((gcc_struct));
-struct __ecereNameSpace__ecere__sys__OldList * list;
-struct
-{
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct Declarator * decl;
-} __attribute__ ((gcc_struct)) _classExp;
-struct
-{
-struct Identifier * id;
-} __attribute__ ((gcc_struct)) classData;
-struct
-{
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * arguments;
-struct Location argLoc;
-} __attribute__ ((gcc_struct)) call;
-struct
-{
-struct Expression * exp;
-struct __ecereNameSpace__ecere__sys__OldList * index;
-} __attribute__ ((gcc_struct)) index;
+
+int __ecereVMethodID___ecereNameSpace__ecere__com__Container_Add;
+
+int __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(struct __ecereNameSpace__ecere__com__Instance * this, const char * format, ...);
+
+extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpace__ecere__com__Instance * instance);
+
+int __ecereVMethodID___ecereNameSpace__ecere__com__Container_Free;
+
+struct __ecereNameSpace__ecere__com__Instance * __ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_map(struct __ecereNameSpace__ecere__com__MapIterator * this);
+
+void __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(struct __ecereNameSpace__ecere__com__MapIterator * this, struct __ecereNameSpace__ecere__com__Instance * value);
+
+const uint64 __ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_key(struct __ecereNameSpace__ecere__com__MapIterator * this);
+
+unsigned int __ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(struct __ecereNameSpace__ecere__com__Iterator * this, const uint64 index, unsigned int create);
+
+uint64 __ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(struct __ecereNameSpace__ecere__com__Iterator * this);
+
+void __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(struct __ecereNameSpace__ecere__com__Iterator * this, uint64 value);
+
+unsigned int __ecereMethod___ecereNameSpace__ecere__com__Iterator_Next();
+
+void __ecereDestroyModuleInstances_ast()
+{
+(__ecereNameSpace__ecere__com__eInstance_DecRef(intlStrings), intlStrings = 0);
+}
+
+struct ModuleImport;
+
+extern struct ModuleImport * mainModule;
+
+struct ModuleImport
+{
+struct ModuleImport * prev;
+struct ModuleImport * next;
+char * name;
+struct __ecereNameSpace__ecere__sys__OldList classes;
+struct __ecereNameSpace__ecere__sys__OldList functions;
+int importType;
+int importAccess;
+} __attribute__ ((gcc_struct));
+
+struct Expression;
+
+extern struct Expression * QMkExpId(const char * id);
+
+extern void PrintExpression(struct Expression * exp, char * string);
+
+extern void FreeExpression(struct Expression * exp);
+
+extern struct Expression * CopyExpression(struct Expression * exp);
+
+extern void ProcessExpressionType(struct Expression * exp);
+
+extern void ComputeExpression(struct Expression * exp);
+
+struct External;
+
+extern void FreeExternal(struct External * external);
+
+extern struct External * curExternal;
+
+struct __ecereNameSpace__ecere__sys__BTNode;
+
+struct __ecereNameSpace__ecere__sys__BTNode
+{
+uintptr_t key;
+struct __ecereNameSpace__ecere__sys__BTNode * parent;
+struct __ecereNameSpace__ecere__sys__BTNode * left;
+struct __ecereNameSpace__ecere__sys__BTNode * right;
+int depth;
+} __attribute__ ((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;
+
+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_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);
+
+struct DBIndexItem;
+
+struct Symbol;
+
+extern void FreeSymbol(struct Symbol * symbol);
+
+extern struct Symbol * FindSymbol(const char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace);
+
+extern void DeclareClass(struct External * neededFor, struct Symbol * classSym, const char * className);
+
+struct DBTableDef
+{
+char * name;
+struct Symbol * symbol;
+struct __ecereNameSpace__ecere__sys__OldList * definitions;
+int declMode;
+} __attribute__ ((gcc_struct));
+
+struct Type;
+
+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 FreeType(struct Type * type);
+
+extern void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
+
+struct Declarator;
+
+extern void FreeDeclarator(struct Declarator * decl);
+
+extern struct Declarator * GetFuncDecl(struct Declarator * decl);
+
+extern char * StringFromSpecDecl(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
+
+struct TemplateDatatype
+{
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct Declarator * decl;
+} __attribute__ ((gcc_struct));
+
+extern struct Declarator * SpecDeclFromString(const char * string, struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * baseDecl);
+
+struct Specifier;
+
+extern void FreeSpecifier(struct Specifier * spec);
+
+extern struct Specifier * CopySpecifier(struct Specifier * spec);
+
+struct __ecereNameSpace__ecere__sys__OldList * MkSpecsClass(struct Specifier * _class)
+{
+struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
+
+ListAdd(list, _class);
+return list;
+}
+
+struct Specifier * _MkSpecifierName(const char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs);
+
+struct Specifier * MkSpecifierName(const char * name)
+{
+return _MkSpecifierName(name, (((void *)0)), (((void *)0)));
+}
+
+struct Specifier * MkSpecifierNameArgs(const char * name, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
+{
+return _MkSpecifierName(name, (((void *)0)), templateArgs);
+}
+
+struct TemplateArgument;
+
+extern void FreeTemplateArgument(struct TemplateArgument * arg);
+
+struct ClassFunction;
+
+extern void FreeClassFunction(struct ClassFunction * func);
+
+struct __ecereNameSpace__ecere__sys__NamedLink64;
+
+struct __ecereNameSpace__ecere__sys__NamedLink64
+{
+struct __ecereNameSpace__ecere__sys__NamedLink64 * prev;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * next;
+char * name;
+long long data;
+} __attribute__ ((gcc_struct));
+
+struct __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));
+
+int CheckType(const char * text);
+
+int check_type()
+{
+return CheckType(yytext);
+}
+
+struct DBTableEntry;
+
+struct MemberInit;
+
+struct Pointer;
+
+struct Pointer
+{
+struct Pointer * prev;
+struct Pointer * next;
+struct Location loc;
+struct __ecereNameSpace__ecere__sys__OldList * qualifiers;
+struct Pointer * pointer;
+} __attribute__ ((gcc_struct));
+
+struct PropertyWatch;
+
+struct Symbol * FindType(struct Context * ctx, const char * name);
+
+struct __ecereNameSpace__ecere__com__Method;
+
+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;
+} __attribute__ ((gcc_struct));
+
+struct Symbol
+{
+char * string;
+struct Symbol * parent;
+struct Symbol * left;
+struct Symbol * right;
+int depth;
+struct Type * type;
+union
+{
+struct __ecereNameSpace__ecere__com__Method * method;
+struct __ecereNameSpace__ecere__com__Property * _property;
+struct __ecereNameSpace__ecere__com__Class * registered;
+} __attribute__ ((gcc_struct)) __anon1;
+unsigned int notYetDeclared;
+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;
+unsigned int mustRegister;
+} __attribute__ ((gcc_struct));
+
+extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_AddMethod(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, void * function, int declMode);
+
+struct __ecereNameSpace__ecere__com__DataMember;
+
+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__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));
+
+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 __ecereNameSpace__ecere__com__Module;
+
+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__Instance * privateModule;
+
+extern struct __ecereNameSpace__ecere__com__DefinedExpression * __ecereNameSpace__ecere__com__eSystem_RegisterDefine(const char * name, const char * value, struct __ecereNameSpace__ecere__com__Instance * module, int declMode);
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(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);
+
+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 Enumerator;
+
+struct Initializer;
+
+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));
+
+struct Attribute;
+
+struct Attribute
+{
+struct Attribute * prev;
+struct Attribute * next;
+struct Location loc;
+char * attr;
struct Expression * exp;
-struct Identifier * member;
-int memberType;
-unsigned int thisPtr;
-} __attribute__ ((gcc_struct)) member;
-struct
+} __attribute__ ((gcc_struct));
+
+struct AsmField;
+
+struct __ecereNameSpace__ecere__sys__BinaryTree;
+
+struct __ecereNameSpace__ecere__sys__BinaryTree
{
-int op;
-struct Expression * exp1;
-struct Expression * exp2;
-} __attribute__ ((gcc_struct)) op;
-struct TypeName * typeName;
-struct Specifier * _class;
-struct
+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));
+
+struct __ecereNameSpace__ecere__com__DataMember
{
-struct TypeName * typeName;
-struct Expression * exp;
-} __attribute__ ((gcc_struct)) cast;
-struct
+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;
+} __attribute__ ((gcc_struct));
+
+unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(struct __ecereNameSpace__ecere__sys__BinaryTree * this, struct __ecereNameSpace__ecere__sys__BTNode * node);
+
+struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(struct __ecereNameSpace__ecere__sys__BinaryTree * this, const char * key);
+
+struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(struct __ecereNameSpace__ecere__sys__BinaryTree * this);
+
+struct TemplateParameter;
+
+struct TemplatedType
{
-struct Expression * cond;
-struct __ecereNameSpace__ecere__sys__OldList * exp;
-struct Expression * elseExp;
-} __attribute__ ((gcc_struct)) cond;
-struct
+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));
+
+struct Type
{
-struct TypeName * typeName;
-struct Expression * size;
-} __attribute__ ((gcc_struct)) _new;
-struct
+struct Type * prev;
+struct Type * next;
+int refCount;
+union
{
-struct TypeName * typeName;
-struct Expression * size;
-struct Expression * exp;
-} __attribute__ ((gcc_struct)) _renew;
+struct Symbol * _class;
struct
{
-char * table;
-struct Identifier * id;
-} __attribute__ ((gcc_struct)) db;
+struct __ecereNameSpace__ecere__sys__OldList members;
+char * enumName;
+} __attribute__ ((gcc_struct)) __anon1;
struct
{
-struct Expression * ds;
-struct Expression * name;
-} __attribute__ ((gcc_struct)) dbopen;
+struct Type * returnType;
+struct __ecereNameSpace__ecere__sys__OldList params;
+struct Symbol * thisClass;
+unsigned int staticMethod;
+struct TemplateParameter * thisClassTemplate;
+} __attribute__ ((gcc_struct)) __anon2;
struct
{
-struct TypeName * typeName;
-struct Initializer * initializer;
-} __attribute__ ((gcc_struct)) initializer;
+struct __ecereNameSpace__ecere__com__Method * method;
+struct __ecereNameSpace__ecere__com__Class * methodClass;
+struct __ecereNameSpace__ecere__com__Class * usedClass;
+} __attribute__ ((gcc_struct)) __anon3;
struct
{
-struct Expression * exp;
-struct TypeName * typeName;
-} __attribute__ ((gcc_struct)) vaArg;
-} __attribute__ ((gcc_struct));
-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;
+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;
+struct __ecereNameSpace__ecere__com__Class * thisClassFrom;
+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;
+unsigned int pointerAlignment : 1;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateDatatype;
+struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, const char * name);
-struct TemplateDatatype
+void CopyTypeInto(struct Type * type, struct Type * src)
{
-struct __ecereNameSpace__ecere__sys__OldList * specifiers;
-struct Declarator * decl;
-} __attribute__ ((gcc_struct));
+*type = *src;
+type->name = __ecereNameSpace__ecere__sys__CopyString(src->name);
+type->typeName = __ecereNameSpace__ecere__sys__CopyString(src->typeName);
+type->refCount = 1;
+if(src->kind == 15)
+{
+struct __ecereNameSpace__ecere__sys__NamedLink64 * member;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateArgument;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&type->__anon1.__anon1.members);
+for(member = src->__anon1.__anon1.members.first; member; member = member->next)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->__anon1.__anon1.members, __extension__ ({
+struct __ecereNameSpace__ecere__sys__NamedLink64 * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__NamedLink64));
-struct TemplateArgument
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(member->name), __ecereInstance1->data = member->data, __ecereInstance1;
+}));
+}
+type->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(src->__anon1.__anon1.enumName);
+}
+else if(src->kind == 9 || src->kind == 10)
{
-struct TemplateArgument * prev;
-struct TemplateArgument * next;
-struct Location loc;
-struct Identifier * name;
-int type;
-union
+struct Type * member;
+
+for(member = type->__anon1.__anon1.members.first; member; member = member->next)
+member->refCount++;
+type->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(src->__anon1.__anon1.enumName);
+}
+else if(src->kind == 11)
{
-struct Expression * expression;
-struct Identifier * identifier;
-struct TemplateDatatype * templateDatatype;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
+struct Type * param;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateParameter;
+type->__anon1.__anon2.returnType->refCount++;
+for(param = type->__anon1.__anon2.params.first; param; param = param->next)
+param->refCount++;
+}
+else if(src->kind == 13 || src->kind == 12)
+{
+type->__anon1.type->refCount++;
+if(src->kind == 12)
+{
+if(type->__anon1.__anon4.arraySizeExp)
+type->__anon1.__anon4.arraySizeExp = CopyExpression(type->__anon1.__anon4.arraySizeExp);
+}
+}
+}
-struct TemplateParameter
+struct Identifier;
+
+struct Identifier
{
-struct TemplateParameter * prev;
-struct TemplateParameter * next;
+struct Identifier * prev;
+struct Identifier * next;
struct Location loc;
-int type;
-struct Identifier * identifier;
-union
-{
-struct TemplateDatatype * dataType;
-int memberType;
-} __attribute__ ((gcc_struct));
-struct TemplateArgument * defaultArgument;
-const char * dataTypeString;
-struct Type * baseType;
+struct Symbol * classSym;
+struct Specifier * _class;
+char * string;
+struct Identifier * badID;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Specifier;
+struct Enumerator
+{
+struct Enumerator * prev;
+struct Enumerator * next;
+struct Location loc;
+struct Identifier * id;
+struct Expression * exp;
+} __attribute__ ((gcc_struct));
struct Specifier
{
char * name;
struct Symbol * symbol;
struct __ecereNameSpace__ecere__sys__OldList * templateArgs;
-} __attribute__ ((gcc_struct));
+struct Specifier * nsSpec;
+} __attribute__ ((gcc_struct)) __anon1;
struct
{
struct Identifier * id;
struct __ecereNameSpace__ecere__sys__OldList * baseSpecs;
struct __ecereNameSpace__ecere__sys__OldList * definitions;
unsigned int addNameSpace;
-struct Context * ctx;
-struct ExtDecl * extDeclStruct;
-} __attribute__ ((gcc_struct));
-struct Expression * expression;
-struct Specifier * _class;
-struct TemplateParameter * templateParameter;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Identifier;
-
-struct Identifier
-{
-struct Identifier * prev;
-struct Identifier * next;
-struct Location loc;
-struct Symbol * classSym;
-struct Specifier * _class;
-char * string;
-struct Identifier * badID;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Pointer;
-
-struct Pointer
-{
-struct Pointer * prev;
-struct Pointer * next;
-struct Location loc;
-struct __ecereNameSpace__ecere__sys__OldList * qualifiers;
-struct Pointer * pointer;
+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));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declarator;
-
struct Declarator
{
struct Declarator * prev;
{
struct ExtDecl * extended;
} __attribute__ ((gcc_struct)) extended;
-} __attribute__ ((gcc_struct));
+} __attribute__ ((gcc_struct)) __anon1;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_FunctionDefinition;
-
-struct FunctionDefinition
+struct Initializer
{
-struct FunctionDefinition * prev;
-struct FunctionDefinition * next;
+struct Initializer * prev;
+struct Initializer * next;
struct Location loc;
-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;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableDef;
-
-struct DBTableDef
+int type;
+union
{
-char * name;
-struct Symbol * symbol;
-struct __ecereNameSpace__ecere__sys__OldList * definitions;
-int declMode;
+struct Expression * exp;
+struct __ecereNameSpace__ecere__sys__OldList * list;
+} __attribute__ ((gcc_struct)) __anon1;
+unsigned int isConstant;
+struct Identifier * id;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_External;
-
-struct External
+struct TemplateArgument
{
-struct External * prev;
-struct External * next;
+struct TemplateArgument * prev;
+struct TemplateArgument * next;
struct Location loc;
+struct Identifier * name;
int type;
-struct Symbol * symbol;
union
{
-struct FunctionDefinition * function;
-struct ClassDefinition * _class;
-struct Declaration * declaration;
-char * importString;
-struct Identifier * id;
-struct DBTableDef * table;
-} __attribute__ ((gcc_struct));
-int importType;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ModuleImport;
-
-struct ModuleImport
-{
-struct ModuleImport * prev;
-struct ModuleImport * next;
-char * name;
-struct __ecereNameSpace__ecere__sys__OldList classes;
-struct __ecereNameSpace__ecere__sys__OldList functions;
-int importType;
-int importAccess;
+struct Expression * expression;
+struct Identifier * identifier;
+struct TemplateDatatype * templateDatatype;
+} __attribute__ ((gcc_struct)) __anon1;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassImport;
-
-struct ClassImport;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Symbol;
-
-struct Symbol
+struct TemplateParameter
{
-char * string;
-struct Symbol * parent;
-struct Symbol * left;
-struct Symbol * right;
-int depth;
-struct Type * type;
+struct TemplateParameter * prev;
+struct TemplateParameter * next;
+struct Location loc;
+int type;
+struct Identifier * identifier;
union
{
-struct __ecereNameSpace__ecere__com__Method * method;
-struct __ecereNameSpace__ecere__com__Property * _property;
-struct __ecereNameSpace__ecere__com__Class * registered;
+struct TemplateDatatype * dataType;
+int memberType;
+} __attribute__ ((gcc_struct)) __anon1;
+struct TemplateArgument * defaultArgument;
+const char * dataTypeString;
+struct Type * baseType;
} __attribute__ ((gcc_struct));
-int id;
-int idCode;
-union
-{
-struct
+
+struct AsmField
{
-struct External * pointerExternal;
-struct External * structExternal;
+struct AsmField * prev;
+struct AsmField * next;
+struct Location loc;
+char * command;
+struct Expression * expression;
+struct Identifier * symbolic;
} __attribute__ ((gcc_struct));
-struct
+
+struct DBIndexItem
{
-struct External * externalGet;
-struct External * externalSet;
-struct External * externalPtr;
-struct External * externalIsSet;
+struct DBIndexItem * prev;
+struct DBIndexItem * next;
+struct Identifier * id;
+int order;
} __attribute__ ((gcc_struct));
-struct
+
+struct Identifier * GetDeclId(struct Declarator * decl)
{
-struct External * methodExternal;
-struct External * methodCodeExternal;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-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));
+while(decl && decl->type != 1)
+decl = decl->declarator;
+return decl ? decl->__anon1.identifier : (((void *)0));
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Type;
+struct TypeName;
-struct Type
+struct TypeName
{
-struct Type * prev;
-struct Type * next;
-int refCount;
+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));
+
+struct DBTableEntry
+{
+struct DBTableEntry * prev;
+struct DBTableEntry * next;
+int type;
+struct Identifier * id;
union
{
-struct Symbol * _class;
struct
{
-struct __ecereNameSpace__ecere__sys__OldList members;
-char * enumName;
+struct TypeName * dataType;
+char * name;
+} __attribute__ ((gcc_struct)) __anon1;
+struct __ecereNameSpace__ecere__sys__OldList * items;
+} __attribute__ ((gcc_struct)) __anon1;
} __attribute__ ((gcc_struct));
-struct
+
+struct FunctionDefinition;
+
+struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit);
+
+struct FunctionDefinition * MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList)
{
-struct Type * returnType;
-struct __ecereNameSpace__ecere__sys__OldList params;
-struct Symbol * thisClass;
-unsigned int staticMethod;
-struct TemplateParameter * thisClassTemplate;
-} __attribute__ ((gcc_struct));
-struct
+return _MkFunction(specifiers, declarator, declarationList, 1);
+}
+
+static struct Type * ProcessTypeDecls(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Type * parentType);
+
+struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl)
{
-struct __ecereNameSpace__ecere__com__Method * method;
-struct __ecereNameSpace__ecere__com__Class * methodClass;
-struct __ecereNameSpace__ecere__com__Class * usedClass;
-} __attribute__ ((gcc_struct));
-struct
+return ProcessTypeDecls(specs, decl, (((void *)0)));
+}
+
+struct Type * ProcessTypeString(const char * string, unsigned int staticMethod)
{
-struct Type * arrayType;
-int arraySize;
-struct Expression * arraySizeExp;
-unsigned int freeExp;
-struct Symbol * enumClass;
-} __attribute__ ((gcc_struct));
-struct Type * type;
-struct TemplateParameter * templateParameter;
-} __attribute__ ((gcc_struct));
-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));
+struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
+struct Declarator * decl = SpecDeclFromString(string, specs, (((void *)0)));
+struct Type * type = ProcessType(specs, decl);
+
+if(type && !type->__anon1.__anon2.thisClass && staticMethod)
+type->__anon1.__anon2.staticMethod = 1;
+FreeList(specs, (void *)(FreeSpecifier));
+if(decl)
+FreeDeclarator(decl);
+return type;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Class;
+struct Instantiation;
-struct __ecereNameSpace__ecere__com__Class
+struct Instantiation
{
-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 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;
-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;
+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 long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name);
+struct Symbol * _DeclClass(struct Specifier * _class, const char * name);
-extern void __ecereNameSpace__ecere__com__eClass_SetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, long long value);
+struct Symbol * DeclClassAddNameSpace(struct Specifier * _class, const char * className)
+{
+char name[1024];
+int len = 0, stringLen;
-extern void __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
+name[0] = '\0';
+if(className[0] != ':' && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0 && (!_class || _class->__anon1.__anon1.name))
+{
+if(defaultNameSpace)
+{
+memcpy(name, defaultNameSpace, defaultNameSpaceLen);
+len += defaultNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
+}
+if(currentNameSpace)
+{
+memcpy(name + len, currentNameSpace, currentNameSpaceLen);
+len += currentNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
+}
+}
+stringLen = strlen(className);
+memcpy(name + len, className, stringLen);
+len += stringLen;
+name[len] = (char)0;
+return _DeclClass(_class, name);
+}
-extern void __ecereNameSpace__ecere__com__eInstance_SetMethod(struct __ecereNameSpace__ecere__com__Instance * instance, const char * name, void * function);
+struct Symbol * DeclClass(struct Specifier * _class, const char * name)
+{
+if(_class || strchr(name, ':'))
+return _DeclClass(_class, name);
+else
+return DeclClassAddNameSpace(_class, name);
+}
-extern void __ecereNameSpace__ecere__com__eInstance_IncRef(struct __ecereNameSpace__ecere__com__Instance * instance);
+struct ClassDefinition;
-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);
+struct Context
+{
+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));
-extern void __ecereNameSpace__ecere__com__eInstance_Watch(void * instance, struct __ecereNameSpace__ecere__com__Property * _property, void * object, void (* callback)(void * , void * ));
+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 declMode;
+unsigned int deleteWatchable;
+} __attribute__ ((gcc_struct));
-extern void __ecereNameSpace__ecere__com__eInstance_FireWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
+void PopContext(struct Context * ctx)
+{
+curContext = ctx->parent;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
+struct Symbol * FindType(struct Context * ctx, const char * name)
+{
+struct Symbol * type = (((void *)0));
-struct __ecereNameSpace__ecere__com__Instance
+if(ctx)
{
-int (* * _vTbl)();
-struct __ecereNameSpace__ecere__com__Class * _class;
-int _refCount;
-} __attribute__ ((gcc_struct));
+type = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->types, name);
+if(!type && ctx->parent)
+type = FindType(ctx->parent, name);
+}
+return type;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DataMember;
+struct Symbol * FindStruct(struct Context * ctx, const char * name)
+{
+struct Symbol * type = (((void *)0));
-struct __ecereNameSpace__ecere__com__DataMember
+if(ctx)
{
-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));
+type = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->structSymbols, name);
+if(!type && ctx->parent)
+type = FindStruct(ctx->parent, name);
+}
+return type;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SerialBuffer;
+struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, const char * name)
+{
+struct TemplatedType * templatedType = (((void *)0));
-struct __ecereNameSpace__ecere__com__SerialBuffer
+if(curContext)
{
-unsigned char * _buffer;
-unsigned int count;
-unsigned int _size;
-unsigned int pos;
-} __attribute__ ((gcc_struct));
+templatedType = (struct TemplatedType *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->templateTypes, name);
+if(!templatedType && ctx->parent)
+templatedType = FindTemplateTypeParameter(ctx->parent, name);
+}
+return templatedType;
+}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassTemplateArgument;
+struct Statement;
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument
+struct Expression
{
+struct Expression * prev;
+struct Expression * next;
+struct Location loc;
+int type;
union
{
struct
{
-const char * dataTypeString;
-struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
-} __attribute__ ((gcc_struct));
-struct __ecereNameSpace__ecere__com__DataValue expression;
+char * constant;
+struct Identifier * identifier;
+} __attribute__ ((gcc_struct)) __anon1;
+struct Statement * compound;
+struct Instantiation * instance;
+struct
+{
+char * string;
+unsigned int intlString;
+unsigned int wideString;
+} __attribute__ ((gcc_struct)) __anon2;
+struct __ecereNameSpace__ecere__sys__OldList * list;
+struct
+{
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
+struct Declarator * decl;
+} __attribute__ ((gcc_struct)) _classExp;
+struct
+{
+struct Identifier * id;
+} __attribute__ ((gcc_struct)) classData;
+struct
+{
+struct Expression * exp;
+struct __ecereNameSpace__ecere__sys__OldList * arguments;
+struct Location argLoc;
+} __attribute__ ((gcc_struct)) call;
+struct
+{
+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
{
-const char * memberString;
-union
-{
-struct __ecereNameSpace__ecere__com__DataMember * member;
-struct __ecereNameSpace__ecere__com__Property * prop;
-struct __ecereNameSpace__ecere__com__Method * method;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-
-enum yytokentype
+char * table;
+struct Identifier * id;
+} __attribute__ ((gcc_struct)) db;
+struct
{
-IDENTIFIER = 258, CONSTANT = 259, STRING_LITERAL = 260, SIZEOF = 261, PTR_OP = 262, INC_OP = 263, DEC_OP = 264, LEFT_OP = 265, RIGHT_OP = 266, LE_OP = 267, GE_OP = 268, EQ_OP = 269, NE_OP = 270, AND_OP = 271, OR_OP = 272, MUL_ASSIGN = 273, DIV_ASSIGN = 274, MOD_ASSIGN = 275, ADD_ASSIGN = 276, SUB_ASSIGN = 277, LEFT_ASSIGN = 278, RIGHT_ASSIGN = 279, AND_ASSIGN = 280, XOR_ASSIGN = 281, OR_ASSIGN = 282, TYPE_NAME = 283, TYPEDEF = 284, EXTERN = 285, STATIC = 286, AUTO = 287, REGISTER = 288, CHAR = 289, SHORT = 290, INT = 291, UINT = 292, INT64 = 293, LONG = 294, SIGNED = 295, UNSIGNED = 296, FLOAT = 297, DOUBLE = 298, CONST = 299, VOLATILE = 300, VOID = 301, VALIST = 302, STRUCT = 303, UNION = 304, ENUM = 305, ELLIPSIS = 306, CASE = 307, DEFAULT = 308, IF = 309, SWITCH = 310, WHILE = 311, DO = 312, FOR = 313, GOTO = 314, CONTINUE = 315, BREAK = 316, RETURN = 317, IFX = 318, ELSE = 319, CLASS = 320, THISCLASS = 321, CLASS_NAME = 322, PROPERTY = 323, SETPROP = 324, GETPROP = 325, NEWOP = 326, RENEW = 327, DELETE = 328, EXT_DECL = 329, EXT_STORAGE = 330, IMPORT = 331, DEFINE = 332, VIRTUAL = 333, ATTRIB = 334, PUBLIC = 335, PRIVATE = 336, TYPED_OBJECT = 337, ANY_OBJECT = 338, _INCREF = 339, EXTENSION = 340, ASM = 341, TYPEOF = 342, WATCH = 343, STOPWATCHING = 344, FIREWATCHERS = 345, WATCHABLE = 346, CLASS_DESIGNER = 347, CLASS_NO_EXPANSION = 348, CLASS_FIXED = 349, ISPROPSET = 350, CLASS_DEFAULT_PROPERTY = 351, PROPERTY_CATEGORY = 352, CLASS_DATA = 353, CLASS_PROPERTY = 354, SUBCLASS = 355, NAMESPACE = 356, NEW0OP = 357, RENEW0 = 358, VAARG = 359, DBTABLE = 360, DBFIELD = 361, DBINDEX = 362, DATABASE_OPEN = 363, ALIGNOF = 364, ATTRIB_DEP = 365, __ATTRIB = 366, BOOL = 367, _BOOL = 368, _COMPLEX = 369, _IMAGINARY = 370, RESTRICT = 371, THREAD = 372
-};
-
-typedef union YYSTYPE
+struct Expression * ds;
+struct Expression * name;
+} __attribute__ ((gcc_struct)) dbopen;
+struct
{
-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;
-} __attribute__ ((gcc_struct)) YYSTYPE;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Enumerator;
-
-struct Enumerator
+struct Initializer * initializer;
+} __attribute__ ((gcc_struct)) initializer;
+struct
{
-struct Enumerator * prev;
-struct Enumerator * next;
-struct Location loc;
-struct Identifier * id;
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));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_InitDeclarator;
-
-struct InitDeclarator
+struct FunctionDefinition
{
-struct InitDeclarator * prev;
-struct InitDeclarator * next;
+struct FunctionDefinition * prev;
+struct FunctionDefinition * next;
struct Location loc;
+struct __ecereNameSpace__ecere__sys__OldList * specifiers;
struct Declarator * declarator;
-struct Initializer * initializer;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_AsmField;
-
-struct AsmField
-{
-struct AsmField * prev;
-struct AsmField * next;
-struct Location loc;
-char * command;
-struct Expression * expression;
-struct Identifier * symbolic;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attribute;
-
-struct Attribute
-{
-struct Attribute * prev;
-struct Attribute * next;
-struct Location loc;
-char * attr;
-struct Expression * exp;
+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;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassFunction;
-
struct ClassFunction
{
struct ClassFunction * prev;
int idCode;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MembersInit;
+struct PropertyWatch
+{
+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 MembersInit;
struct MembersInit
{
{
struct __ecereNameSpace__ecere__sys__OldList * dataMembers;
struct ClassFunction * function;
+} __attribute__ ((gcc_struct)) __anon1;
} __attribute__ ((gcc_struct));
+
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter;
+
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter
+{
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * prev;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * next;
+const char * name;
+int type;
+union
+{
+const char * dataTypeString;
+int memberType;
+} __attribute__ ((gcc_struct)) __anon1;
+struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
+void * param;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MemberInit;
+struct __ecereNameSpace__ecere__com__SubModule;
-struct MemberInit
+struct __ecereNameSpace__ecere__com__SubModule
{
-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;
+struct __ecereNameSpace__ecere__com__SubModule * prev;
+struct __ecereNameSpace__ecere__com__SubModule * next;
+struct __ecereNameSpace__ecere__com__Instance * module;
+int importMode;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyDef;
+struct InitDeclarator;
-struct PropertyDef
+struct InitDeclarator
{
-struct PropertyDef * prev;
-struct PropertyDef * next;
+struct InitDeclarator * prev;
+struct InitDeclarator * 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
+struct Initializer * initializer;
+} __attribute__ ((gcc_struct));
+
+struct __ecereNameSpace__ecere__com__NameSpace;
+
+struct __ecereNameSpace__ecere__com__NameSpace
{
-unsigned int conversion : 1;
-unsigned int isWatchable : 1;
-unsigned int isDBProp : 1;
+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));
+
+struct __ecereNameSpace__ecere__com__Class
+{
+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;
} __attribute__ ((gcc_struct));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyWatch;
-
-struct PropertyWatch
+struct __ecereNameSpace__ecere__com__Application
{
-struct PropertyWatch * prev;
-struct PropertyWatch * next;
-struct Location loc;
-struct Statement * compound;
-struct __ecereNameSpace__ecere__sys__OldList * properties;
-unsigned int deleteWatch;
+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));
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDef;
+static struct __ecereNameSpace__ecere__com__Class * __ecereClass_ContextStringPair;
-struct ClassDef
-{
-struct ClassDef * prev;
-struct ClassDef * next;
-struct Location loc;
-int type;
-union
+void __ecereMethod_ContextStringPair_OnFree(struct __ecereNameSpace__ecere__com__Class * class, struct ContextStringPair * this)
{
-struct Declaration * decl;
-struct ClassFunction * function;
-struct __ecereNameSpace__ecere__sys__OldList * defProperties;
-struct PropertyDef * propertyDef;
-struct PropertyWatch * propertyWatch;
-char * designer;
-struct Identifier * defaultProperty;
-struct
+(__ecereNameSpace__ecere__com__eSystem_Delete(this->string), this->string = 0);
+(__ecereNameSpace__ecere__com__eSystem_Delete(this->context), this->context = 0);
+}
+
+int __ecereMethod_ContextStringPair_OnCompare(struct __ecereNameSpace__ecere__com__Class * class, struct ContextStringPair * this, struct ContextStringPair * b)
{
-struct Identifier * id;
-struct Initializer * initializer;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
-int memberAccess;
-void * object;
-} __attribute__ ((gcc_struct));
+int result;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableEntry;
+result = (this->string && b->string) ? strcmp(this->string, b->string) : (!this->string && b->string) ? 1 : (this->string && !b->string) ? -1 : 0;
+if(result)
+return result;
+result = (this->context && b->context) ? strcmp(this->context, b->context) : (!this->context && b->context) ? 1 : (this->context && !b->context) ? -1 : 0;
+return result;
+}
-struct DBTableEntry
-{
-struct DBTableEntry * prev;
-struct DBTableEntry * next;
-int type;
-struct Identifier * id;
-union
-{
-struct
-{
-struct TypeName * dataType;
-char * name;
-} __attribute__ ((gcc_struct));
-struct __ecereNameSpace__ecere__sys__OldList * items;
-} __attribute__ ((gcc_struct));
-} __attribute__ ((gcc_struct));
+extern void __ecereNameSpace__ecere__com__PrintLn(struct __ecereNameSpace__ecere__com__Class * class, const void * object, ...);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBIndexItem;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Identifier;
-struct DBIndexItem
-{
-struct DBIndexItem * prev;
-struct DBIndexItem * next;
-struct Identifier * id;
-int order;
-} __attribute__ ((gcc_struct));
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Specifier;
-extern YYSTYPE yylval;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateParameter;
-extern struct Location yylloc;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplatedType;
-extern char * yytext;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateDatatype;
-const char * defaultNameSpace;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateArgument;
-int defaultNameSpaceLen;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Expression;
-extern size_t strlen(const char * );
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__List_TPL_Location_;
-void SetDefaultNameSpace(const char * s)
-{
-defaultNameSpace = s;
-defaultNameSpaceLen = s ? strlen(s) : 0;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Symbol;
-unsigned int strictNameSpaces;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attribute;
-void SetStrictNameSpaces(unsigned int b)
-{
-strictNameSpaces = b;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attrib;
-int declMode = 2;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ExtDecl;
-int structDeclMode = 2;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declarator;
-void SetDeclMode(int accessMode)
-{
-structDeclMode = declMode = accessMode;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Enumerator;
-int defaultDeclMode = 2;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Pointer;
-void SetDefaultDeclMode(int accessMode)
-{
-defaultDeclMode = accessMode;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Initializer;
-const char * currentNameSpace;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_InitDeclarator;
-int currentNameSpaceLen;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TypeName;
-void SetCurrentNameSpace(const char * s)
-{
-currentNameSpace = s;
-currentNameSpaceLen = s ? strlen(s) : 0;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declaration;
-struct __ecereNameSpace__ecere__sys__OldList * MkList()
-{
-return __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__OldList) * (1));
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Statement;
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_FunctionDefinition;
-struct __ecereNameSpace__ecere__sys__OldList * MkListOne(void * item)
-{
-struct __ecereNameSpace__ecere__sys__OldList * list = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__OldList) * (1));
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Type;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*list), item);
-return list;
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_External;
-void ListAdd(struct __ecereNameSpace__ecere__sys__OldList * list, void * item)
-{
-if(item)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(list, item);
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassFunction;
-unsigned int __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(struct __ecereNameSpace__ecere__sys__OldList * this, void * prevItem, void * item);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MemberInit;
-void ListAddFront(struct __ecereNameSpace__ecere__sys__OldList * list, void * item)
-{
-if(item)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(list, (((void *)0)), item);
-}
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MembersInit;
-extern void * memcpy(void * , const void * , size_t size);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Instantiation;
-extern int strcmp(const char * , const char * );
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDef;
-struct Specifier * MkSpecifierName(const char * name);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDefinition;
-extern char * __ecereNameSpace__ecere__sys__CopyString(const char * string);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyDef;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplatedType;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Context;
-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;
-} __attribute__ ((gcc_struct));
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ModuleImport;
-struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, const char * name);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64;
-extern struct Context * curContext;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_AsmField;
-struct Symbol * FindClass(const char * name);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyWatch;
-struct Specifier * _MkSpecifierName(const char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableDef;
-extern void * __ecereNameSpace__ecere__com__eInstance_New(struct __ecereNameSpace__ecere__com__Class * _class);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableEntry;
-struct Identifier * MkIdentifier(const char * string)
-{
-struct Identifier * id = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Identifier);
-int c;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBIndexItem;
-id->_class = (((void *)0));
-if(string)
-{
-const char * namePart;
-unsigned int gotColon = 0x0;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Map_TPL_ContextStringPair__ecere__com__List_TPL_Location___;
-for(c = strlen(string) - 1; c >= 0; c--)
-if(string[c] == ':')
-{
-gotColon = 0x1;
-break;
-}
-namePart = string + c + 1;
-while(c >= 0 && string[c] == ':')
-c--;
-if(c >= 0)
-{
-char name[1024];
-struct Symbol * symbol;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
-memcpy(name, string, c + 1);
-name[c + 1] = '\0';
-if(!strcmp(name, "typed_object"))
-{
-id->_class = MkSpecifierName("typed_object");
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
-else if(!strcmp(name, "property"))
-{
-id->_class = MkSpecifierName("property");
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
-else if(!strcmp(name, "typed_object&"))
-{
-id->_class = MkSpecifierName("typed_object&");
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
-else if(!strcmp(name, "any_object"))
-{
-id->_class = MkSpecifierName("any_object");
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
-else
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__List;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Module;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_char__PTR_;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DeclaratorType;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__CustomAVLTree;
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Map;
+
+struct __ecereNameSpace__ecere__com__Module
{
-struct TemplatedType * templatedType = FindTemplateTypeParameter(curContext, name);
+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));
-if(templatedType)
+struct Specifier * MkSpecifier(int specifier)
{
-id->_class = __extension__ ({
+if(specifier == _BOOL && (declMode != 0 && defaultDeclMode != 0))
+return MkSpecifierName("bool");
+else if(specifier == _BOOL || specifier == BOOL)
+return __extension__ ({
struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-__ecereInstance1->type = 8, __ecereInstance1->templateParameter = templatedType->param, __ecereInstance1;
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.specifier = specifier, __ecereInstance1;
});
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
-else
-{
-symbol = FindClass(name);
-if(symbol)
-{
-id->_class = _MkSpecifierName(symbol->string, symbol, (((void *)0)));
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
else
-id->string = __ecereNameSpace__ecere__sys__CopyString(string);
-}
-}
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.specifier = specifier, __ecereInstance1;
+});
}
-else if(gotColon)
+
+struct Specifier * MkSpecifierTypeOf(struct Expression * expression)
{
-id->_class = MkSpecifierName((((void *)0)));
-id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
-}
-else
-id->string = __ecereNameSpace__ecere__sys__CopyString(string);
-}
-else
-id->string = __ecereNameSpace__ecere__sys__CopyString("");
-return id;
-}
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(struct __ecereNameSpace__ecere__sys__BinaryTree * this, struct __ecereNameSpace__ecere__sys__BTNode * node);
+__ecereInstance1->type = 6, __ecereInstance1->__anon1.expression = expression, __ecereInstance1;
+});
+}
-struct TemplateParameter * MkTypeTemplateParameter(struct Identifier * identifier, struct TemplateDatatype * baseTplDatatype, struct TemplateArgument * defaultArgument)
-{
-if(identifier->string)
+struct Specifier * MkSpecifierSubClass(struct Specifier * _class)
{
-struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 0, param->identifier = identifier, param->dataType = baseTplDatatype, param->defaultArgument = defaultArgument, param);
-struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (uintptr_t)identifier->string, type->param = param, type);
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor((void *)type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
-return param;
+__ecereInstance1->type = 7, __ecereInstance1->__anon1._class = _class, __ecereInstance1;
+});
}
-return (((void *)0));
+
+struct Specifier * MkSpecifierExtended(struct ExtDecl * extDecl)
+{
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.__anon1.extDecl = extDecl, __ecereInstance1;
+});
}
struct TemplateParameter * MkIdentifierTemplateParameter(struct Identifier * identifier, int memberType, struct TemplateArgument * defaultArgument)
{
if(identifier->string)
{
-struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 1, param->identifier = identifier, param->memberType = memberType, param->defaultArgument = defaultArgument, param);
+struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 1, param->identifier = identifier, param->__anon1.memberType = memberType, param->defaultArgument = defaultArgument, param);
return param;
}
{
if(identifier->string)
{
-struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 2, param->identifier = identifier, param->dataType = dataType, param->defaultArgument = defaultArgument, param);
+struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 2, param->identifier = identifier, param->__anon1.dataType = dataType, param->defaultArgument = defaultArgument, param);
return param;
}
struct TemplateArgument * MkTemplateTypeArgument(struct TemplateDatatype * tplDatatype)
{
-struct TemplateArgument * argument = (argument = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateArgument), argument->type = 0, argument->templateDatatype = tplDatatype, argument);
+struct TemplateArgument * argument = (argument = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateArgument), argument->type = 0, argument->__anon1.templateDatatype = tplDatatype, argument);
return argument;
}
struct TemplateArgument * MkTemplateExpressionArgument(struct Expression * expr)
{
-struct TemplateArgument * argument = (argument = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateArgument), argument->type = 2, argument->expression = expr, argument);
+struct TemplateArgument * argument = (argument = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateArgument), argument->type = 2, argument->__anon1.expression = expr, argument);
return argument;
}
struct TemplateArgument * MkTemplateIdentifierArgument(struct Identifier * ident)
{
-struct TemplateArgument * argument = (argument = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateArgument), argument->type = 1, argument->identifier = ident, argument);
+struct TemplateArgument * argument = (argument = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateArgument), argument->type = 1, argument->__anon1.identifier = ident, argument);
return argument;
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 23, __ecereInstance1->compound = compound, __ecereInstance1;
+__ecereInstance1->type = 23, __ecereInstance1->__anon1.compound = compound, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 32, __ecereInstance1->list = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 32, __ecereInstance1->__anon1.list = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 33, __ecereInstance1->initializer.typeName = typeName, __ecereInstance1->initializer.initializer = initializer, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 33, __ecereInstance1->__anon1.initializer.typeName = typeName, __ecereInstance1->__anon1.initializer.initializer = initializer, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 0, __ecereInstance1->identifier = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.__anon1.identifier = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 2, __ecereInstance1->constant = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 3, __ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 3, __ecereInstance1->__anon1.__anon2.string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ContextStringPair
-{
-char * string, * context;
-} __attribute__ ((gcc_struct));
-
-static struct __ecereNameSpace__ecere__com__Class * __ecereClass_ContextStringPair;
-
-void __ecereMethod_ContextStringPair_OnFree(struct __ecereNameSpace__ecere__com__Class * class, struct ContextStringPair * this)
-{
-(__ecereNameSpace__ecere__com__eSystem_Delete(this->string), this->string = 0);
-(__ecereNameSpace__ecere__com__eSystem_Delete(this->context), this->context = 0);
-}
-
-int __ecereMethod_ContextStringPair_OnCompare(struct __ecereNameSpace__ecere__com__Class * class, struct ContextStringPair * this, struct ContextStringPair * b)
-{
-int result;
-
-result = (this->string && b->string) ? strcmp(this->string, b->string) : (!this->string && b->string) ? 1 : (this->string && !b->string) ? -1 : 0;
-if(result)
-return result;
-result = (this->context && b->context) ? strcmp(this->context, b->context) : (!this->context && b->context) ? 1 : (this->context && !b->context) ? -1 : 0;
-return result;
-}
-
-struct __ecereNameSpace__ecere__com__Instance * intlStrings;
-
-extern unsigned int inCompiler;
-
-extern char * QMkString(const char * source);
-
-extern const char * i18nModuleName;
-
-extern struct Expression * QMkExpId(const char * id);
-
-struct Expression * MkExpCall(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * arguments);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__List_TPL_Location_;
-
-struct __ecereNameSpace__ecere__com__IteratorPointer;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__IteratorPointer;
-
-struct __ecereNameSpace__ecere__com__Iterator
-{
-struct __ecereNameSpace__ecere__com__Instance * container;
-struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
-} __attribute__ ((gcc_struct));
-
-unsigned int __ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(struct __ecereNameSpace__ecere__com__Iterator * this, const uint64 index, unsigned int create);
-
-uint64 __ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(struct __ecereNameSpace__ecere__com__Iterator * this);
-
-void __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(struct __ecereNameSpace__ecere__com__Iterator * this, uint64 value);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__com__Iterator_data;
-
-int __ecereVMethodID___ecereNameSpace__ecere__com__Container_Add;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__List;
-
-struct Expression * MkExpIntlString(const char * string, const char * context)
-{
-if(inCompiler)
-{
-struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
-char * s;
-
-if(inCompiler)
-{
-struct ContextStringPair pair =
-{
-0, 0
-};
-struct __ecereNameSpace__ecere__com__Instance * list;
-int len = strlen(string);
-
-pair.string = __ecereNameSpace__ecere__com__eSystem_New(sizeof(unsigned char) * (len - 2 + 1));
-memcpy(pair.string, string + 1, len - 2);
-pair.string[len - 2] = '\0';
-if(context)
-{
-len = strlen(context);
-pair.context = __ecereNameSpace__ecere__com__eSystem_New(sizeof(unsigned char) * (len - 2 + 1));
-memcpy(pair.context, context + 1, len - 2);
-pair.context[len - 2] = '\0';
-}
-list = (__extension__ ({
-struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
-{
-intlStrings, 0
-};
-
-__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, (((&pair))), 0x0);
-((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&__internalIterator));
-}));
-if(!list)
+struct Expression * MkExpWideString(const char * string)
{
-list = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__List_TPL_Location_);
-__extension__ ({
-struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
-{
-intlStrings, 0
-};
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, (((&pair))), 0x1);
-__ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, list);
+__ecereInstance1->type = 3, __ecereInstance1->__anon1.__anon2.string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->loc = yylloc, __ecereInstance1->__anon1.__anon2.wideString = 1, __ecereInstance1;
});
}
-else
-{
-(__ecereNameSpace__ecere__com__eSystem_Delete(pair.string), pair.string = 0);
-(__ecereNameSpace__ecere__com__eSystem_Delete(pair.context), pair.context = 0);
-}
-((struct __ecereNameSpace__ecere__com__IteratorPointer * (*)(struct __ecereNameSpace__ecere__com__Instance *, uint64 value))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = list;
-
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__List->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Add])(list, (&yylloc));
-}
-s = QMkString(i18nModuleName ? i18nModuleName : "");
-ListAdd(list, MkExpString(s));
-(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
-ListAdd(list, MkExpString(string));
-if(context)
-{
-int lenString = strlen(string), lenContext = strlen(context);
-char * msgid = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (lenString - 2 + lenContext - 2 + 4));
-
-msgid[0] = '\"';
-memcpy(msgid + 1, context + 1, lenContext - 2);
-msgid[1 + lenContext - 2] = (char)4;
-memcpy(msgid + 1 + lenContext - 2 + 1, string + 1, lenString - 2);
-memcpy(msgid + 1 + lenContext - 2 + 1 + lenString - 2, "\"", 2);
-ListAdd(list, MkExpString(msgid));
-(__ecereNameSpace__ecere__com__eSystem_Delete(msgid), msgid = 0);
-}
-else
-ListAdd(list, QMkExpId("null"));
-return MkExpCall(QMkExpId("GetTranslatedString"), list);
-}
-else
-{
-struct Expression * e = MkExpString(string);
-
-e->intlString = 0x1;
-return e;
-}
-}
struct Expression * MkExpOp(struct Expression * exp1, int op, struct Expression * exp2)
{
-struct Expression * exp = (exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), exp->type = 4, exp->op.op = op, exp->op.exp1 = exp1, exp->op.exp2 = exp2, exp);
+struct Expression * exp = (exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), exp->type = 4, exp->__anon1.op.op = op, exp->__anon1.op.exp1 = exp1, exp->__anon1.op.exp2 = exp2, exp);
if(exp1 || exp2)
{
struct Expression * MkExpBrackets(struct __ecereNameSpace__ecere__sys__OldList * expressions)
{
-struct Expression * exp = (exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), exp->type = 5, exp->list = expressions, exp);
+struct Expression * exp = (exp = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), exp->type = 5, exp->__anon1.list = expressions, exp);
if(expressions && expressions->first)
{
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 6, __ecereInstance1->index.exp = expression, __ecereInstance1->index.index = index, __ecereInstance1;
+__ecereInstance1->type = 6, __ecereInstance1->__anon1.index.exp = expression, __ecereInstance1->__anon1.index.index = index, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 7, __ecereInstance1->call.exp = expression, __ecereInstance1->call.arguments = arguments, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 7, __ecereInstance1->__anon1.call.exp = expression, __ecereInstance1->__anon1.call.arguments = arguments, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 8, __ecereInstance1->member.exp = expression, __ecereInstance1->member.member = member, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.member.exp = expression, __ecereInstance1->__anon1.member.member = member, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 9, __ecereInstance1->member.exp = expression, __ecereInstance1->member.member = member, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 9, __ecereInstance1->__anon1.member.exp = expression, __ecereInstance1->__anon1.member.member = member, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 10, __ecereInstance1->typeName = typeName, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 10, __ecereInstance1->__anon1.typeName = typeName, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 36, __ecereInstance1->typeName = typeName, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 36, __ecereInstance1->__anon1.typeName = typeName, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 15, __ecereInstance1->_class = _class, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 15, __ecereInstance1->__anon1._class = _class, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 11, __ecereInstance1->cast.typeName = typeName, __ecereInstance1->cast.exp = expression, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 11, __ecereInstance1->__anon1.cast.typeName = typeName, __ecereInstance1->__anon1.cast.exp = expression, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 12, __ecereInstance1->cond.cond = cond, __ecereInstance1->cond.exp = expressions, __ecereInstance1->cond.elseExp = elseExp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 12, __ecereInstance1->__anon1.cond.cond = cond, __ecereInstance1->__anon1.cond.exp = expressions, __ecereInstance1->__anon1.cond.elseExp = elseExp, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 14, __ecereInstance1->_renew.exp = memExp, __ecereInstance1->_renew.typeName = type, __ecereInstance1->_renew.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 14, __ecereInstance1->__anon1._renew.exp = memExp, __ecereInstance1->__anon1._renew.typeName = type, __ecereInstance1->__anon1._renew.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 27, __ecereInstance1->_renew.exp = memExp, __ecereInstance1->_renew.typeName = type, __ecereInstance1->_renew.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 27, __ecereInstance1->__anon1._renew.exp = memExp, __ecereInstance1->__anon1._renew.typeName = type, __ecereInstance1->__anon1._renew.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 13, __ecereInstance1->_new.typeName = type, __ecereInstance1->_new.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 13, __ecereInstance1->__anon1._new.typeName = type, __ecereInstance1->__anon1._new.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 26, __ecereInstance1->_new.typeName = type, __ecereInstance1->_new.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 26, __ecereInstance1->__anon1._new.typeName = type, __ecereInstance1->__anon1._new.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 34, __ecereInstance1->vaArg.exp = exp, __ecereInstance1->vaArg.typeName = type, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 34, __ecereInstance1->__anon1.vaArg.exp = exp, __ecereInstance1->__anon1.vaArg.typeName = type, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct Specifier * MkSpecifier(int specifier)
+struct Expression * MkExpInstance(struct Instantiation * inst)
{
-if(specifier == _BOOL && (declMode != 0 && defaultDeclMode != 0))
-return MkSpecifierName("bool");
-else if(specifier == _BOOL || specifier == BOOL)
return __extension__ ({
-struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 0, __ecereInstance1->specifier = specifier, __ecereInstance1;
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.instance = inst, __ecereInstance1;
});
-else
+}
+
+struct Expression * MkExpClass(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * decl)
+{
return __extension__ ({
-struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 0, __ecereInstance1->specifier = specifier, __ecereInstance1;
+__ecereInstance1->type = 24, __ecereInstance1->__anon1._classExp.specifiers = specifiers, __ecereInstance1->__anon1._classExp.decl = decl, __ecereInstance1;
});
}
-struct Specifier * MkSpecifierTypeOf(struct Expression * expression)
+struct Expression * MkExpClassData(struct Identifier * id)
{
return __extension__ ({
-struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 6, __ecereInstance1->expression = expression, __ecereInstance1;
+__ecereInstance1->type = 25, __ecereInstance1->__anon1.classData.id = id, __ecereInstance1;
});
}
-struct Specifier * MkSpecifierSubClass(struct Specifier * _class)
+struct Expression * MkExpDBOpen(struct Expression * ds, struct Expression * dbName)
{
return __extension__ ({
-struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 7, __ecereInstance1->_class = _class, __ecereInstance1;
+__ecereInstance1->type = 28, __ecereInstance1->__anon1.dbopen.ds = ds, __ecereInstance1->__anon1.dbopen.name = dbName, __ecereInstance1;
});
}
-struct Specifier * MkSpecifierExtended(struct ExtDecl * extDecl)
+struct Expression * MkExpDBField(char * table, struct Identifier * id)
{
return __extension__ ({
-struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+
+__ecereInstance1->type = 29, __ecereInstance1->__anon1.db.table = table, __ecereInstance1->__anon1.db.id = id, __ecereInstance1;
+});
+}
+
+struct Expression * MkExpDBIndex(char * table, struct Identifier * id)
+{
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+
+__ecereInstance1->type = 31, __ecereInstance1->__anon1.db.table = table, __ecereInstance1->__anon1.db.id = id, __ecereInstance1;
+});
+}
+
+struct Expression * MkExpDBTable(char * table)
+{
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+
+__ecereInstance1->type = 30, __ecereInstance1->__anon1.db.table = table, __ecereInstance1;
+});
+}
+
+struct Expression * MkExpArray(struct __ecereNameSpace__ecere__sys__OldList * expressions)
+{
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-__ecereInstance1->type = 5, __ecereInstance1->extDecl = extDecl, __ecereInstance1;
+__ecereInstance1->type = 35, __ecereInstance1->__anon1.list = expressions, __ecereInstance1;
});
}
-struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
-
-extern char * strstr(const char * , const char * );
-
-extern void FreeSymbol(struct Symbol * symbol);
-
-extern void FreeType(struct Type * type);
-
struct Specifier * MkEnum(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * list)
{
-struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = 2, spec->id = id, spec->list = list, spec);
+struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = 2, spec->__anon1.__anon2.id = id, spec->__anon1.__anon2.list = list, spec);
if(list && (!declMode || !id))
{
type = ProcessType(&specs, (((void *)0)));
if(id)
{
-struct Symbol * symbol = (symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), symbol->string = __ecereNameSpace__ecere__sys__CopyString(id->string), symbol->isStruct = 0x1, symbol->type = type, symbol);
+struct Symbol * symbol = (symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), symbol->string = __ecereNameSpace__ecere__sys__CopyString(id->string), symbol->isStruct = 1, symbol->type = type, symbol);
type->refCount++;
if(strstr(symbol->string, "::"))
-curContext->hasNameSpace = 0x1;
+curContext->hasNameSpace = 1;
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
FreeSymbol(symbol);
}
type->refCount++;
if(strstr(symbol->string, "::"))
-curContext->hasNameSpace = 0x1;
+curContext->hasNameSpace = 1;
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
FreeSymbol(symbol);
}
return spec;
}
-struct Symbol * FindType(struct Context * ctx, const char * name);
-
struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions)
{
-struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = type, spec->id = id, spec);
+struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = type, spec->__anon1.__anon2.id = id, spec);
if(id && FindType(curContext, id->string))
structDeclMode = 0;
-spec->definitions = definitions;
+spec->__anon1.__anon2.definitions = definitions;
if(definitions && id && structDeclMode == 0)
{
struct __ecereNameSpace__ecere__sys__OldList specs =
symbol = __extension__ ({
struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 0x1, __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 1, __ecereInstance1;
});
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
FreeSymbol(symbol);
void AddStructDefinitions(struct Specifier * spec, struct __ecereNameSpace__ecere__sys__OldList * definitions)
{
-spec->definitions = definitions;
-if(definitions && spec->id && !declMode)
+spec->__anon1.__anon2.definitions = definitions;
+if(definitions && spec->__anon1.__anon2.id && !declMode)
{
struct Symbol * symbol;
struct __ecereNameSpace__ecere__sys__OldList specs =
symbol = __extension__ ({
struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(spec->id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 0x1, __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 1, __ecereInstance1;
});
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->parent->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
FreeSymbol(symbol);
return __extension__ ({
struct ExtDecl * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl);
-__ecereInstance1->type = 0, __ecereInstance1->s = s, __ecereInstance1;
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.s = s, __ecereInstance1;
});
}
return __extension__ ({
struct ExtDecl * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl);
-__ecereInstance1->type = 1, __ecereInstance1->attr = attr, __ecereInstance1;
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.attr = attr, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 1, __ecereInstance1->identifier = id, __ecereInstance1;
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.identifier = id, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 4, __ecereInstance1->declarator = declarator, __ecereInstance1->function.parameters = parameters, __ecereInstance1;
+__ecereInstance1->type = 4, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.function.parameters = parameters, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 6, __ecereInstance1->declarator = declarator, __ecereInstance1->extended.extended = extended, __ecereInstance1;
+__ecereInstance1->type = 6, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.extended.extended = extended, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 7, __ecereInstance1->declarator = declarator, __ecereInstance1->extended.extended = extended, __ecereInstance1;
+__ecereInstance1->type = 7, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.extended.extended = extended, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 0, __ecereInstance1->declarator = declarator, __ecereInstance1->structDecl.exp = exp, __ecereInstance1;
+__ecereInstance1->type = 0, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.structDecl.exp = exp, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->array.exp = exp, __ecereInstance1;
+__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.array.exp = exp, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->array.enumClass = _class, __ecereInstance1;
+__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.array.enumClass = _class, __ecereInstance1;
});
}
return __extension__ ({
struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-__ecereInstance1->type = 5, __ecereInstance1->declarator = declarator, __ecereInstance1->pointer.pointer = pointer, __ecereInstance1;
+__ecereInstance1->type = 5, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.pointer.pointer = pointer, __ecereInstance1;
});
}
return __extension__ ({
struct Initializer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer);
-__ecereInstance1->type = 0, __ecereInstance1->exp = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.exp = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
return __extension__ ({
struct Initializer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer);
-__ecereInstance1->type = 1, __ecereInstance1->list = list, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.list = list, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
});
}
-int CheckType(const char * text);
-
-extern void FreeDeclarator(struct Declarator * decl);
+struct TypeName * MkTypeName(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
+{
+if(qualifiers != (((void *)0)))
+{
+struct Declarator * parentDecl = declarator;
+struct Declarator * decl = declarator;
+
+while(decl && decl->type == 3)
+decl = decl->declarator;
+if(decl && decl->type == 1 && decl->__anon1.identifier->string && CheckType(decl->__anon1.identifier->string) == TYPE_NAME)
+{
+struct Specifier * spec;
+
+for(spec = qualifiers->first; spec; spec = spec->next)
+{
+if(spec->type == 0)
+{
+if(spec->__anon1.specifier == CONST || spec->__anon1.specifier == VOLATILE || spec->__anon1.specifier == EXTERN || spec->__anon1.specifier == STATIC || spec->__anon1.specifier == AUTO || spec->__anon1.specifier == REGISTER)
+continue;
+break;
+}
+else if(spec->type != 5)
+break;
+}
+if(!spec)
+{
+ListAdd(qualifiers, MkSpecifierName(decl->__anon1.identifier->string));
+FreeDeclarator(decl);
+parentDecl->declarator = (((void *)0));
+}
+}
+}
+return __extension__ ({
+struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
+
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
+}
+
+struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit)
+{
+if(errorOnOmit)
+{
+struct Declarator * funcDecl = GetFuncDecl(declarator);
+
+if(funcDecl && funcDecl->__anon1.function.parameters)
+{
+struct TypeName * tn;
+
+for(tn = (*funcDecl->__anon1.function.parameters).first; tn; tn = tn->next)
+{
+if(tn->qualifiers || tn->declarator)
+{
+struct Identifier * declID = tn->declarator ? GetDeclId(tn->declarator) : (((void *)0));
+
+if(!declID)
+{
+struct Specifier * spec = tn->qualifiers ? (*tn->qualifiers).first : (((void *)0));
+
+if(!tn->declarator && !tn->prev && !tn->next && spec && !spec->next && spec->type == 0 && spec->__anon1.specifier == VOID)
+;
+else
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "parameter name omitted\n", (((void *)0))));
+break;
+}
+}
+}
+}
+}
+return __extension__ ({
+struct FunctionDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionDefinition);
+
+__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = declarator, __ecereInstance1->declarations = declarationList, __ecereInstance1;
+});
+}
+
+struct Type * MkClassTypeSymbol(struct Symbol * symbol)
+{
+if(symbol)
+{
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->__anon1._class = symbol, type);
+
+if(!type->__anon1._class)
+{
+type->kind = 3;
+}
+type->refCount = 1;
+return type;
+}
+return (((void *)0));
+}
+
+struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList)
+{
+return __extension__ ({
+struct ClassFunction * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassFunction);
+
+__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = decl, __ecereInstance1->declarations = declList, __ecereInstance1;
+});
+}
+
+struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer)
+{
+return __extension__ ({
+struct MemberInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit);
+
+__ecereInstance1->identifiers = ids, __ecereInstance1->initializer = initializer, __ecereInstance1;
+});
+}
+
+struct MemberInit * MkMemberInitExp(struct Expression * idExp, struct Initializer * initializer)
+{
+struct MemberInit * init = (init = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit), init->initializer = initializer, init->identifiers = MkList(), init);
+struct Expression * exp;
+
+for(exp = idExp; exp && exp->type == 8; exp = exp->__anon1.member.exp)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*init->identifiers), (((void *)0)), exp->__anon1.member.member);
+exp->__anon1.member.member = (((void *)0));
+}
+if(exp && exp->type == 0)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*init->identifiers), (((void *)0)), exp->__anon1.__anon1.identifier);
+exp->__anon1.__anon1.identifier = (((void *)0));
+}
+FreeExpression(idExp);
+return init;
+}
+
+struct MembersInit * MkMembersInitList(struct __ecereNameSpace__ecere__sys__OldList * dataMembers)
+{
+return __extension__ ({
+struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
+
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.dataMembers = dataMembers, __ecereInstance1;
+});
+}
+
+struct MembersInit * MkMembersInitMethod(struct ClassFunction * function)
+{
+return __extension__ ({
+struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
+
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.function = function, __ecereInstance1;
+});
+}
+
+struct Instantiation * MkInstantiation(struct Specifier * _class, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
+{
+return __extension__ ({
+struct Instantiation * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+
+__ecereInstance1->_class = _class, __ecereInstance1->exp = exp, __ecereInstance1->members = members, __ecereInstance1;
+});
+}
+
+struct Instantiation * MkInstantiationNamed(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
+{
+struct Instantiation * inst = (inst = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation), inst->exp = exp, inst->members = members, inst);
+
+if(specs != (((void *)0)))
+{
+struct Specifier * spec;
+
+for(spec = specs->first; spec; spec = spec->next)
+if(spec->type == 1)
+{
+inst->_class = spec;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specs, spec);
+break;
+}
+FreeList(specs, (void *)(FreeSpecifier));
+if(!spec)
+{
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Expecting class specifier\n", (((void *)0))));
+inst->_class = MkSpecifierName("");
+}
+}
+return inst;
+}
+
+struct Context * PushContext()
+{
+struct Context * ctx = (ctx = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Context), ctx->parent = curContext, ctx);
+
+curContext = ctx;
+return ctx;
+}
+
+struct AsmField * MkAsmField(char * command, struct Expression * expression, struct Identifier * symbolic)
+{
+return __extension__ ({
+struct AsmField * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_AsmField);
+
+__ecereInstance1->command = command, __ecereInstance1->expression = expression, __ecereInstance1->symbolic = symbolic, __ecereInstance1;
+});
+}
+
+struct PropertyWatch * MkDeleteWatch(struct Statement * compound)
+{
+return __extension__ ({
+struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
+
+__ecereInstance1->compound = compound, __ecereInstance1->deleteWatch = 1, __ecereInstance1;
+});
+}
+
+struct PropertyWatch * MkPropertyWatch(struct __ecereNameSpace__ecere__sys__OldList * properties, struct Statement * compound)
+{
+return __extension__ ({
+struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
+
+__ecereInstance1->compound = compound, __ecereInstance1->properties = properties, __ecereInstance1;
+});
+}
+
+struct DBTableDef * MkDBTableDef(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * definitions)
+{
+return __extension__ ({
+struct DBTableDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableDef);
+
+__ecereInstance1->name = name, __ecereInstance1->symbol = symbol, __ecereInstance1->definitions = definitions, __ecereInstance1;
+});
+}
+
+struct DBTableEntry * MkDBFieldEntry(struct TypeName * type, struct Identifier * id, char * name)
+{
+return __extension__ ({
+struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
+
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.__anon1.dataType = type, __ecereInstance1->id = id, __ecereInstance1->__anon1.__anon1.name = name, __ecereInstance1;
+});
+}
+
+struct DBTableEntry * MkDBIndexEntry(struct __ecereNameSpace__ecere__sys__OldList * items, struct Identifier * id)
+{
+return __extension__ ({
+struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
+
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.items = items, __ecereInstance1->id = id, __ecereInstance1;
+});
+}
+
+struct DBIndexItem * MkDBIndexItem(struct Identifier * id, int order)
+{
+return __extension__ ({
+struct DBIndexItem * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBIndexItem);
+
+__ecereInstance1->id = id, __ecereInstance1->order = order, __ecereInstance1;
+});
+}
+
+void __ecereCreateModuleInstances_ast()
+{
+intlStrings = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__Map_TPL_ContextStringPair__ecere__com__List_TPL_Location___);
+__ecereNameSpace__ecere__com__eInstance_IncRef(intlStrings);
+}
+
+struct TemplateParameter * MkTypeTemplateParameter(struct Identifier * identifier, struct TemplateDatatype * baseTplDatatype, struct TemplateArgument * defaultArgument)
+{
+if(identifier->string)
+{
+struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 0, param->identifier = identifier, param->__anon1.dataType = baseTplDatatype, param->defaultArgument = defaultArgument, param);
+struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (uintptr_t)identifier->string, type->param = param, type);
+
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
+((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor((void *)type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
+return param;
+}
+return (((void *)0));
+}
+
+void OutputIntlStrings()
+{
+if(((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)intlStrings + 0 + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->count)
+{
+const char * srcFile = GetSourceFile();
+const char * objFile = GetOutputFile();
+char srcFileFixed[797];
+char potFile[797];
+struct __ecereNameSpace__ecere__com__Instance * f;
-struct TypeName * MkTypeName(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
+__ecereNameSpace__ecere__sys__ChangeExtension(objFile, "bowl", potFile);
+f = __ecereNameSpace__ecere__sys__FileOpen(potFile, 2);
+if(f)
{
-if(qualifiers != (((void *)0)))
+const char * filePrefix = "";
+
+if(!(srcFile[0] && (srcFile[1] == ':' || srcFile[0] == '/')))
+filePrefix = "./";
+__ecereNameSpace__ecere__sys__GetSlashPathBuffer(srcFileFixed, srcFile);
{
-struct Declarator * parentDecl = declarator;
-struct Declarator * decl = declarator;
+struct __ecereNameSpace__ecere__com__MapIterator s = (s.container = (void *)0, s.pointer = (void *)0, __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(&s, (intlStrings)), s);
-while(decl && decl->type == 3)
-decl = decl->declarator;
-if(decl && decl->type == 1 && decl->identifier->string && CheckType(decl->identifier->string) == TYPE_NAME)
+while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next((void *)(&s)))
{
-struct Specifier * spec;
+struct ContextStringPair pair = (*(struct ContextStringPair *)(uintptr_t)__ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_key(&s));
-for(spec = qualifiers->first; spec; spec = spec->next)
{
-if(spec->type == 0)
+struct __ecereNameSpace__ecere__com__Iterator l =
{
-if(spec->specifier == CONST || spec->specifier == VOLATILE || spec->specifier == EXTERN || spec->specifier == STATIC || spec->specifier == AUTO || spec->specifier == REGISTER)
-continue;
-break;
-}
-else if(spec->type != 5)
-break;
+((struct __ecereNameSpace__ecere__com__Instance *)(uintptr_t)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data((void *)(&s))), 0
+};
+
+while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next(&l))
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "#: %s%s:%d\n", filePrefix, srcFileFixed, (*(struct Location *)(uintptr_t)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&l)).start.line);
}
-if(!spec)
-{
-ListAdd(qualifiers, MkSpecifierName(decl->identifier->string));
-FreeDeclarator(decl);
-parentDecl->declarator = (((void *)0));
+if(pair.context)
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgctxt \"%s\"\n", pair.context);
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgid \"%s\"\n", pair.string);
+__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgstr \"%s\"\n\n", pair.string);
}
}
+(__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0);
}
-return __extension__ ({
-struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
+((void (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = intlStrings;
-__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
-});
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Free])(intlStrings);
+}
}
-extern char * __ecereNameSpace__ecere__sys__RSearchString(const char * buffer, const char * subStr, int maxLen, unsigned int matchCase, unsigned int matchWord);
+void __ecereUnregisterModule_ast(struct __ecereNameSpace__ecere__com__Instance * module)
+{
-extern void FreeSpecifier(struct Specifier * spec);
+}
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
+unsigned int ModuleAccess(struct __ecereNameSpace__ecere__com__Instance * searchIn, struct __ecereNameSpace__ecere__com__Instance * searchFor)
+{
+struct __ecereNameSpace__ecere__com__SubModule * subModule;
-struct TypeName * MkTypeNameGuessDecl(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
+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)
{
-if(qualifiers != (((void *)0)))
+if(subModule->importMode == 1)
{
-unsigned int gotType = 0x0;
-unsigned int gotFullType = 0x0;
-struct Specifier * spec, * next;
+if(ModuleAccess(subModule->module, searchFor))
+return 1;
+}
+}
+return 0;
+}
-for(spec = qualifiers->first; spec; spec = next)
+struct Expression * MkExpIntlString(const char * string, const char * context)
{
-next = spec->next;
-if(gotType && !declarator && ((spec->type == 1 && spec->name) || (spec->type == 0 && gotFullType)))
+if(inCompiler)
{
-const char * s = (((void *)0));
+struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
+char * s;
-if(spec->type == 1)
+if(inCompiler)
+{
+struct ContextStringPair pair =
{
-char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+0, 0
+};
+struct __ecereNameSpace__ecere__com__Instance * list;
+int len = strlen(string);
-s = colon ? colon + 2 : spec->name;
-}
-else if(spec->type == 0)
+pair.string = __ecereNameSpace__ecere__com__eSystem_New(sizeof(unsigned char) * (len - 2 + 1));
+memcpy(pair.string, string + 1, len - 2);
+pair.string[len - 2] = '\0';
+if(context)
{
-if(spec->specifier == INT64)
-s = "int64";
+len = strlen(context);
+pair.context = __ecereNameSpace__ecere__com__eSystem_New(sizeof(unsigned char) * (len - 2 + 1));
+memcpy(pair.context, context + 1, len - 2);
+pair.context[len - 2] = '\0';
}
-if(s)
+list = (((struct __ecereNameSpace__ecere__com__Instance *)((uintptr_t)(__extension__ ({
+struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
{
-declarator = MkDeclaratorIdentifier(MkIdentifier(s));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(qualifiers, spec);
-FreeSpecifier(spec);
-spec = (((void *)0));
-}
-}
-if(spec && spec->type != 5)
+intlStrings, 0
+};
+
+__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(uintptr_t)(&pair)), 0);
+((struct __ecereNameSpace__ecere__com__Instance *)(uintptr_t)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&__internalIterator));
+})))));
+if(!list)
{
-if(spec->type == 0)
+list = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__List_TPL_Location_);
+__extension__ ({
+struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
{
-if(spec->specifier == CONST || spec->specifier == VOLATILE || spec->specifier == EXTERN || spec->specifier == STATIC || spec->specifier == AUTO || spec->specifier == REGISTER)
-continue;
-else if(spec->specifier != UNSIGNED && spec->specifier != SIGNED && spec->specifier != LONG)
-gotFullType = 0x1;
-gotType = 0x1;
+intlStrings, 0
+};
+
+__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(uintptr_t)(&pair)), 1);
+__ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)((uintptr_t)(list))));
+});
}
else
{
-gotFullType = 0x1;
-gotType = 0x1;
+(__ecereNameSpace__ecere__com__eSystem_Delete(pair.string), pair.string = 0);
+(__ecereNameSpace__ecere__com__eSystem_Delete(pair.context), pair.context = 0);
}
+((struct __ecereNameSpace__ecere__com__IteratorPointer * (*)(struct __ecereNameSpace__ecere__com__Instance *, uint64 value))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = list;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__List->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Add])(list, (uint64)(uintptr_t)(&yylloc));
}
+s = QMkString(i18nModuleName ? i18nModuleName : "");
+ListAdd(list, MkExpString(s));
+(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
+ListAdd(list, MkExpString(string));
+if(context)
+{
+int lenString = strlen(string), lenContext = strlen(context);
+char * msgid = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (lenString - 2 + lenContext - 2 + 4));
+
+msgid[0] = '\"';
+memcpy(msgid + 1, context + 1, lenContext - 2);
+msgid[1 + lenContext - 2] = (char)4;
+memcpy(msgid + 1 + lenContext - 2 + 1, string + 1, lenString - 2);
+memcpy(msgid + 1 + lenContext - 2 + 1 + lenString - 2, "\"", 2);
+ListAdd(list, MkExpString(msgid));
+(__ecereNameSpace__ecere__com__eSystem_Delete(msgid), msgid = 0);
}
+else
+ListAdd(list, QMkExpId("null"));
+return MkExpCall(QMkExpId("GetTranslatedString"), list);
}
-return __extension__ ({
-struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
+else
+{
+struct Expression * e = MkExpString(string);
-__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
-});
+e->__anon1.__anon2.intlString = 1;
+return e;
+}
}
-struct Identifier * GetDeclId(struct Declarator * decl)
+struct ModuleImport * FindModule(struct __ecereNameSpace__ecere__com__Instance * moduleToFind)
{
-while(decl && decl->type != 1)
-decl = decl->declarator;
-return decl ? decl->identifier : (((void *)0));
-}
+struct ModuleImport * module;
-struct Declaration * MkDeclarationClassInst(struct Instantiation * inst)
+if(!((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->name)
+return mainModule;
+for(module = (*imports).first; module; module = module->next)
+if(module->name && !strcmp(module->name, ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->name))
+break;
+if(!module)
{
-return __extension__ ({
-struct Declaration * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration);
+module = __extension__ ({
+struct ModuleImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport);
-__ecereInstance1->type = 2, __ecereInstance1->inst = inst, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->name), __ecereInstance1->importType = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->importType, __ecereInstance1->importAccess = ModuleAccess(privateModule, moduleToFind) ? 1 : 2, __ecereInstance1;
});
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*imports), module);
+}
+return module;
}
-extern struct Context * globalContext;
-
-struct Type * MkClassTypeSymbol(struct Symbol * symbol);
-
-extern struct __ecereNameSpace__ecere__sys__OldList * excludedSymbols;
-
-struct Declaration * MkDeclarationInst(struct Instantiation * inst)
+struct Symbol * FindClass(const char * name)
{
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 2, decl->inst = inst, decl->loc = yylloc, decl);
-struct Symbol * symbol;
+struct Symbol * cl = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * _class;
+unsigned int global = 0;
+char fullName[1024];
-if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+if(name[0] == ':' && name[1] == ':')
+{
+global = 1;
+name += 2;
+}
+if(!global && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
{
-char name[1024];
int len = 0, stringLen;
if(defaultNameSpace)
{
-memcpy(name, defaultNameSpace, defaultNameSpaceLen);
+memcpy(fullName, defaultNameSpace, defaultNameSpaceLen);
len += defaultNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
+fullName[len++] = ':';
+fullName[len++] = ':';
}
if(currentNameSpace)
{
-memcpy(name + len, currentNameSpace, currentNameSpaceLen);
+memcpy(fullName + len, currentNameSpace, currentNameSpaceLen);
len += currentNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
+fullName[len++] = ':';
+fullName[len++] = ':';
}
-stringLen = strlen(inst->exp->identifier->string);
-memcpy(name + len, inst->exp->identifier->string, stringLen);
+stringLen = strlen(name);
+memcpy(fullName + len, name, stringLen);
len += stringLen;
-name[len] = (char)0;
-(__ecereNameSpace__ecere__com__eSystem_Delete(inst->exp->identifier->string), inst->exp->identifier->string = 0);
-inst->exp->identifier->string = __ecereNameSpace__ecere__sys__CopyString(name);
+fullName[len] = (char)0;
+cl = globalContext ? (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, fullName) : (((void *)0));
}
-symbol = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-
-__ecereInstance1->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys__CopyString(inst->exp->identifier->string) : (((void *)0)), __ecereInstance1->type = MkClassTypeSymbol(inst->_class->symbol), __ecereInstance1;
-});
-symbol->idCode = symbol->id = curContext->nextID++;
-if(strstr(symbol->string, "::"))
-curContext->hasNameSpace = 0x1;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-decl->symbol = inst->symbol = symbol;
-return decl;
+if(!cl)
+cl = globalContext ? (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, name) : (((void *)0));
+if(!cl && !global)
+{
+for(cl = globalContext ? (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&globalContext->classes) : (((void *)0)); cl; cl = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)cl)))
+{
+if(cl->shortName && !strcmp(cl->shortName, name))
+break;
}
-
-extern void PrintExpression(struct Expression * exp, char * string);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DefinedExpression;
-
-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);
-
-extern struct __ecereNameSpace__ecere__com__Instance * privateModule;
-
-extern struct __ecereNameSpace__ecere__com__DefinedExpression * __ecereNameSpace__ecere__com__eSystem_RegisterDefine(const char * name, const char * value, struct __ecereNameSpace__ecere__com__Instance * module, int declMode);
-
-extern unsigned int buildingECERECOMModule;
-
-extern void Compiler_Warning(const char * format, ...);
-
-extern const char * __ecereNameSpace__ecere__GetTranslatedString(const char * name, const char * string, const char * stringAndContext);
-
-struct Declaration * MkDeclarationDefine(struct Identifier * id, struct Expression * exp)
+}
+if(!cl)
+{
+_class = (((void *)0));
+if(!global && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, fullName);
+if(!_class)
+_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, name);
+if(_class)
{
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 3, decl->id = id, decl->exp = exp, decl->loc = yylloc, decl);
-char expString[1024];
-
-expString[0] = '\0';
-PrintExpression(exp, expString);
-if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+name = _class->fullName;
+cl = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, name);
+if(!cl)
{
-char name[1024];
-int len = 0, stringLen;
+cl = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-if(defaultNameSpace)
-{
-memcpy(name, defaultNameSpace, defaultNameSpaceLen);
-len += defaultNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->__anon1.registered = _class, __ecereInstance1->notYetDeclared = 1, __ecereInstance1->imported = 1, __ecereInstance1;
+});
+_class->symbol = cl;
+if(_class->module)
+cl->module = FindModule(_class->module);
+else
+cl->module = mainModule;
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)cl))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), cl);
+if(strcmp(name, _class->name))
+cl->shortName = __ecereNameSpace__ecere__sys__CopyString(_class->name);
}
-if(currentNameSpace)
-{
-memcpy(name + len, currentNameSpace, currentNameSpaceLen);
-len += currentNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
}
-stringLen = strlen(id->string);
-memcpy(name + len, id->string, stringLen);
-len += stringLen;
-name[len] = (char)0;
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(name);
}
-if(!__ecereNameSpace__ecere__com__eSystem_FindDefine(privateModule, id->string))
-__ecereNameSpace__ecere__com__eSystem_RegisterDefine(id->string, expString, privateModule, buildingECERECOMModule ? 4 : 1);
-else
-Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "Redefinition of %s ignored\n", (((void *)0))), id->string);
-return decl;
+return cl;
}
-extern int sprintf(char * , const char * , ...);
-
-struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(struct __ecereNameSpace__ecere__sys__BinaryTree * this, const char * key);
-
-struct Declaration * MkDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * initDeclarators)
+struct Identifier * MkIdentifier(const char * string)
{
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 1, decl->declarators = initDeclarators, decl->specifiers = specifiers, decl->loc = yylloc, decl);
-unsigned int variable = 0x1;
+struct Identifier * id = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Identifier);
+int c;
-if(specifiers != (((void *)0)))
+id->_class = (((void *)0));
+if(string)
{
-unsigned int gotType = 0x0;
-struct Specifier * spec, * next;
+const char * namePart;
+unsigned int gotColon = 0;
-for(spec = specifiers->first; spec; spec = next)
-{
-next = spec->next;
-if(spec->type == 0 && spec->specifier == TYPEDEF)
+for(c = strlen(string) - 1; c >= 0; c--)
+if(string[c] == ':')
{
-if(initDeclarators != (((void *)0)))
+gotColon = 1;
+break;
+}
+namePart = string + c + 1;
+while(c >= 0 && string[c] == ':')
+c--;
+if(c >= 0)
{
-struct InitDeclarator * d;
+char name[1024];
+struct Symbol * symbol;
-for(d = initDeclarators->first; d; d = d->next)
-{
-if(GetDeclId(d->declarator)->string)
+memcpy(name, string, c + 1);
+name[c + 1] = '\0';
+if(!strcmp(name, "typed_object"))
{
-struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(GetDeclId(d->declarator)->string), type->type = ProcessType(specifiers, d->declarator), type);
-
-type->id = type->idCode = curContext->nextID++;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->types, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), type);
-decl->symbol = d->declarator->symbol = type;
-}
+id->_class = MkSpecifierName("typed_object");
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
+else if(!strcmp(name, "property"))
+{
+id->_class = MkSpecifierName("property");
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
-else if(spec->next)
+else if(!strcmp(name, "typed_object&"))
{
-spec = specifiers->last;
+id->_class = MkSpecifierName("typed_object&");
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
+}
+else if(!strcmp(name, "any_object"))
{
-if((spec->type == 1 && spec->name) || spec->type == 0)
+id->_class = MkSpecifierName("any_object");
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
+}
+else
{
-const char * s = (((void *)0));
+struct TemplatedType * templatedType = FindTemplateTypeParameter(curContext, name);
-if(spec->type == 1)
+if(templatedType)
{
-const char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+id->_class = __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-s = colon ? colon + 2 : spec->name;
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.templateParameter = templatedType->param, __ecereInstance1;
+});
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
-else if(spec->type == 0)
+else
{
-if(spec->specifier == INT64)
-s = "int64";
-}
-if(s)
+symbol = FindClass(name);
+if(symbol)
{
-struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(s), type->type = ProcessType(specifiers, (((void *)0))), type);
-
-type->id = type->idCode = curContext->nextID++;
-decl->symbol = type;
-decl->declarators = initDeclarators = MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
-FreeSpecifier(spec);
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->types, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), type);
+id->_class = _MkSpecifierName(symbol->string, symbol, (((void *)0)));
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
+else
+id->string = __ecereNameSpace__ecere__sys__CopyString(string);
}
}
}
-variable = 0x0;
-break;
+else if(gotColon)
+{
+id->_class = MkSpecifierName((((void *)0)));
+id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
-else if(spec->type == 0 && (spec->specifier == STRUCT || spec->specifier == UNION))
-variable = 0x0;
else
+id->string = __ecereNameSpace__ecere__sys__CopyString(string);
+}
+else
+id->string = __ecereNameSpace__ecere__sys__CopyString("");
+return id;
+}
+
+void SetClassTemplateArgs(struct Specifier * spec, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
{
-if(gotType && initDeclarators == (((void *)0)) && !spec->next && ((spec->type == 1 && spec->name) || spec->type == 0))
+if(spec->type == 1)
{
-const char * s = (((void *)0));
+struct Symbol * symbol = spec->__anon1.__anon1.symbol;
-if(spec->type == 1)
+spec->__anon1.__anon1.templateArgs = templateArgs;
+if(templateArgs && templateArgs->first)
+{
+char templateString[1024];
+struct TemplateArgument * arg;
+
+strcpy(templateString, symbol ? symbol->string : spec->__anon1.__anon1.name);
+strcat(templateString, "<");
+for(arg = templateArgs->first; arg; arg = arg->next)
+{
+char argument[256];
+
+argument[0] = '\0';
+switch(arg->type)
+{
+case 2:
{
-char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+char expString[1024];
+struct __ecereNameSpace__ecere__com__Class * backupThisClass = thisClass;
-s = colon ? colon + 2 : spec->name;
+thisClass = (((void *)0));
+expString[0] = '\0';
+PrintExpression(arg->__anon1.expression, expString);
+strcat(argument, expString);
+thisClass = backupThisClass;
+break;
}
-else if(spec->type == 0)
+case 1:
{
-if(spec->specifier == INT64)
-s = "int64";
+strcat(argument, arg->__anon1.identifier->string);
+break;
}
-if(s)
+case 0:
{
-decl->declarators = initDeclarators = MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
-FreeSpecifier(spec);
-spec = (((void *)0));
+char * typeString = StringFromSpecDecl(arg->__anon1.templateDatatype->specifiers, arg->__anon1.templateDatatype->decl);
+
+strcat(argument, typeString);
+(__ecereNameSpace__ecere__com__eSystem_Delete(typeString), typeString = 0);
+break;
}
}
+if(argument[0])
+{
+if(arg->prev)
+strcat(templateString, ", ");
+if(arg->name)
+{
+strcat(templateString, arg->name->string);
+strcat(templateString, " = ");
}
-if(spec && spec->type != 5)
-gotType = 0x1;
+strcat(templateString, argument);
}
}
-if(variable && initDeclarators)
{
-struct InitDeclarator * d;
+int len = strlen(templateString);
-for(d = initDeclarators->first; d; d = d->next)
+if(templateString[len - 1] == '>')
+templateString[len++] = ' ';
+templateString[len++] = '>';
+templateString[len++] = '\0';
+}
+symbol = FindClass(templateString);
+if(!symbol && spec->__anon1.__anon1.symbol)
{
-struct Identifier * id = GetDeclId(d->declarator);
+symbol = _DeclClass((((void *)0)), templateString);
+symbol->notYetDeclared = 1;
+}
+if(spec->__anon1.__anon1.symbol)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&spec->__anon1.__anon1.symbol->templatedClasses, __extension__ ({
+struct __ecereNameSpace__ecere__sys__OldLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__OldLink));
-if(id && id->string && id->string[0])
-{
-if(curContext)
-{
-struct Symbol * symbol;
+__ecereInstance1->data = symbol, __ecereInstance1;
+}));
+(__ecereNameSpace__ecere__com__eSystem_Delete(spec->__anon1.__anon1.name), spec->__anon1.__anon1.name = 0);
+spec->__anon1.__anon1.symbol = symbol;
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(symbol ? symbol->string : templateString);
+}
+}
+else
+FreeList(templateArgs, (void *)(FreeTemplateArgument));
+}
-if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+struct Symbol * _DeclClass(struct Specifier * _class, const char * name)
{
-char name[1024];
-int len = 0, stringLen;
+struct Symbol * symbol;
+char nameBuffer[1024];
-if(defaultNameSpace)
-{
-memcpy(name, defaultNameSpace, defaultNameSpaceLen);
-len += defaultNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
-}
-if(currentNameSpace)
+if(_class)
{
-memcpy(name + len, currentNameSpace, currentNameSpaceLen);
-len += currentNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
-}
-stringLen = strlen(id->string);
-memcpy(name + len, id->string, stringLen);
-len += stringLen;
-name[len] = (char)0;
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(name);
+strcpy(nameBuffer, _class->__anon1.__anon1.name ? _class->__anon1.__anon1.name : "");
+strcat(nameBuffer, "::");
+strcat(nameBuffer, name);
+name = nameBuffer;
}
-symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, id->string);
+symbol = FindClass(name);
if(!symbol)
{
+if(name[0] == ':' && name[1] == ':')
+name += 2;
symbol = __extension__ ({
struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(specifiers, d->declarator), __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->notYetDeclared = 1, __ecereInstance1;
});
-if(strstr(symbol->string, "::"))
-curContext->hasNameSpace = 0x1;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-if(symbol->type && symbol->type->kind == 12 && !symbol->type->arraySizeExp && d->initializer)
-{
-if(d->initializer->type == 1)
{
-char string[256];
-
-sprintf(string, "%d", (*d->initializer->list).count);
-symbol->type->arraySizeExp = MkExpConstant(string);
-symbol->type->freeExp = 0x1;
-}
-else if(d->initializer->type == 0 && d->initializer->exp->type == 3 && d->initializer->exp->string)
-{
-char string[256];
-int c, count = 0;
+int start = 0, c;
char ch;
-unsigned int escaped = 0x0;
-char * s = d->initializer->exp->string;
-for(c = 1; (ch = s[c]); c++)
+for(c = 0; (ch = name[c]); c++)
{
-if(ch == '\\' && !escaped)
-escaped = 0x1;
-else
+if(ch == '.' || (ch == ':' && name[c + 1] == ':'))
{
-count++;
-escaped = 0x0;
+if(ch == ':')
+c++;
+start = c + 1;
}
}
-sprintf(string, "%d", count);
-symbol->type->arraySizeExp = MkExpConstant(string);
-symbol->type->freeExp = 0x1;
+if(start && c - start)
+symbol->shortName = __ecereNameSpace__ecere__sys__CopyString(name + start);
}
}
-symbol->id = symbol->idCode = curContext->nextID++;
+return symbol;
}
-decl->symbol = d->declarator->symbol = symbol;
+
+int CheckType(const char * text)
+{
+if(FindTemplateTypeParameter(curContext, text))
+{
+return TYPE_NAME;
}
+if(FindType(curContext, text))
+{
+return TYPE_NAME;
}
+if(FindClass(text))
+{
+return TYPE_NAME;
}
+return IDENTIFIER;
}
-else
+
+struct Type * MkClassType(const char * name)
{
-decl->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-decl->symbol->id = decl->symbol->idCode = curContext->nextID++;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), decl->symbol);
+if(name)
+{
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->__anon1._class = FindClass(name), type);
+
+if(!type->__anon1._class)
+{
+type->kind = 3;
}
-return decl;
+type->refCount = 1;
+return type;
+}
+return (((void *)0));
}
-struct Declaration * MkStructDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * declarators, struct Specifier * extStorage)
+struct TypeName * MkTypeNameGuessDecl(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
{
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 0, decl->declarators = declarators, decl->specifiers = specifiers, decl->extStorage = extStorage, decl->loc = yylloc, decl);
-
-if(specifiers != (((void *)0)))
+if(qualifiers != (((void *)0)))
{
-unsigned int gotType = 0x0;
+unsigned int gotType = 0;
+unsigned int gotFullType = 0;
struct Specifier * spec, * next;
-for(spec = specifiers->first; spec; spec = next)
+for(spec = qualifiers->first; spec; spec = next)
{
next = spec->next;
-if(gotType && declarators == (((void *)0)) && ((spec->type == 1 && spec->name) || spec->type == 0))
+if(gotType && !declarator && ((spec->type == 1 && spec->__anon1.__anon1.name) || (spec->type == 0 && gotFullType)))
{
const char * s = (((void *)0));
if(spec->type == 1)
{
-const char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->name, "::", strlen(spec->name), 0x1, 0x0);
+char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 1, 0);
-s = colon ? colon + 2 : spec->name;
+s = colon ? colon + 2 : spec->__anon1.__anon1.name;
}
else if(spec->type == 0)
{
-if(spec->specifier == INT64)
+if(spec->__anon1.specifier == INT64)
s = "int64";
}
if(s)
{
-decl->declarators = declarators = MkListOne(MkStructDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+declarator = MkDeclaratorIdentifier(MkIdentifier(s));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(qualifiers, spec);
FreeSpecifier(spec);
spec = (((void *)0));
}
}
if(spec && spec->type != 5)
-gotType = 0x1;
-}
-}
-return decl;
-}
-
-struct Statement * MkLabeledStmt(struct Identifier * id, struct Statement * statement)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 0, __ecereInstance1->labeled.id = id, __ecereInstance1->labeled.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
-
-struct Statement * MkCaseStmt(struct Expression * exp, struct Statement * statement)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 1, __ecereInstance1->caseStmt.exp = exp, __ecereInstance1->caseStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
-
-struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 2, __ecereInstance1->compound.declarations = declarations, __ecereInstance1->compound.statements = statements, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
-
-struct Statement * MkExpressionStmt(struct __ecereNameSpace__ecere__sys__OldList * expressions)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 3, __ecereInstance1->expressions = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
-
-struct Statement * MkBadDeclStmt(struct Declaration * decl)
{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 14, __ecereInstance1->decl = decl, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
-
-struct Statement * MkIfStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement, struct Statement * elseStmt)
+if(spec->type == 0)
{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 4, __ecereInstance1->ifStmt.exp = exp, __ecereInstance1->ifStmt.stmt = statement, __ecereInstance1->ifStmt.elseStmt = elseStmt, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
+if(spec->__anon1.specifier == CONST || spec->__anon1.specifier == VOLATILE || spec->__anon1.specifier == EXTERN || spec->__anon1.specifier == STATIC || spec->__anon1.specifier == AUTO || spec->__anon1.specifier == REGISTER)
+continue;
+else if(spec->__anon1.specifier != UNSIGNED && spec->__anon1.specifier != SIGNED && spec->__anon1.specifier != LONG)
+gotFullType = 1;
+gotType = 1;
}
-
-struct Statement * MkSwitchStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
+else
{
-if(statement)
-statement->compound.isSwitch = 0x1;
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 5, __ecereInstance1->switchStmt.exp = exp, __ecereInstance1->switchStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
+gotFullType = 1;
+gotType = 1;
}
-
-struct Statement * MkWhileStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 6, __ecereInstance1->whileStmt.exp = exp, __ecereInstance1->whileStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
}
-
-struct Statement * MkDoWhileStmt(struct Statement * statement, struct __ecereNameSpace__ecere__sys__OldList * exp)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 7, __ecereInstance1->doWhile.exp = exp, __ecereInstance1->doWhile.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
}
-
-struct Statement * MkForStmt(struct Statement * init, struct Statement * check, struct __ecereNameSpace__ecere__sys__OldList * inc, struct Statement * statement)
-{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 8, __ecereInstance1->forStmt.init = init, __ecereInstance1->forStmt.check = check, __ecereInstance1->forStmt.increment = inc, __ecereInstance1->forStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
}
-
-struct Statement * MkForEachStmt(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * exp, struct __ecereNameSpace__ecere__sys__OldList * filter, struct Statement * statement)
-{
return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
-__ecereInstance1->type = 18, __ecereInstance1->forEachStmt.id = id, __ecereInstance1->forEachStmt.exp = exp, __ecereInstance1->forEachStmt.filter = filter, __ecereInstance1->forEachStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
});
}
-struct Statement * MkGotoStmt(struct Identifier * id)
+void SetupBaseSpecs(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs)
{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 9, __ecereInstance1->gotoStmt.id = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
-
-struct Statement * MkContinueStmt()
+if(baseSpecs && baseSpecs->first && ((struct Specifier *)baseSpecs->first)->type == 1)
{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 10, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
+char name[1024];
+struct Symbol * baseClass;
+char * tpl;
-struct Statement * MkBreakStmt()
+strcpy(name, ((struct Specifier *)baseSpecs->first)->__anon1.__anon1.name);
+tpl = strchr(name, '<');
+if(tpl)
+*tpl = (char)0;
+baseClass = FindClass(name);
+if(baseClass && baseClass->ctx)
{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-
-__ecereInstance1->type = 11, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
-}
+struct TemplatedType * copy;
-struct Statement * MkReturnStmt(struct __ecereNameSpace__ecere__sys__OldList * exp)
+for(copy = (struct TemplatedType *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&baseClass->ctx->templateTypes); copy; copy = (struct TemplatedType *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next((void *)(copy)))
{
-return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = copy->key, type->param = copy->param, type);
-__ecereInstance1->type = 12, __ecereInstance1->expressions = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
-});
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
+((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor((void *)type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
}
-
-struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit);
-
-struct FunctionDefinition * MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList)
-{
-return _MkFunction(specifiers, declarator, declarationList, 0x1);
}
-
-extern struct Declarator * GetFuncDecl(struct Declarator * decl);
-
-extern void Compiler_Error(const char * format, ...);
-
-struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit)
-{
-if(errorOnOmit)
+else if(baseClass && baseClass->__anon1.registered)
{
-struct Declarator * funcDecl = GetFuncDecl(declarator);
+struct __ecereNameSpace__ecere__com__Class * sClass;
-if(funcDecl && funcDecl->function.parameters)
+for(sClass = baseClass->__anon1.registered; sClass; sClass = sClass->base)
{
-struct TypeName * tn;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * p;
-for(tn = (*funcDecl->function.parameters).first; tn; tn = tn->next)
+for(p = sClass->templateParams.first; p; p = p->next)
{
-if(tn->qualifiers || tn->declarator)
+if(p->type == 0)
{
-struct Identifier * declID = tn->declarator ? GetDeclId(tn->declarator) : (((void *)0));
+struct TemplateParameter * param = p->param;
+struct TemplatedType * type;
-if(!declID)
+if(!param)
{
-struct Specifier * spec = tn->qualifiers ? (*tn->qualifiers).first : (((void *)0));
-
-if(!tn->declarator && !tn->prev && !tn->next && spec && !spec->next && spec->type == 0 && spec->specifier == VOID)
-;
-else
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "parameter name omitted\n", (((void *)0))));
-break;
-}
-}
-}
-}
-}
-return __extension__ ({
-struct FunctionDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionDefinition);
+p->param = param = __extension__ ({
+struct TemplateParameter * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter);
-__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = declarator, __ecereInstance1->declarations = declarationList, __ecereInstance1;
+__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);
-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 ProcessFunctionBody(struct FunctionDefinition * func, struct Statement * body)
-{
-struct Declarator * declarator = func->declarator;
-struct Declarator * funcDecl = GetFuncDecl(declarator);
-struct Symbol * symbol;
-
-func->body = body;
-if(funcDecl && funcDecl->function.parameters && body)
-{
-struct Context * context = body->compound.context;
-struct TypeName * param;
-
-for(param = (*funcDecl->function.parameters).first; param; param = param->next)
-{
-if(param->declarator)
-{
-struct Symbol * symbol = (((void *)0));
-struct Identifier * id = GetDeclId(param->declarator);
-char * string = id ? id->string : (((void *)0));
-
-if(string)
-{
-for(symbol = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&context->symbols); symbol; symbol = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)symbol)))
-if(!strcmp(symbol->string, string))
-break;
-if(!symbol && id)
-{
-symbol = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 0x1, __ecereInstance1;
-});
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-symbol->id = context->nextID++;
-param->declarator->symbol = symbol;
+__ecereInstance1->key = (uintptr_t)p->name, __ecereInstance1->param = param, __ecereInstance1;
+});
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
+((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor((void *)type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
+}
}
}
}
}
}
-if(!declarator->symbol)
-{
-struct Identifier * id = GetDeclId(declarator);
-if((currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0 && strcmp(id->string, "__on_register_module"))
+struct Specifier * _MkSpecifierName(const char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
{
-char name[1024];
-int len = 0, stringLen;
+struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = 1, spec);
-if(defaultNameSpace)
+if(name)
{
-memcpy(name, defaultNameSpace, defaultNameSpaceLen);
-len += defaultNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
-}
-if(currentNameSpace)
+if(!symbol)
{
-memcpy(name + len, currentNameSpace, currentNameSpaceLen);
-len += currentNameSpaceLen;
-name[len++] = ':';
-name[len++] = ':';
-}
-stringLen = strlen(id->string);
-memcpy(name + len, id->string, stringLen);
-len += stringLen;
-name[len] = (char)0;
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = __ecereNameSpace__ecere__sys__CopyString(name);
-}
-symbol = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+struct TemplatedType * templatedType = FindTemplateTypeParameter(curContext, name);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(func->specifiers, declarator), __ecereInstance1;
-});
-symbol->idCode = symbol->id = globalContext->nextID++;
-if(strstr(symbol->string, "::"))
-globalContext->hasNameSpace = 0x1;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-declarator->symbol = symbol;
+if(templatedType)
+{
+spec->__anon1.templateParameter = templatedType->param;
+spec->type = 8;
+return spec;
}
else
-{
-symbol = declarator->symbol;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*excludedSymbols), declarator->symbol);
-(__ecereNameSpace__ecere__com__eSystem_Delete(symbol->string), symbol->string = 0);
-symbol->string = __ecereNameSpace__ecere__sys__CopyString(GetDeclId(declarator)->string);
-if(strstr(symbol->string, "::"))
-globalContext->hasNameSpace = 0x1;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-if(!symbol->type)
-symbol->type = ProcessType(func->specifiers, declarator);
+symbol = FindClass(name);
}
-if(symbol->type && (symbol->type->kind == 11 || symbol->type->kind == 16))
+if(symbol && symbol->__anon1.registered && symbol->__anon1.registered->isRemote == 1)
{
-if(!symbol->type->params.count)
-{
-struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type);
+char className[1024];
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&symbol->type->params, type);
-}
-}
+strcpy(className, "DCOMClient_");
+if(!strncmp(name, className, strlen(className)))
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(name);
else
{
+strcat(className, name);
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(className);
}
}
-
-struct External * MkExternalFunction(struct FunctionDefinition * function)
+else if(symbol)
{
-struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 0, external->function = function, external->symbol = function->declarator->symbol, external);
+char nameSpace[1024];
+char * c = strstr(name, symbol->string);
-if(function->specifiers)
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
+if(c && c >= name + 2 && c[-1] == ':' && c[-2] == ':')
{
-struct Specifier * spec;
-
-for(spec = (*function->specifiers).first; spec; spec = spec->next)
-if(spec->type == 0 && spec->specifier == STATIC)
+if(c > name + 2)
{
-structDeclMode = declMode = 3;
-break;
+memcpy(nameSpace, name, c - name - 2);
+nameSpace[c - name] = (char)0;
+spec->__anon1.__anon1.nsSpec = _MkSpecifierName(nameSpace, (((void *)0)), (((void *)0)));
}
+else
+spec->__anon1.__anon1.nsSpec = _MkSpecifierName((((void *)0)), (((void *)0)), (((void *)0)));
}
-if(external->symbol && !external->symbol->methodExternal)
-external->symbol->methodExternal = external;
-return external;
+}
+else
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(name);
+spec->__anon1.__anon1.symbol = symbol;
+if(templateArgs != (((void *)0)))
+SetClassTemplateArgs(spec, templateArgs);
+}
+return spec;
}
-extern char * strncpy(char * , const char * , size_t n);
-
-extern void ImportModule(char * name, int importType, int importAccess, unsigned int loadDllOnly);
+struct ClassDef;
-struct External * MkExternalImport(char * name, int importType, int importAccess)
-{
-struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 3, external);
-int len = strlen(name) - 2;
+struct Expression * GetTemplateArgExpByName(const char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType);
-external->importString = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (len + 1));
-strncpy(external->importString, name + 1, len);
-external->importString[len] = '\0';
-(__ecereNameSpace__ecere__com__eSystem_Delete(name), name = 0);
+struct Expression * GetTemplateArgExp(struct TemplateParameter * param, struct __ecereNameSpace__ecere__com__Class * curClass, unsigned int pointer)
{
-ImportModule(external->importString, importType, importAccess, 0x1);
-ImportModule(external->importString, importType, importAccess, 0x0);
-}
-return external;
+return param->identifier ? GetTemplateArgExpByName(param->identifier->string, curClass, 0) : (((void *)0));
}
-struct External * MkExternalDeclaration(struct Declaration * declaration)
+struct Declaration;
+
+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 External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 1, external->declaration = declaration, external->symbol = declaration ? declaration->symbol : (((void *)0)), external);
-struct InitDeclarator * d = (declaration && declaration->declarators) ? (*declaration->declarators).last : (((void *)0));
+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));
-if(declaration && declaration->type == 1 && declaration->specifiers)
+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;
-
-for(spec = (*declaration->specifiers).first; spec; spec = spec->next)
-if(spec->type == 0 && spec->specifier == TYPEDEF)
+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
{
-structDeclMode = declMode = 0;
-break;
-}
-else if(spec->type == 0 && spec->specifier == STATIC)
+struct Expression * watcher;
+struct Expression * object;
+struct __ecereNameSpace__ecere__sys__OldList * watches;
+} __attribute__ ((gcc_struct)) _watch;
+struct
{
-structDeclMode = declMode = 3;
-break;
-}
-}
-if(declaration && declaration->symbol && !declaration->symbol->methodExternal)
-declaration->symbol->methodExternal = external;
-return external;
-}
+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));
-struct External * MkExternalNameSpace(struct Identifier * identifier)
+struct External
{
-struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 4, external->id = identifier, external);
-
-currentNameSpace = identifier ? identifier->string : (((void *)0));
-currentNameSpaceLen = currentNameSpace ? strlen(currentNameSpace) : 0;
-return external;
-}
-
-extern char * strcpy(char * , const char * );
-
-extern char * strcat(char * , const char * );
-
-extern struct __ecereNameSpace__ecere__com__Class * thisClass;
-
-extern char * StringFromSpecDecl(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
-
-struct Symbol * _DeclClass(int symbolID, const char * name);
+struct External * prev;
+struct External * next;
+struct Location loc;
+int type;
+struct Symbol * symbol;
+union
+{
+struct FunctionDefinition * function;
+struct ClassDefinition * _class;
+struct Declaration * declaration;
+char * importString;
+struct Identifier * id;
+struct DBTableDef * table;
+} __attribute__ ((gcc_struct)) __anon1;
+int importType;
+struct External * fwdDecl;
+struct __ecereNameSpace__ecere__com__Instance * outgoing;
+struct __ecereNameSpace__ecere__com__Instance * incoming;
+int nonBreakableIncoming;
+} __attribute__ ((gcc_struct));
-extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* FreeFunction)(void * ));
+struct Declaration * MkDeclarationInst(struct Instantiation * inst)
+{
+struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 2, decl->__anon1.inst = inst, decl->loc = yylloc, decl);
+struct Symbol * symbol;
-extern void FreeTemplateArgument(struct TemplateArgument * arg);
+if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+{
+char name[1024];
+int len = 0, stringLen;
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldLink;
+if(defaultNameSpace)
+{
+memcpy(name, defaultNameSpace, defaultNameSpaceLen);
+len += defaultNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
+}
+if(currentNameSpace)
+{
+memcpy(name + len, currentNameSpace, currentNameSpaceLen);
+len += currentNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
+}
+stringLen = strlen(inst->exp->__anon1.__anon1.identifier->string);
+memcpy(name + len, inst->exp->__anon1.__anon1.identifier->string, stringLen);
+len += stringLen;
+name[len] = (char)0;
+(__ecereNameSpace__ecere__com__eSystem_Delete(inst->exp->__anon1.__anon1.identifier->string), inst->exp->__anon1.__anon1.identifier->string = 0);
+inst->exp->__anon1.__anon1.identifier->string = __ecereNameSpace__ecere__sys__CopyString(name);
+}
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-struct __ecereNameSpace__ecere__sys__OldLink
-{
-struct __ecereNameSpace__ecere__sys__OldLink * prev;
-struct __ecereNameSpace__ecere__sys__OldLink * next;
-void * data;
-} __attribute__ ((gcc_struct));
+__ecereInstance1->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys__CopyString(inst->exp->__anon1.__anon1.identifier->string) : (((void *)0)), __ecereInstance1->type = MkClassTypeSymbol(inst->_class->__anon1.__anon1.symbol), __ecereInstance1;
+});
+if(strstr(symbol->string, "::"))
+curContext->hasNameSpace = 1;
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
+decl->symbol = inst->symbol = symbol;
+return decl;
+}
-void SetClassTemplateArgs(struct Specifier * spec, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
-{
-if(spec->type == 1)
+struct Declaration * MkDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * initDeclarators)
{
-struct Symbol * symbol = spec->symbol;
+struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 1, decl->__anon1.__anon1.declarators = initDeclarators, decl->__anon1.__anon1.specifiers = specifiers, decl->loc = yylloc, decl);
+unsigned int variable = 1;
-spec->templateArgs = templateArgs;
-if(templateArgs && templateArgs->first)
+if(specifiers != (((void *)0)))
{
-char templateString[1024];
-struct TemplateArgument * arg;
+unsigned int gotType = 0;
+struct Specifier * spec, * next;
-strcpy(templateString, symbol ? symbol->string : spec->name);
-strcat(templateString, "<");
-for(arg = templateArgs->first; arg; arg = arg->next)
+for(spec = specifiers->first; spec; spec = next)
{
-char argument[256];
-
-argument[0] = '\0';
-switch(arg->type)
+next = spec->next;
+if(spec->type == 0 && spec->__anon1.specifier == TYPEDEF)
{
-case 2:
+if(initDeclarators != (((void *)0)))
{
-char expString[1024];
-struct __ecereNameSpace__ecere__com__Class * backupThisClass = thisClass;
+struct InitDeclarator * d;
-thisClass = (((void *)0));
-expString[0] = '\0';
-PrintExpression(arg->expression, expString);
-strcat(argument, expString);
-thisClass = backupThisClass;
-break;
-}
-case 1:
+for(d = initDeclarators->first; d; d = d->next)
{
-strcat(argument, arg->identifier->string);
-break;
-}
-case 0:
+if(GetDeclId(d->declarator)->string)
{
-char * typeString = StringFromSpecDecl(arg->templateDatatype->specifiers, arg->templateDatatype->decl);
+struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(GetDeclId(d->declarator)->string), type->type = ProcessType(specifiers, d->declarator), type);
-strcat(argument, typeString);
-(__ecereNameSpace__ecere__com__eSystem_Delete(typeString), typeString = 0);
-break;
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->types, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), type);
+decl->symbol = d->declarator->symbol = type;
}
}
-if(argument[0])
+}
+else if(spec->next)
{
-if(arg->prev)
-strcat(templateString, ", ");
-if(arg->name)
+spec = specifiers->last;
{
-strcat(templateString, arg->name->string);
-strcat(templateString, " = ");
-}
-strcat(templateString, argument);
-}
-}
+if((spec->type == 1 && spec->__anon1.__anon1.name) || spec->type == 0)
{
-int len = strlen(templateString);
+const char * s = (((void *)0));
-if(templateString[len - 1] == '>')
-templateString[len++] = ' ';
-templateString[len++] = '>';
-templateString[len++] = '\0';
+if(spec->type == 1)
+{
+const char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 1, 0);
+
+s = colon ? colon + 2 : spec->__anon1.__anon1.name;
}
-symbol = FindClass(templateString);
-if(!symbol && spec->symbol)
+else if(spec->type == 0)
{
-symbol = _DeclClass((((int)0x7fffffff)), templateString);
+if(spec->__anon1.specifier == INT64)
+s = "int64";
}
-if(spec->symbol)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&spec->symbol->templatedClasses, __extension__ ({
-struct __ecereNameSpace__ecere__sys__OldLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_OldLink);
+if(s)
+{
+struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(s), type->type = ProcessType(specifiers, (((void *)0))), type);
-__ecereInstance1->data = symbol, __ecereInstance1;
-}));
-(__ecereNameSpace__ecere__com__eSystem_Delete(spec->name), spec->name = 0);
-spec->symbol = symbol;
-spec->name = __ecereNameSpace__ecere__sys__CopyString(symbol ? symbol->string : templateString);
+decl->symbol = type;
+decl->__anon1.__anon1.declarators = initDeclarators = MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+FreeSpecifier(spec);
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->types, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), type);
}
}
-else
-FreeList(templateArgs, FreeTemplateArgument);
}
-
-extern int strncmp(const char * , const char * , size_t n);
-
-struct Specifier * _MkSpecifierName(const char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
-{
-struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = 1, spec);
-
-if(name)
+}
+variable = 0;
+break;
+}
+else if(spec->type == 0 && (spec->__anon1.specifier == STRUCT || spec->__anon1.specifier == UNION))
+variable = 0;
+else
{
-if(!symbol)
+if(gotType && initDeclarators == (((void *)0)) && !spec->next && ((spec->type == 1 && spec->__anon1.__anon1.name) || spec->type == 0))
{
-struct TemplatedType * templatedType = FindTemplateTypeParameter(curContext, name);
+const char * s = (((void *)0));
-if(templatedType)
+if(spec->type == 1)
{
-spec->templateParameter = templatedType->param;
-spec->type = 8;
-return spec;
-}
-else
-symbol = FindClass(name);
+char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 1, 0);
+
+s = colon ? colon + 2 : spec->__anon1.__anon1.name;
}
-if(symbol && symbol->registered && symbol->registered->isRemote == 1)
+else if(spec->type == 0)
{
-char className[1024];
-
-strcpy(className, "DCOMClient_");
-if(!strncmp(name, className, strlen(className)))
-spec->name = __ecereNameSpace__ecere__sys__CopyString(name);
-else
+if(spec->__anon1.specifier == INT64)
+s = "int64";
+}
+if(s)
{
-strcat(className, name);
-spec->name = __ecereNameSpace__ecere__sys__CopyString(className);
+decl->__anon1.__anon1.declarators = initDeclarators = MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+FreeSpecifier(spec);
+spec = (((void *)0));
}
}
-else if(symbol)
-spec->name = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
-else
-spec->name = __ecereNameSpace__ecere__sys__CopyString(name);
-spec->symbol = symbol;
-if(templateArgs != (((void *)0)))
-SetClassTemplateArgs(spec, templateArgs);
}
-return spec;
+if(spec && spec->type != 5)
+gotType = 1;
}
-
-struct Specifier * MkSpecifierName(const char * name)
-{
-return _MkSpecifierName(name, (((void *)0)), (((void *)0)));
}
-
-struct Specifier * MkSpecifierNameArgs(const char * name, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
+if(variable && initDeclarators)
{
-return _MkSpecifierName(name, (((void *)0)), templateArgs);
-}
+struct InitDeclarator * d;
-struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList)
+for(d = initDeclarators->first; d; d = d->next)
{
-return __extension__ ({
-struct ClassFunction * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassFunction);
-
-__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = decl, __ecereInstance1->declarations = declList, __ecereInstance1;
-});
-}
-
-extern struct Specifier * CopySpecifier(struct Specifier * spec);
+struct Identifier * id = GetDeclId(d->declarator);
-void ProcessClassFunctionBody(struct ClassFunction * func, struct Statement * body)
+if(id && id->string && id->string[0])
{
-struct Symbol * symbol;
-struct Declarator * decl = func->declarator;
-struct Declarator * funcDecl = GetFuncDecl(func->declarator);
-
-func->body = body;
-if(decl && !decl->symbol)
+if(curContext)
{
-struct __ecereNameSpace__ecere__sys__OldList * symbolSpecs = MkList();
+struct Symbol * symbol;
-if(funcDecl && funcDecl->function.parameters && body)
+if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
{
-struct Context * context = body->compound.context;
-struct TypeName * param;
+char name[1024];
+int len = 0, stringLen;
-for(param = (*funcDecl->function.parameters).first; param; param = param->next)
-{
-if(param->declarator)
+if(defaultNameSpace)
{
-struct Symbol * symbol = (((void *)0));
-struct Identifier * id = GetDeclId(param->declarator);
-char * string = id ? id->string : (((void *)0));
-
-if(string)
+memcpy(name, defaultNameSpace, defaultNameSpaceLen);
+len += defaultNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
+}
+if(currentNameSpace)
{
-symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&context->symbols, string);
+memcpy(name + len, currentNameSpace, currentNameSpaceLen);
+len += currentNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
}
-if(!symbol && id)
+stringLen = strlen(id->string);
+memcpy(name + len, id->string, stringLen);
+len += stringLen;
+name[len] = (char)0;
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(name);
+}
+symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, id->string);
+if(!symbol)
{
symbol = __extension__ ({
struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 0x1, __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(specifiers, d->declarator), __ecereInstance1;
});
-symbol->idCode = symbol->id = context->nextID++;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+if(strstr(symbol->string, "::"))
+curContext->hasNameSpace = 1;
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-param->declarator->symbol = symbol;
-}
-}
-}
-}
-symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+if(symbol->type && symbol->type->kind == 12 && !symbol->type->__anon1.__anon4.arraySizeExp && d->initializer)
{
-struct Identifier * id = GetDeclId(funcDecl);
+if(d->initializer->type == 1)
+{
+char string[256];
-if(id)
+sprintf(string, "%d", (*d->initializer->__anon1.list).count);
+symbol->type->__anon1.__anon4.arraySizeExp = MkExpConstant(string);
+symbol->type->__anon1.__anon4.freeExp = 1;
+}
+else if(d->initializer->type == 0 && d->initializer->__anon1.exp->type == 3 && d->initializer->__anon1.exp->__anon1.__anon2.string)
{
-int c;
+char string[256];
+int c, count = 0;
+char ch;
+unsigned int escaped = 0;
+char * s = d->initializer->__anon1.exp->__anon1.__anon2.string;
-for(c = strlen(id->string) - 1; c >= 0; c--)
+for(c = 1; (ch = s[c]); c++)
{
-if(id->string[c] == ':')
+if(ch == '\\' && !escaped)
+escaped = 1;
+else
{
-char * string = __ecereNameSpace__ecere__sys__CopyString(id->string + c + 1);
-
-id->string[c - 1] = (char)0;
-id->_class = MkSpecifierName(id->string);
-(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
-id->string = string;
-break;
+count++;
+escaped = 0;
}
}
-symbol->string = __ecereNameSpace__ecere__sys__CopyString(id->string);
+sprintf(string, "%d", count);
+symbol->type->__anon1.__anon4.arraySizeExp = MkExpConstant(string);
+symbol->type->__anon1.__anon4.freeExp = 1;
}
}
-if(func->specifiers)
-{
-struct Specifier * spec;
-
-for(spec = (*func->specifiers).first; spec; spec = spec->next)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*symbolSpecs), CopySpecifier(spec));
}
-symbol->type = ProcessType(symbolSpecs, decl);
-symbol->idCode = symbol->id = globalContext->nextID++;
-decl->symbol = symbol;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-FreeList(symbolSpecs, FreeSpecifier);
+decl->symbol = d->declarator->symbol = symbol;
+}
+}
+}
+}
+else
+{
+decl->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), decl->symbol);
}
+return decl;
}
-struct __ecereNameSpace__ecere__sys__OldList * MkSpecsClass(struct Specifier * _class)
+struct Declaration * MkStructDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * declarators, struct Specifier * extStorage)
{
-struct __ecereNameSpace__ecere__sys__OldList * list = MkList();
-
-ListAdd(list, _class);
-return list;
-}
+struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 0, decl->__anon1.__anon1.declarators = declarators, decl->__anon1.__anon1.specifiers = specifiers, decl->extStorage = extStorage, decl->loc = yylloc, decl);
-struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer)
+if(specifiers != (((void *)0)))
{
-return __extension__ ({
-struct MemberInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit);
-
-__ecereInstance1->identifiers = ids, __ecereInstance1->initializer = initializer, __ecereInstance1;
-});
-}
+unsigned int gotType = 0;
+struct Specifier * spec, * next;
-extern void FreeExpression(struct Expression * exp);
+for(spec = specifiers->first; spec; spec = next)
+{
+next = spec->next;
+if(gotType && declarators == (((void *)0)) && ((spec->type == 1 && spec->__anon1.__anon1.name) || spec->type == 0))
+{
+const char * s = (((void *)0));
-struct MemberInit * MkMemberInitExp(struct Expression * idExp, struct Initializer * initializer)
+if(spec->type == 1)
{
-struct MemberInit * init = (init = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit), init->initializer = initializer, init->identifiers = MkList(), init);
-struct Expression * exp;
+const char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 1, 0);
-for(exp = idExp; exp && exp->type == 8; exp = exp->member.exp)
+s = colon ? colon + 2 : spec->__anon1.__anon1.name;
+}
+else if(spec->type == 0)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*init->identifiers), (((void *)0)), exp->member.member);
-exp->member.member = (((void *)0));
+if(spec->__anon1.specifier == INT64)
+s = "int64";
}
-if(exp && exp->type == 0)
+if(s)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*init->identifiers), (((void *)0)), exp->identifier);
-exp->identifier = (((void *)0));
+decl->__anon1.__anon1.declarators = declarators = MkListOne(MkStructDeclarator(MkDeclaratorIdentifier(MkIdentifier(s)), (((void *)0))));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specifiers, spec);
+FreeSpecifier(spec);
+spec = (((void *)0));
}
-FreeExpression(idExp);
-return init;
}
-
-struct MembersInit * MkMembersInitList(struct __ecereNameSpace__ecere__sys__OldList * dataMembers)
-{
-return __extension__ ({
-struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
-
-__ecereInstance1->type = 0, __ecereInstance1->dataMembers = dataMembers, __ecereInstance1;
-});
+if(spec && spec->type != 5)
+gotType = 1;
}
-
-struct MembersInit * MkMembersInitMethod(struct ClassFunction * function)
-{
-return __extension__ ({
-struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
-
-__ecereInstance1->type = 1, __ecereInstance1->function = function, __ecereInstance1;
-});
+}
+return decl;
}
-struct Instantiation * MkInstantiation(struct Specifier * _class, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
+struct Declaration * MkDeclarationClassInst(struct Instantiation * inst)
{
return __extension__ ({
-struct Instantiation * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
+struct Declaration * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration);
-__ecereInstance1->_class = _class, __ecereInstance1->exp = exp, __ecereInstance1->members = members, __ecereInstance1;
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.inst = inst, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct Instantiation * MkInstantiationNamed(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
+struct Declaration * MkDeclarationDefine(struct Identifier * id, struct Expression * exp)
{
-struct Instantiation * inst = (inst = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation), inst->exp = exp, inst->members = members, inst);
+struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 3, decl->__anon1.__anon2.id = id, decl->__anon1.__anon2.exp = exp, decl->loc = yylloc, decl);
+char expString[1024];
-if(specs != (((void *)0)))
+expString[0] = '\0';
+PrintExpression(exp, expString);
+if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
{
-struct Specifier * spec;
+char name[1024];
+int len = 0, stringLen;
-for(spec = specs->first; spec; spec = spec->next)
-if(spec->type == 1)
+if(defaultNameSpace)
{
-inst->_class = spec;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(specs, spec);
-break;
+memcpy(name, defaultNameSpace, defaultNameSpaceLen);
+len += defaultNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
}
-FreeList(specs, FreeSpecifier);
-if(!spec)
+if(currentNameSpace)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Expecting class specifier\n", (((void *)0))));
-inst->_class = MkSpecifierName("");
+memcpy(name + len, currentNameSpace, currentNameSpaceLen);
+len += currentNameSpaceLen;
+name[len++] = ':';
+name[len++] = ':';
}
+stringLen = strlen(id->string);
+memcpy(name + len, id->string, stringLen);
+len += stringLen;
+name[len] = (char)0;
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(name);
}
-return inst;
+if(!__ecereNameSpace__ecere__com__eSystem_FindDefine(privateModule, id->string))
+__ecereNameSpace__ecere__com__eSystem_RegisterDefine(id->string, expString, privateModule, buildingECERECOMModule ? 4 : 1);
+else
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "Redefinition of %s ignored\n", (((void *)0))), id->string);
+return decl;
}
-struct ClassDef * MkClassDefAccessOverride(int access, struct Identifier * id)
+struct Statement * MkLabeledStmt(struct Identifier * id, struct Statement * statement)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 13, __ecereInstance1->id = id, __ecereInstance1->memberAccess = access, __ecereInstance1;
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.labeled.id = id, __ecereInstance1->__anon1.labeled.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefMemberAccess()
+struct Statement * MkCaseStmt(struct Expression * exp, struct Statement * statement)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 12, __ecereInstance1;
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.caseStmt.exp = exp, __ecereInstance1->__anon1.caseStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefDeclaration(struct Declaration * decl)
+struct Statement * MkIfStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement, struct Statement * elseStmt)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 2, __ecereInstance1->decl = decl, __ecereInstance1;
+__ecereInstance1->type = 4, __ecereInstance1->__anon1.ifStmt.exp = exp, __ecereInstance1->__anon1.ifStmt.stmt = statement, __ecereInstance1->__anon1.ifStmt.elseStmt = elseStmt, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefClassData(struct Declaration * decl)
+struct Statement * MkSwitchStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
{
+if(statement)
+statement->__anon1.compound.isSwitch = 1;
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 9, __ecereInstance1->decl = decl, __ecereInstance1;
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.switchStmt.exp = exp, __ecereInstance1->__anon1.switchStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefDesigner(const char * designer)
+struct Statement * MkWhileStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 5, __ecereInstance1->designer = __ecereNameSpace__ecere__sys__CopyString(designer), __ecereInstance1;
+__ecereInstance1->type = 6, __ecereInstance1->__anon1.whileStmt.exp = exp, __ecereInstance1->__anon1.whileStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefNoExpansion()
+struct Statement * MkDoWhileStmt(struct Statement * statement, struct __ecereNameSpace__ecere__sys__OldList * exp)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 6, __ecereInstance1;
+__ecereInstance1->type = 7, __ecereInstance1->__anon1.doWhile.exp = exp, __ecereInstance1->__anon1.doWhile.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefFixed()
+struct Statement * MkForStmt(struct Statement * init, struct Statement * check, struct __ecereNameSpace__ecere__sys__OldList * inc, struct Statement * statement)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 7, __ecereInstance1;
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.forStmt.init = init, __ecereInstance1->__anon1.forStmt.check = check, __ecereInstance1->__anon1.forStmt.increment = inc, __ecereInstance1->__anon1.forStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefDesignerDefaultProperty(struct Identifier * id)
+struct Statement * MkForEachStmt(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * exp, struct __ecereNameSpace__ecere__sys__OldList * filter, struct Statement * statement)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 8, __ecereInstance1->defaultProperty = id, __ecereInstance1;
+__ecereInstance1->type = 18, __ecereInstance1->__anon1.forEachStmt.id = id, __ecereInstance1->__anon1.forEachStmt.exp = exp, __ecereInstance1->__anon1.forEachStmt.filter = filter, __ecereInstance1->__anon1.forEachStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefDefaultProperty(struct __ecereNameSpace__ecere__sys__OldList * defProperties)
+void ProcessFunctionBody(struct FunctionDefinition * func, struct Statement * body)
{
-return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-
-__ecereInstance1->type = 1, __ecereInstance1->defProperties = defProperties, __ecereInstance1;
-});
-}
-
-extern void FreeClassFunction(struct ClassFunction * func);
+struct Declarator * declarator = func->declarator;
+struct Declarator * funcDecl = GetFuncDecl(declarator);
+struct Symbol * symbol;
-struct ClassDef * MkClassDefFunction(struct ClassFunction * function)
+func->body = body;
+if(funcDecl && funcDecl->__anon1.function.parameters && body)
{
-struct ClassDef * def = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Context * context = body->__anon1.compound.context;
+struct TypeName * param;
-if(function && function->declarator)
+for(param = (*funcDecl->__anon1.function.parameters).first; param; param = param->next)
{
-struct Declarator * funcDecl = GetFuncDecl(function->declarator);
+if(param->declarator)
+{
+struct Symbol * symbol = (((void *)0));
+struct Identifier * id = GetDeclId(param->declarator);
+char * string = id ? id->string : (((void *)0));
-if(funcDecl && funcDecl->declarator && funcDecl->declarator->type == 2)
+if(string)
{
-def->type = 2;
-def->decl = MkStructDeclaration(function->specifiers, MkListOne(MkStructDeclarator(function->declarator, (((void *)0)))), (((void *)0)));
-function->declarator = (((void *)0));
-function->specifiers = (((void *)0));
-FreeClassFunction(function);
-return def;
+for(symbol = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&context->symbols); symbol; symbol = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)symbol)))
+if(!strcmp(symbol->string, string))
+break;
+if(!symbol && id)
+{
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 1, __ecereInstance1;
+});
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
+param->declarator->symbol = symbol;
}
}
-def->type = 0;
-def->function = function;
-return def;
}
+}
+}
+if(!declarator->symbol)
+{
+struct Identifier * id = GetDeclId(declarator);
-struct Symbol * DeclClassAddNameSpace(int symbolID, const char * className)
+if((currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0 && strcmp(id->string, "__on_register_module"))
{
char name[1024];
int len = 0, stringLen;
-name[0] = '\0';
-if((currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
-{
if(defaultNameSpace)
{
memcpy(name, defaultNameSpace, defaultNameSpaceLen);
name[len++] = ':';
name[len++] = ':';
}
-}
-stringLen = strlen(className);
-memcpy(name + len, className, stringLen);
+stringLen = strlen(id->string);
+memcpy(name + len, id->string, stringLen);
len += stringLen;
name[len] = (char)0;
-return _DeclClass(symbolID, name);
-}
-
-extern char * strchr(const char * , int);
-
-struct Symbol * DeclClass(int symbolID, const char * name)
-{
-if(strchr(name, ':'))
-return _DeclClass(symbolID, name);
-else
-return DeclClassAddNameSpace(symbolID, name);
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = __ecereNameSpace__ecere__sys__CopyString(name);
}
-
-struct Symbol * _DeclClass(int symbolID, const char * name)
-{
-struct Symbol * symbol = FindClass(name);
-
-if(!symbol)
-{
-if(name[0] == ':' && name[1] == ':')
-name += 2;
symbol = __extension__ ({
struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->idCode = symbolID, __ecereInstance1->id = symbolID, __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(func->specifiers, declarator), __ecereInstance1;
});
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+if(strstr(symbol->string, "::"))
+globalContext->hasNameSpace = 1;
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-{
-int start = 0, c;
-char ch;
-
-for(c = 0; (ch = name[c]); c++)
-{
-if(ch == '.' || (ch == ':' && name[c + 1] == ':'))
-{
-if(ch == ':')
-c++;
-start = c + 1;
-}
-}
-if(start && c - start)
-symbol->shortName = __ecereNameSpace__ecere__sys__CopyString(name + start);
-}
-}
-if(symbolID)
-symbol->idCode = symbol->id = symbolID;
-return symbol;
+declarator->symbol = symbol;
}
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassTemplateParameter;
-
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter
-{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * prev;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * next;
-const char * name;
-int type;
-union
+else
{
-const char * dataTypeString;
-int memberType;
-} __attribute__ ((gcc_struct));
-struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
-void * param;
-} __attribute__ ((gcc_struct));
-
-void SetupBaseSpecs(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs)
+symbol = declarator->symbol;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*excludedSymbols), declarator->symbol);
+(__ecereNameSpace__ecere__com__eSystem_Delete(symbol->string), symbol->string = 0);
+symbol->string = __ecereNameSpace__ecere__sys__CopyString(GetDeclId(declarator)->string);
+if(strstr(symbol->string, "::"))
+globalContext->hasNameSpace = 1;
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
+if(!symbol->type)
+symbol->type = ProcessType(func->specifiers, declarator);
+}
+if(symbol->type && (symbol->type->kind == 11 || symbol->type->kind == 16))
{
-if(baseSpecs && baseSpecs->first && ((struct Specifier *)baseSpecs->first)->type == 1)
+if(!symbol->type->__anon1.__anon2.params.count)
{
-char name[1024];
-struct Symbol * baseClass;
-char * tpl;
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type);
-strcpy(name, ((struct Specifier *)baseSpecs->first)->name);
-tpl = strchr(name, '<');
-if(tpl)
-*tpl = (char)0;
-baseClass = FindClass(name);
-if(baseClass && baseClass->ctx)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&symbol->type->__anon1.__anon2.params, type);
+}
+}
+else
{
-struct TemplatedType * copy;
+}
+}
-for(copy = (struct TemplatedType *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&baseClass->ctx->templateTypes); copy; copy = (struct TemplatedType *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(copy))
+void ProcessClassFunctionBody(struct ClassFunction * func, struct Statement * body)
{
-struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = copy->key, type->param = copy->param, type);
+struct Symbol * symbol;
+struct Declarator * decl = func->declarator;
+struct Declarator * funcDecl = GetFuncDecl(func->declarator);
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor((void *)type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
-}
-}
-else if(baseClass && baseClass->registered)
+func->body = body;
+if(decl && !decl->symbol)
{
-struct __ecereNameSpace__ecere__com__Class * sClass;
+struct __ecereNameSpace__ecere__sys__OldList * symbolSpecs = MkList();
-for(sClass = baseClass->registered; sClass; sClass = sClass->base)
+if(funcDecl && funcDecl->__anon1.function.parameters && body)
{
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * p;
+struct Context * context = body->__anon1.compound.context;
+struct TypeName * param;
-for(p = sClass->templateParams.first; p; p = p->next)
+for(param = (*funcDecl->__anon1.function.parameters).first; param; param = param->next)
{
-if(p->type == 0)
+if(param->declarator)
{
-struct TemplateParameter * param = p->param;
-struct TemplatedType * type;
+struct Symbol * symbol = (((void *)0));
+struct Identifier * id = GetDeclId(param->declarator);
+char * string = id ? id->string : (((void *)0));
-if(!param)
+if(string)
{
-p->param = param = __extension__ ({
-struct TemplateParameter * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter);
-
-__ecereInstance1->identifier = MkIdentifier(p->name), __ecereInstance1->type = p->type, __ecereInstance1->dataTypeString = p->dataTypeString, __ecereInstance1;
-});
+symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&context->symbols, string);
}
-type = __extension__ ({
-struct TemplatedType * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType);
+if(!symbol && id)
+{
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-__ecereInstance1->key = (uintptr_t)p->name, __ecereInstance1->param = param, __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 1, __ecereInstance1;
});
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor((void *)type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
-}
-}
+if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
+param->declarator->symbol = symbol;
}
}
}
}
-
-extern struct __ecereNameSpace__ecere__sys__OldList * ast;
-
-extern void FreeExternal(struct External * external);
-
-extern void FreeContext(struct Context * context);
-
-struct ClassDefinition * MkClass(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs, struct __ecereNameSpace__ecere__sys__OldList * definitions)
-{
-struct ClassDefinition * classDef;
-
-SetupBaseSpecs(symbol, baseSpecs);
-if(symbol->ctx)
+symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
{
-struct ClassDefinition * classDef = symbol->ctx->classDef;
+struct Identifier * id = GetDeclId(funcDecl);
-if(classDef)
+if(id)
{
-struct External * external;
+int c;
-for(external = (*ast).first; external; external = external->next)
+for(c = strlen(id->string) - 1; c >= 0; c--)
{
-if(external->type == 2 && external->_class == classDef)
+if(id->string[c] == ':')
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*ast), external);
-FreeExternal(external);
+char * string = __ecereNameSpace__ecere__sys__CopyString(id->string + c + 1);
+
+id->string[c - 1] = (char)0;
+id->_class = MkSpecifierName(id->string);
+(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
+id->string = string;
break;
}
}
+symbol->string = __ecereNameSpace__ecere__sys__CopyString(id->string);
}
-FreeContext(symbol->ctx);
-((symbol->ctx ? (__ecereClass_Context->Destructor ? __ecereClass_Context->Destructor((void *)symbol->ctx) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(symbol->ctx)) : 0), symbol->ctx = 0);
}
-symbol->ctx = curContext;
-classDef = __extension__ ({
-struct ClassDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDefinition);
+if(func->specifiers)
+{
+struct Specifier * spec;
-__ecereInstance1->symbol = symbol, __ecereInstance1->_class = MkSpecifierName(symbol->string), __ecereInstance1->baseSpecs = baseSpecs, __ecereInstance1->definitions = definitions, __ecereInstance1->nameLoc = symbol->nameLoc, __ecereInstance1;
-});
-curContext->classDef = classDef;
-return classDef;
+for(spec = (*func->specifiers).first; spec; spec = spec->next)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*symbolSpecs), CopySpecifier(spec));
+}
+symbol->type = ProcessType(symbolSpecs, decl);
+decl->symbol = symbol;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
+FreeList(symbolSpecs, (void *)(FreeSpecifier));
+}
}
-struct Expression * MkExpInstance(struct Instantiation * inst)
+struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements)
{
return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 1, __ecereInstance1->instance = inst, __ecereInstance1;
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.compound.declarations = declarations, __ecereInstance1->__anon1.compound.statements = statements, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct External * MkExternalClass(struct ClassDefinition * _class)
+struct Statement * MkExpressionStmt(struct __ecereNameSpace__ecere__sys__OldList * expressions)
{
return __extension__ ({
-struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 2, __ecereInstance1->_class = _class, __ecereInstance1->symbol = _class->symbol, __ecereInstance1;
+__ecereInstance1->type = 3, __ecereInstance1->__anon1.expressions = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-extern void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
-
-struct PropertyDef * MkProperty(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Identifier * id, struct Statement * setStmt, struct Statement * getStmt)
-{
-struct PropertyDef * prop = (prop = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyDef), prop->specifiers = specs, prop->declarator = decl, prop->setStmt = setStmt, prop->getStmt = getStmt, prop);
-struct Symbol * symbol;
-struct Type * type = ProcessType(specs, decl);
-
-if(!id)
+struct Statement * MkBadDeclStmt(struct Declaration * decl)
{
-char typeString[1024];
-
-typeString[0] = '\0';
-PrintTypeNoConst(type, typeString, 0x0, 0x1);
-id = MkIdentifier(typeString);
-prop->conversion = 0x1;
-}
-prop->id = id;
-symbol = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = type, __ecereInstance1;
+__ecereInstance1->type = 14, __ecereInstance1->__anon1.decl = decl, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
-symbol->idCode = symbol->id = globalContext->nextID++;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
-globalContext->nextID++;
-globalContext->nextID++;
-prop->symbol = symbol;
-return prop;
}
-struct ClassDef * MkClassDefProperty(struct PropertyDef * propertyDef)
+struct Statement * MkGotoStmt(struct Identifier * id)
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 3, __ecereInstance1->propertyDef = propertyDef, __ecereInstance1;
+__ecereInstance1->type = 9, __ecereInstance1->__anon1.gotoStmt.id = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefClassProperty(struct PropertyDef * propertyDef)
+struct Statement * MkContinueStmt()
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 10, __ecereInstance1->propertyDef = propertyDef, __ecereInstance1;
+__ecereInstance1->type = 10, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefClassPropertyValue(struct Identifier * id, struct Initializer * initializer)
+struct Statement * MkBreakStmt()
{
return __extension__ ({
-struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-__ecereInstance1->type = 11, __ecereInstance1->id = id, __ecereInstance1->initializer = initializer, __ecereInstance1;
+__ecereInstance1->type = 11, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-int CheckType(const char * text)
-{
-if(FindTemplateTypeParameter(curContext, text))
-{
-return TYPE_NAME;
-}
-if(FindType(curContext, text))
-{
-return TYPE_NAME;
-}
-if(FindClass(text))
-{
-return TYPE_NAME;
-}
-return IDENTIFIER;
-}
-
-int check_type()
-{
-return CheckType(yytext);
-}
-
-struct Context * PushContext()
+struct Statement * MkReturnStmt(struct __ecereNameSpace__ecere__sys__OldList * exp)
{
-struct Context * ctx = (ctx = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Context), ctx->parent = curContext, ctx);
-
-curContext = ctx;
-return ctx;
-}
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-void PopContext(struct Context * ctx)
-{
-curContext = ctx->parent;
+__ecereInstance1->type = 12, __ecereInstance1->__anon1.expressions = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
-struct Symbol * FindType(struct Context * ctx, const char * name)
+struct Statement * MkAsmStmt(struct Specifier * spec, char * statements, struct __ecereNameSpace__ecere__sys__OldList * inputFields, struct __ecereNameSpace__ecere__sys__OldList * outputFields, struct __ecereNameSpace__ecere__sys__OldList * clobberedFields)
{
-struct Symbol * type = (((void *)0));
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-if(curContext)
-{
-type = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->types, name);
-if(!type && ctx->parent)
-type = FindType(ctx->parent, name);
-}
-return type;
+__ecereInstance1->type = 13, __ecereInstance1->__anon1.asmStmt.spec = spec, __ecereInstance1->__anon1.asmStmt.statements = statements, __ecereInstance1->__anon1.asmStmt.inputFields = inputFields, __ecereInstance1->__anon1.asmStmt.outputFields = outputFields, __ecereInstance1->__anon1.asmStmt.clobberedFields = clobberedFields, __ecereInstance1;
+});
}
-struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, const char * name)
+struct Statement * MkFireWatchersStmt(struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
{
-struct TemplatedType * templatedType = (((void *)0));
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-if(curContext)
-{
-templatedType = (struct TemplatedType *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&ctx->templateTypes, name);
-if(!templatedType && ctx->parent)
-templatedType = FindTemplateTypeParameter(ctx->parent, name);
-}
-return templatedType;
+__ecereInstance1->type = 15, __ecereInstance1->__anon1._watch.object = object, __ecereInstance1->__anon1._watch.watches = watches, __ecereInstance1;
+});
}
-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 Statement * MkStopWatchingStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
{
-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));
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SubModule;
+__ecereInstance1->type = 16, __ecereInstance1->__anon1._watch.watcher = watcher, __ecereInstance1->__anon1._watch.object = object, __ecereInstance1->__anon1._watch.watches = watches, __ecereInstance1;
+});
+}
-struct __ecereNameSpace__ecere__com__SubModule
+struct Statement * MkWatchStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
{
-struct __ecereNameSpace__ecere__com__SubModule * prev;
-struct __ecereNameSpace__ecere__com__SubModule * next;
-struct __ecereNameSpace__ecere__com__Instance * module;
-int importMode;
-} __attribute__ ((gcc_struct));
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-unsigned int ModuleAccess(struct __ecereNameSpace__ecere__com__Instance * searchIn, struct __ecereNameSpace__ecere__com__Instance * searchFor)
+__ecereInstance1->type = 17, __ecereInstance1->__anon1._watch.watcher = watcher, __ecereInstance1->__anon1._watch.object = object, __ecereInstance1->__anon1._watch.watches = watches, __ecereInstance1;
+});
+}
+
+struct External * MkExternalFunction(struct FunctionDefinition * function)
{
-struct __ecereNameSpace__ecere__com__SubModule * subModule;
+struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 0, external->__anon1.function = function, external->symbol = function->declarator->symbol, external);
-if(searchFor == searchIn)
-return 0x1;
-for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->modules.first; subModule; subModule = subModule->next)
+if(function->specifiers)
{
-if(subModule->importMode == 1)
+struct Specifier * spec;
+
+for(spec = (*function->specifiers).first; spec; spec = spec->next)
+if(spec->type == 0 && spec->__anon1.specifier == STATIC)
{
-if(ModuleAccess(subModule->module, searchFor))
-return 0x1;
+structDeclMode = declMode = 3;
+break;
}
}
-return 0x0;
+if(external->symbol && !external->symbol->__anon2.__anon3.methodExternal)
+external->symbol->__anon2.__anon3.methodExternal = external;
+return external;
}
-extern struct ModuleImport * mainModule;
+struct External * MkExternalImport(char * name, int importType, int importAccess)
+{
+struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 3, external);
+int len = strlen(name) - 2;
-extern struct __ecereNameSpace__ecere__sys__OldList * imports;
+external->__anon1.importString = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (len + 1));
+strncpy(external->__anon1.importString, name + 1, len);
+external->__anon1.importString[len] = '\0';
+(__ecereNameSpace__ecere__com__eSystem_Delete(name), name = 0);
+{
+ImportModule(external->__anon1.importString, importType, importAccess, 1);
+ImportModule(external->__anon1.importString, importType, importAccess, 0);
+}
+return external;
+}
-struct ModuleImport * FindModule(struct __ecereNameSpace__ecere__com__Instance * moduleToFind)
+struct ClassDefinition * MkClass(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs, struct __ecereNameSpace__ecere__sys__OldList * definitions)
{
-struct ModuleImport * module;
+struct ClassDefinition * classDef;
-if(!((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name)
-return mainModule;
-for(module = (*imports).first; module; module = module->next)
-if(module->name && !strcmp(module->name, ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name))
-break;
-if(!module)
+SetupBaseSpecs(symbol, baseSpecs);
+if(symbol->ctx)
{
-module = __extension__ ({
-struct ModuleImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport);
+struct ClassDefinition * classDef = symbol->ctx->classDef;
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name), __ecereInstance1->importType = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->importType, __ecereInstance1->importAccess = ModuleAccess(privateModule, moduleToFind) ? 1 : 2, __ecereInstance1;
-});
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*imports), module);
+if(classDef)
+{
+struct External * external;
+
+for(external = (*ast).first; external; external = external->next)
+{
+if(external->type == 2 && external->__anon1._class == classDef)
+{
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*ast), external);
+FreeExternal(external);
+break;
}
-return module;
}
+}
+FreeContext(symbol->ctx);
+((symbol->ctx ? (__ecereClass_Context->Destructor ? __ecereClass_Context->Destructor((void *)symbol->ctx) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(symbol->ctx)) : 0), symbol->ctx = 0);
+}
+symbol->ctx = curContext;
+classDef = __extension__ ({
+struct ClassDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDefinition);
-extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
+__ecereInstance1->symbol = symbol, __ecereInstance1->_class = MkSpecifierName(symbol->string), __ecereInstance1->baseSpecs = baseSpecs, __ecereInstance1->definitions = definitions, __ecereInstance1->nameLoc = symbol->nameLoc, __ecereInstance1;
+});
+curContext->classDef = classDef;
+return classDef;
+}
-struct Symbol * FindClass(const char * name)
+struct Expression * GetTemplateArgExpByName(const char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType)
{
-struct Symbol * cl = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * _class;
-unsigned int global = 0x0;
-char fullName[1024];
+struct Expression * argExp = (((void *)0));
+struct __ecereNameSpace__ecere__com__Class * _class = curClass ? curClass : ((curExternal && curExternal->type == 0 && curExternal->__anon1.function) ? curExternal->__anon1.function->_class : (((void *)0)));
-if(name[0] == ':' && name[1] == ':')
-{
-global = 0x1;
-name += 2;
-}
-if(!global && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+if(_class)
{
-int len = 0, stringLen;
+int id = 0;
+struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam;
+struct __ecereNameSpace__ecere__com__Class * sClass;
-if(defaultNameSpace)
+for(sClass = _class; sClass; sClass = sClass->base)
{
-memcpy(fullName, defaultNameSpace, defaultNameSpaceLen);
-len += defaultNameSpaceLen;
-fullName[len++] = ':';
-fullName[len++] = ':';
+id = 0;
+for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+{
+if(!strcmp(curParam->name, paramName))
+{
+for(sClass = sClass->base; sClass; sClass = sClass->base)
+id += sClass->templateParams.count;
+break;
}
-if(currentNameSpace)
+id++;
+}
+if(curParam)
+break;
+}
+if(curParam && curParam->type != tplType)
+curParam = (((void *)0));
+if(curParam)
{
-memcpy(fullName + len, currentNameSpace, currentNameSpaceLen);
-len += currentNameSpaceLen;
-fullName[len++] = ':';
-fullName[len++] = ':';
+char idString[32];
+char className[1024];
+
+sprintf(idString, "%d", id);
+strcpy(className, "__ecereClass_");
+FullClassNameCat(className, _class->fullName, 1);
+DeclareClass(curExternal, FindClass(_class->fullName), className);
+argExp = MkExpIndex((MkExpMember)(MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class")), MkIdentifier("templateArgs")), MkListOne(MkExpConstant(idString)));
}
-stringLen = strlen(name);
-memcpy(fullName + len, name, stringLen);
-len += stringLen;
-fullName[len] = (char)0;
-cl = globalContext ? (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, fullName) : (((void *)0));
}
-if(!cl)
-cl = globalContext ? (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, name) : (((void *)0));
-if(!cl && !global)
+return argExp;
+}
+
+struct External * MkExternalDeclaration(struct Declaration * declaration)
{
-for(cl = globalContext ? (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&globalContext->classes) : (((void *)0)); cl; cl = (struct Symbol *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)cl)))
+struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 1, external->__anon1.declaration = declaration, external->symbol = declaration ? declaration->symbol : (((void *)0)), external);
+
+if(declaration && declaration->type == 1 && declaration->__anon1.__anon1.specifiers)
{
-if(cl->shortName && !strcmp(cl->shortName, name))
+struct Specifier * spec;
+
+for(spec = (*declaration->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
+if(spec->type == 0 && spec->__anon1.specifier == TYPEDEF)
+{
+structDeclMode = declMode = 0;
break;
}
-}
-if(!cl)
+else if(spec->type == 0 && spec->__anon1.specifier == STATIC)
{
-_class = (((void *)0));
-if(!global && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
-_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, fullName);
-if(!_class)
-_class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, name);
-if(_class)
+structDeclMode = declMode = 3;
+break;
+}
+}
+if(declaration && declaration->symbol && !declaration->symbol->__anon2.__anon3.methodExternal)
+declaration->symbol->__anon2.__anon3.methodExternal = external;
+return external;
+}
+
+struct External * MkExternalNameSpace(struct Identifier * identifier)
{
-name = _class->fullName;
-cl = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, name);
-if(!cl)
+struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 4, external->__anon1.id = identifier, external);
+
+currentNameSpace = identifier ? identifier->string : (((void *)0));
+currentNameSpaceLen = currentNameSpace ? strlen(currentNameSpace) : 0;
+return external;
+}
+
+struct External * MkExternalClass(struct ClassDefinition * _class)
{
-cl = __extension__ ({
-struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+return __extension__ ({
+struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
-__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->registered = _class, __ecereInstance1->id = (((int)0x7fffffff)), __ecereInstance1->idCode = (((int)0x7fffffff)), __ecereInstance1->imported = 0x1, __ecereInstance1;
+__ecereInstance1->type = 2, __ecereInstance1->__anon1._class = _class, __ecereInstance1->symbol = _class->symbol, __ecereInstance1;
});
-_class->symbol = cl;
-if(_class->module)
-cl->module = FindModule(_class->module);
-else
-cl->module = mainModule;
-if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)cl))
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), cl);
-if(strcmp(name, _class->name))
-cl->shortName = __ecereNameSpace__ecere__sys__CopyString(_class->name);
-}
-}
}
-return cl;
+
+struct External * MkExternalDBTable(struct DBTableDef * table)
+{
+return __extension__ ({
+struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
+
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.table = table, __ecereInstance1;
+});
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink;
+struct PropertyDef;
+
+typedef union YYSTYPE
+{
+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;
+} __attribute__ ((gcc_struct)) YYSTYPE;
+
+extern YYSTYPE yylval;
-struct __ecereNameSpace__ecere__sys__NamedLink
+struct ClassDef
+{
+struct ClassDef * prev;
+struct ClassDef * 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__NamedLink * prev;
-struct __ecereNameSpace__ecere__sys__NamedLink * next;
-char * name;
-void * data;
+struct Identifier * id;
+struct Initializer * initializer;
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct)) __anon1;
+int memberAccess;
+void * object;
} __attribute__ ((gcc_struct));
-extern struct Expression * CopyExpression(struct Expression * exp);
-
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(struct __ecereNameSpace__ecere__sys__OldList * this);
-
-void CopyTypeInto(struct Type * type, struct Type * src)
-{
-*type = *src;
-type->name = __ecereNameSpace__ecere__sys__CopyString(src->name);
-type->refCount = 1;
-if(src->kind == 15)
+struct PropertyDef
{
-struct __ecereNameSpace__ecere__sys__NamedLink * member;
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&type->members);
-for(member = src->members.first; member; member = member->next)
+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
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->members, __extension__ ({
-struct __ecereNameSpace__ecere__sys__NamedLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink);
+unsigned int conversion : 1;
+unsigned int isWatchable : 1;
+unsigned int isDBProp : 1;
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
-__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(member->name), __ecereInstance1->data = member->data, __ecereInstance1;
-}));
-}
-type->enumName = __ecereNameSpace__ecere__sys__CopyString(src->enumName);
-}
-else if(src->kind == 9 || src->kind == 10)
+struct ClassDef * MkClassDefFunction(struct ClassFunction * function)
{
-struct Type * member;
+struct ClassDef * def = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-for(member = type->members.first; member; member = member->next)
-member->refCount++;
-type->enumName = __ecereNameSpace__ecere__sys__CopyString(src->enumName);
-}
-else if(src->kind == 11)
+if(function && function->declarator)
{
-struct Type * param;
+struct Declarator * funcDecl = GetFuncDecl(function->declarator);
-type->returnType->refCount++;
-for(param = type->params.first; param; param = param->next)
-param->refCount++;
-}
-else if(src->kind == 13 || src->kind == 12)
-{
-type->type->refCount++;
-if(src->kind == 12)
+if(funcDecl && funcDecl->declarator && funcDecl->declarator->type == 2)
{
-if(type->arraySizeExp)
-type->arraySizeExp = CopyExpression(type->arraySizeExp);
+def->type = 2;
+def->__anon1.decl = MkStructDeclaration(function->specifiers, MkListOne(MkStructDeclarator(function->declarator, (((void *)0)))), (((void *)0)));
+function->declarator = (((void *)0));
+function->specifiers = (((void *)0));
+FreeClassFunction(function);
+return def;
}
}
+def->type = 0;
+def->__anon1.function = function;
+return def;
}
-extern int targetBits;
-
-extern int targetPlatform;
-
-extern int strtol(const char * , char * * , int base);
-
-extern struct Symbol * FindSymbol(const char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace);
-
static struct Type * ProcessTypeSpecs(struct __ecereNameSpace__ecere__sys__OldList * specs, unsigned int assumeEllipsis, unsigned int keepTypeName)
{
-struct Type * specType = (specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), specType->refCount = 1, specType->kind = 3, specType->isSigned = 0x1, specType);
+struct Type * specType = (specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), specType->refCount = 1, specType->kind = 3, specType->isSigned = 1, specType);
if(specs != (((void *)0)))
{
-unsigned int isTypedef = 0x0;
+unsigned int isTypedef = 0;
struct Specifier * spec;
-unsigned int isLong = 0x0;
+unsigned int isLong = 0;
for(spec = specs->first; spec; spec = spec->next)
{
if(spec->type == 5)
{
-struct ExtDecl * extDecl = spec->extDecl;
+struct ExtDecl * extDecl = spec->__anon1.__anon1.extDecl;
if(extDecl->type == 0)
{
-char * s = spec->extDecl->s;
-
-if(!strcmp(spec->extDecl->s, "__declspec(dllexport)") || !strcmp(spec->extDecl->s, "dllexport"))
-specType->dllExport = 0x1;
-else if(!strcmp(spec->extDecl->s, "__declspec(stdcall)") || !strcmp(spec->extDecl->s, "stdcall"))
-specType->attrStdcall = 0x1;
+if(!strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "__declspec(dllexport)") || !strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "dllexport"))
+specType->dllExport = 1;
+else if(!strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "__declspec(stdcall)") || !strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "stdcall"))
+specType->attrStdcall = 1;
}
else if(extDecl->type == 1)
{
-struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->attr->attribs;
+struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->__anon1.attr->attribs;
if(attribs)
{
if(s)
{
if(!strcmp(s, "dllexport"))
-specType->dllExport = 0x1;
+specType->dllExport = 1;
else if(!strcmp(s, "stdcall"))
-specType->attrStdcall = 0x1;
+specType->attrStdcall = 1;
}
}
}
-specType->keepCast = 0x1;
+specType->keepCast = 1;
}
}
-if(spec->specifier != CONST && (specType->kind == 9 || specType->kind == 10))
+if(spec->__anon1.specifier != CONST && (specType->kind == 9 || specType->kind == 10))
{
FreeType(specType);
specType = __extension__ ({
struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0x1, __ecereInstance1->refCount = 1, __ecereInstance1;
+__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 1, __ecereInstance1->refCount = 1, __ecereInstance1;
});
}
if(isTypedef && keepTypeName)
}
else if(spec->type == 0)
{
-if(spec->specifier == TYPEDEF)
-isTypedef = 0x1;
-else if(spec->specifier == VOID)
+if(spec->__anon1.specifier == TYPEDEF)
+isTypedef = 1;
+else if(spec->__anon1.specifier == VOID)
specType->kind = 0;
-else if(spec->specifier == CHAR)
+else if(spec->__anon1.specifier == CHAR)
specType->kind = 1;
-else if(spec->specifier == INT)
+else if(spec->__anon1.specifier == INT)
{
if(specType->kind != 2 && specType->kind != 5 && !isLong)
specType->kind = 3;
}
-else if(spec->specifier == _BOOL || spec->specifier == BOOL)
+else if(spec->__anon1.specifier == _BOOL || spec->__anon1.specifier == BOOL)
specType->kind = 24;
-else if(spec->specifier == UINT)
+else if(spec->__anon1.specifier == UINT)
{
if(specType->kind != 2 && specType->kind != 5)
specType->kind = 3;
-specType->isSigned = 0x0;
+specType->isSigned = 0;
}
-else if(spec->specifier == INT64)
+else if(spec->__anon1.specifier == INT64)
specType->kind = 4;
-else if(spec->specifier == VALIST)
+else if(spec->__anon1.specifier == VALIST)
specType->kind = 17;
-else if(spec->specifier == SHORT)
+else if(spec->__anon1.specifier == SHORT)
specType->kind = 2;
-else if(spec->specifier == LONG)
+else if(spec->__anon1.specifier == LONG)
{
if(isLong || (targetBits == 64 && targetPlatform != 1))
specType->kind = 4;
else
specType->kind = 3;
-isLong = 0x1;
+isLong = 1;
}
-else if(spec->specifier == FLOAT)
+else if(spec->__anon1.specifier == FLOAT)
specType->kind = 6;
-else if(spec->specifier == DOUBLE)
+else if(spec->__anon1.specifier == DOUBLE)
specType->kind = 7;
-else if(spec->specifier == SIGNED)
-specType->isSigned = 0x1;
-else if(spec->specifier == UNSIGNED)
-specType->isSigned = 0x0;
-else if(spec->specifier == CONST)
-specType->constant = 0x1;
-else if(spec->specifier == TYPED_OBJECT || spec->specifier == ANY_OBJECT || spec->specifier == CLASS)
+else if(spec->__anon1.specifier == SIGNED)
+specType->isSigned = 1;
+else if(spec->__anon1.specifier == UNSIGNED)
+specType->isSigned = 0;
+else if(spec->__anon1.specifier == CONST)
+specType->constant = 1;
+else if(spec->__anon1.specifier == TYPED_OBJECT || spec->__anon1.specifier == ANY_OBJECT || spec->__anon1.specifier == CLASS)
{
-switch(spec->specifier)
+switch(spec->__anon1.specifier)
{
case TYPED_OBJECT:
specType->classObjectType = 2;
break;
}
specType->kind = 8;
-specType->_class = FindClass("class");
+specType->__anon1._class = FindClass("class");
}
-else if(spec->specifier == THISCLASS)
+else if(spec->__anon1.specifier == THISCLASS)
specType->kind = 21;
}
else if(spec->type == 1)
{
-if(spec->name && (!strcmp(spec->name, "intptr") || !strcmp(spec->name, "uintptr")))
+if(spec->__anon1.__anon1.name && (!strcmp(spec->__anon1.__anon1.name, "intptr") || !strcmp(spec->__anon1.__anon1.name, "uintptr")))
{
specType->kind = 22;
-if(!strcmp(spec->name, "uintptr"))
-specType->isSigned = 0x0;
+if(!strcmp(spec->__anon1.__anon1.name, "uintptr"))
+specType->isSigned = 0;
}
-else if(spec->name && (!strcmp(spec->name, "uintsize") || !strcmp(spec->name, "intsize")))
+else if(spec->__anon1.__anon1.name && (!strcmp(spec->__anon1.__anon1.name, "uintsize") || !strcmp(spec->__anon1.__anon1.name, "intsize")))
{
specType->kind = 23;
-if(!strcmp(spec->name, "uintsize"))
-specType->isSigned = 0x0;
+if(!strcmp(spec->__anon1.__anon1.name, "uintsize"))
+specType->isSigned = 0;
}
else
{
-struct Symbol * symbol = spec->name ? FindType(curContext, spec->name) : (((void *)0));
+struct Symbol * symbol = spec->__anon1.__anon1.name ? FindType(curContext, spec->__anon1.__anon1.name) : (((void *)0));
if(symbol && symbol->type)
{
FreeType(dummy);
CopyTypeInto(specType, symbol->type);
specType->constant = isConstant;
-specType->typeName = __ecereNameSpace__ecere__sys__CopyString(symbol->type->name);
}
else if(!isTypedef)
{
-specType->_class = spec->name ? FindClass(spec->name) : (((void *)0));
-specType->kind = 8;
-if(!specType->_class)
-specType->kind = 3;
-}
-}
-}
-else if(spec->type == 2)
-{
-specType->kind = 15;
-specType->enumName = spec->id ? __ecereNameSpace__ecere__sys__CopyString(spec->id->string) : (((void *)0));
-if(spec->list)
-{
-struct Enumerator * e;
-int nextValue = 0;
-
-for(e = (*spec->list).first; e; e = e->next)
-{
-struct __ecereNameSpace__ecere__sys__NamedLink * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i);
-
-if(e->exp && e->exp->type == 2 && e->exp->constant)
-i->data = (void *)strtol(e->exp->constant, (((void *)0)), 0);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, i);
-}
-}
-}
-else if(spec->type == 8)
-{
-specType->kind = 20;
-specType->templateParameter = spec->templateParameter;
-}
-else if(spec->type == 3 || spec->type == 4)
-{
-struct Symbol * _class = spec->id ? FindClass(spec->id->string) : (((void *)0));
-
-if(_class)
-{
-specType->declaredWithStruct = 0x1;
-if(!_class->registered || _class->registered->type != 1)
-specType->directClassAccess = 0x1;
-specType->_class = _class;
-specType->kind = 8;
-break;
-}
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->members);
-if(spec->type == 3)
-specType->kind = 9;
-else if(spec->type == 4)
-specType->kind = 10;
-if(spec->id)
-{
-if(!spec->definitions && !isTypedef)
-{
-struct Symbol * symbol = spec->id->string ? FindSymbol(spec->id->string, curContext, globalContext, 0x1, 0x0) : (((void *)0));
-
-if(symbol && symbol->type)
-{
-*specType = *symbol->type;
-specType->name = __ecereNameSpace__ecere__sys__CopyString(symbol->type->name);
-specType->typeName = __ecereNameSpace__ecere__sys__CopyString(spec->name);
-specType->enumName = __ecereNameSpace__ecere__sys__CopyString(symbol->type->enumName);
-specType->refCount = 1;
-if(symbol->type->kind == 15)
-{
-struct __ecereNameSpace__ecere__sys__NamedLink * member;
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->members);
-for(member = symbol->type->members.first; member; member = member->next)
-{
-struct __ecereNameSpace__ecere__sys__NamedLink * item = (item = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), item->name = __ecereNameSpace__ecere__sys__CopyString(member->name), item->data = member->data, item);
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, item);
-}
-}
-else if(symbol->type->kind == 9 || symbol->type->kind == 10)
-{
-struct Type * member;
-
-for(member = specType->members.first; member; member = member->next)
-member->refCount++;
-}
-else if(symbol->type->kind == 11)
-{
-struct Type * param;
-
-specType->returnType->refCount++;
-for(param = specType->params.first; param; param = param->next)
-param->refCount++;
-}
-else if(symbol->type->kind == 13 || symbol->type->kind == 12)
-{
-specType->type->refCount++;
-if(symbol->type->kind == 12)
-{
-if(specType->arraySizeExp)
-specType->arraySizeExp = CopyExpression(specType->arraySizeExp);
-}
-}
-}
-else
-specType->enumName = __ecereNameSpace__ecere__sys__CopyString(spec->id->string);
-}
-else
-specType->enumName = __ecereNameSpace__ecere__sys__CopyString(spec->id->string);
-}
-if(spec->definitions)
-{
-struct ClassDef * def;
-
-for(def = (*spec->definitions).first; def; def = def->next)
-{
-if(def->type == 2 && def->decl->type == 0)
-{
-struct Declaration * decl = def->decl;
-
-if(decl->declarators)
-{
-struct Declarator * d;
-
-for(d = (*decl->declarators).first; d; d = d->next)
-{
-struct Type * memberType = ProcessType(decl->specifiers, d);
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, memberType);
-}
-}
-else if(decl->specifiers)
-{
-struct Type * memberType = ProcessType(decl->specifiers, (((void *)0)));
-
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, memberType);
-}
-}
-}
-}
-break;
-}
-else if(spec->type == 7)
-{
-specType->kind = specType->kind = 19;
-specType->_class = spec->_class->symbol;
-}
-}
-}
-else if(assumeEllipsis)
-specType->kind = 14;
-return specType;
-}
-
-extern void ProcessExpressionType(struct Expression * exp);
-
-extern void ComputeExpression(struct Expression * exp);
-
-extern unsigned long strtoul(const char * nptr, char * * endptr, int base);
-
-extern void __ecereNameSpace__ecere__com__PrintLn(struct __ecereNameSpace__ecere__com__Class * class, const void * object, ...);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_char__PTR_;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DeclaratorType;
-
-static struct Type * ProcessTypeDecls(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Type * parentType)
-{
-struct Type * type = parentType;
-struct Declarator * subDecl = decl ? decl->declarator : (((void *)0));
-
-if(!parentType)
-type = ProcessTypeSpecs(specs, decl == (((void *)0)), (decl && decl->type == 7) ? 0x1 : 0x0);
-if(decl)
-{
-switch(decl->type)
-{
-case 2:
-break;
-case 6:
-case 7:
-{
-struct ExtDecl * extDecl = decl->extended.extended;
-
-if(extDecl)
-{
-switch(extDecl->type)
-{
-case 0:
-{
-char * s = extDecl->s;
-
-if(s)
-{
-if(!strcmp(s, "__declspec(dllexport)") || !strcmp(s, "dllexport"))
-type->dllExport = 0x1;
-else if(!strcmp(s, "__declspec(stdcall)") || !strcmp(s, "stdcall"))
-type->attrStdcall = 0x1;
-}
-break;
-}
-case 1:
-{
-struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->attr->attribs;
-
-if(attribs)
-{
-struct Attribute * attr;
-
-for(attr = (*attribs).first; attr; attr = attr->next)
-{
-char * s = attr->attr;
-
-if(s)
-{
-if(!strcmp(s, "dllexport"))
-type->dllExport = 0x1;
-else if(!strcmp(s, "stdcall"))
-type->attrStdcall = 0x1;
-}
-}
-}
-type->keepCast = 0x1;
-break;
-}
-}
-}
-break;
-}
-case 0:
-{
-struct Expression * exp = decl->structDecl.exp;
-
-if(exp)
-{
-ProcessExpressionType(exp);
-ComputeExpression(exp);
-if(exp->type == 2)
-type->bitFieldCount = strtoul(exp->constant, (((void *)0)), 0);
-}
-break;
-}
-case 4:
-{
-type = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 11, __ecereInstance1->returnType = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
-});
-if(decl->function.parameters)
-{
-struct TypeName * param;
-
-for(param = (*decl->function.parameters).first; param; param = param->next)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->params, ProcessType(param->qualifiers, param->declarator));
+specType->__anon1._class = spec->__anon1.__anon1.name ? FindClass(spec->__anon1.__anon1.name) : (((void *)0));
+specType->kind = 8;
+if(!specType->__anon1._class)
+specType->kind = 3;
}
-break;
}
-case 3:
-{
-type = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 12, __ecereInstance1->arraySizeExp = CopyExpression(decl->array.exp), __ecereInstance1->freeExp = 0x1, __ecereInstance1->type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
-});
-if(decl->array.enumClass)
-type->enumClass = decl->array.enumClass->symbol;
-break;
}
-case 5:
+else if(spec->type == 2)
{
-struct Pointer * pointer = decl->pointer.pointer;
-
-while(pointer)
+specType->kind = 15;
+specType->__anon1.__anon1.enumName = spec->__anon1.__anon2.id ? __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string) : (((void *)0));
+if(spec->__anon1.__anon2.list)
{
-struct __ecereNameSpace__ecere__sys__OldList * qualifiers = pointer->qualifiers;
-
-if(type->classObjectType)
-type->byReference = 0x1;
-else
-type = __extension__ ({
-struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct Enumerator * e;
-__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
-});
-if(qualifiers)
+for(e = (*spec->__anon1.__anon2.list).first; e; e = e->next)
{
-struct Specifier * spec;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__NamedLink64)), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i);
-for(spec = (*qualifiers).first; spec; spec = spec->next)
-{
-if(spec->type == 0 && spec->specifier == CONST)
-type->constant = 0x1;
+if(e->exp && e->exp->type == 2 && e->exp->__anon1.__anon1.constant)
+i->data = strtoll(e->exp->__anon1.__anon1.constant, (((void *)0)), 0);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, i);
}
}
-pointer = pointer->pointer;
}
-break;
+else if(spec->type == 8)
+{
+specType->kind = 20;
+specType->__anon1.templateParameter = spec->__anon1.templateParameter;
}
-case 1:
+else if(spec->type == 3 || spec->type == 4)
{
-struct Identifier * id = decl->identifier;
-struct Specifier * _class = id->_class;
+struct Symbol * _class = spec->__anon1.__anon2.id ? FindClass(spec->__anon1.__anon2.id->string) : (((void *)0));
-(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
if(_class)
{
-if(_class->type == 8)
-{
-type->thisClassTemplate = _class->templateParameter;
-type->extraParam = 0x1;
+specType->declaredWithStruct = 1;
+if(!_class->__anon1.registered || _class->__anon1.registered->type != 1)
+specType->directClassAccess = 1;
+specType->__anon1._class = _class;
+specType->kind = 8;
+break;
}
-else
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->__anon1.__anon1.members);
+if(spec->type == 3)
+specType->kind = 9;
+else if(spec->type == 4)
+specType->kind = 10;
+if(spec->__anon1.__anon2.id)
{
-char * name = _class->name;
+if(!spec->__anon1.__anon2.definitions && !isTypedef)
+{
+struct Symbol * symbol = spec->__anon1.__anon2.id->string ? FindSymbol(spec->__anon1.__anon2.id->string, curContext, globalContext, 1, 0) : (((void *)0));
-if(!name)
-type->staticMethod = 0x1;
-else
+if(symbol && symbol->type)
{
-if(!id->classSym)
-id->classSym = _class->symbol;
-if(name[strlen(name) - 1] == '&')
+*specType = *symbol->type;
+specType->name = __ecereNameSpace__ecere__sys__CopyString(symbol->type->name);
+specType->typeName = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon1.name);
+specType->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(symbol->type->__anon1.__anon1.enumName);
+specType->refCount = 1;
+if(symbol->type->kind == 15)
{
-type->thisClass = FindClass("class");
-type->byReference = 0x1;
-}
-else
-type->thisClass = _class->symbol;
-if(type->thisClass && strcmp(type->thisClass->string, "class"))
-type->extraParam = 0x1;
-else if(!strcmp(name, "any_object"))
+struct __ecereNameSpace__ecere__sys__NamedLink64 * member;
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->__anon1.__anon1.members);
+for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next)
{
-type->extraParam = 0x1;
-type->thisClass = FindClass("class");
+struct __ecereNameSpace__ecere__sys__NamedLink64 * item = (item = __ecereNameSpace__ecere__com__eSystem_New0(sizeof(struct __ecereNameSpace__ecere__sys__NamedLink64)), item->name = __ecereNameSpace__ecere__sys__CopyString(member->name), item->data = member->data, item);
+
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, item);
}
-else if(!strcmp(name, "class"))
-{
-type->thisClass = FindClass("class");
-type->classObjectType = 1;
}
-else if(!strcmp(name, "typed_object") || !strcmp(name, "typed_object&"))
+else if(symbol->type->kind == 9 || symbol->type->kind == 10)
{
-type->thisClass = FindClass("class");
-type->classObjectType = 2;
+struct Type * member;
+
+for(member = specType->__anon1.__anon1.members.first; member; member = member->next)
+member->refCount++;
}
+else if(symbol->type->kind == 11)
+{
+struct Type * param;
+
+specType->__anon1.__anon2.returnType->refCount++;
+for(param = specType->__anon1.__anon2.params.first; param; param = param->next)
+param->refCount++;
}
+else if(symbol->type->kind == 13 || symbol->type->kind == 12)
+{
+specType->__anon1.type->refCount++;
+if(symbol->type->kind == 12)
+{
+if(specType->__anon1.__anon4.arraySizeExp)
+specType->__anon1.__anon4.arraySizeExp = CopyExpression(specType->__anon1.__anon4.arraySizeExp);
}
}
-break;
}
-default:
-__ecereNameSpace__ecere__com__PrintLn(__ecereClass_char__PTR_, "Unhandled Declarator Type: ", __ecereClass_DeclaratorType, &decl->type, (void *)0);
+else
+specType->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string);
}
+else
+specType->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string);
}
-if(subDecl)
+if(spec->__anon1.__anon2.definitions)
{
-struct Type * curType = type;
+struct ClassDef * def;
-type = ProcessTypeDecls((((void *)0)), subDecl, type);
-if(curType && type->kind != 11)
+for(def = (*spec->__anon1.__anon2.definitions).first; def; def = def->next)
{
-curType->thisClassTemplate = type->thisClassTemplate;
-curType->extraParam = type->extraParam;
-curType->staticMethod = type->staticMethod;
-curType->thisClass = type->thisClass;
-curType->byReference = type->byReference;
-curType->classObjectType = type->classObjectType;
-}
-}
-return type;
-}
-
-struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl)
+if(def->type == 2 && def->__anon1.decl->type == 0)
{
-return ProcessTypeDecls(specs, decl, (((void *)0)));
-}
+struct Declaration * decl = def->__anon1.decl;
-extern struct Declarator * SpecDeclFromString(const char * string, struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * baseDecl);
+if(decl->__anon1.__anon1.declarators)
+{
+struct Declarator * d;
-struct Type * ProcessTypeString(const char * string, unsigned int staticMethod)
+for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
{
-struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
-struct Declarator * decl = SpecDeclFromString(string, specs, (((void *)0)));
-struct Type * type = ProcessType(specs, decl);
+struct Type * memberType = ProcessType(decl->__anon1.__anon1.specifiers, d);
-if(type && !type->thisClass && staticMethod)
-type->staticMethod = 0x1;
-FreeList(specs, FreeSpecifier);
-if(decl)
-FreeDeclarator(decl);
-return type;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, memberType);
}
-
-struct Type * MkClassTypeSymbol(struct Symbol * symbol)
-{
-if(symbol)
+}
+else if(decl->__anon1.__anon1.specifiers)
{
-struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->_class = symbol, type);
+struct Type * memberType = ProcessType(decl->__anon1.__anon1.specifiers, (((void *)0)));
-if(!type->_class)
-{
-type->kind = 3;
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, memberType);
}
-type->refCount = 1;
-return type;
}
-return (((void *)0));
}
-
-struct Type * MkClassType(const char * name)
-{
-if(name)
-{
-struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->_class = FindClass(name), type);
-
-if(!type->_class)
+}
+break;
+}
+else if(spec->type == 7)
{
-type->kind = 3;
+specType->kind = 19;
+specType->__anon1._class = spec->__anon1._class->__anon1.__anon1.symbol;
}
-type->refCount = 1;
-return type;
}
-return (((void *)0));
}
-
-struct AsmField * MkAsmField(char * command, struct Expression * expression, struct Identifier * symbolic)
-{
-return __extension__ ({
-struct AsmField * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_AsmField);
-
-__ecereInstance1->command = command, __ecereInstance1->expression = expression, __ecereInstance1->symbolic = symbolic, __ecereInstance1;
-});
+else if(assumeEllipsis)
+specType->kind = 14;
+return specType;
}
-struct Statement * MkAsmStmt(struct Specifier * spec, char * statements, struct __ecereNameSpace__ecere__sys__OldList * inputFields, struct __ecereNameSpace__ecere__sys__OldList * outputFields, struct __ecereNameSpace__ecere__sys__OldList * clobberedFields)
+struct ClassDef * MkClassDefAccessOverride(int access, struct Identifier * id)
{
return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 13, __ecereInstance1->asmStmt.spec = spec, __ecereInstance1->asmStmt.statements = statements, __ecereInstance1->asmStmt.inputFields = inputFields, __ecereInstance1->asmStmt.outputFields = outputFields, __ecereInstance1->asmStmt.clobberedFields = clobberedFields, __ecereInstance1;
+__ecereInstance1->type = 13, __ecereInstance1->__anon1.__anon1.id = id, __ecereInstance1->memberAccess = access, __ecereInstance1;
});
}
-struct ClassDef * MkClassDefPropertyWatch(struct PropertyWatch * watcher)
+struct ClassDef * MkClassDefMemberAccess()
{
return __extension__ ({
struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 4, __ecereInstance1->propertyWatch = watcher, __ecereInstance1;
+__ecereInstance1->type = 12, __ecereInstance1;
});
}
-struct Statement * MkFireWatchersStmt(struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
+struct ClassDef * MkClassDefDeclaration(struct Declaration * decl)
{
return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 15, __ecereInstance1->_watch.object = object, __ecereInstance1->_watch.watches = watches, __ecereInstance1;
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.decl = decl, __ecereInstance1;
});
}
-struct Statement * MkStopWatchingStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
+struct ClassDef * MkClassDefClassData(struct Declaration * decl)
{
return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 16, __ecereInstance1->_watch.watcher = watcher, __ecereInstance1->_watch.object = object, __ecereInstance1->_watch.watches = watches, __ecereInstance1;
+__ecereInstance1->type = 9, __ecereInstance1->__anon1.decl = decl, __ecereInstance1;
});
}
-struct Statement * MkWatchStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
+struct ClassDef * MkClassDefDesigner(const char * designer)
{
return __extension__ ({
-struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 17, __ecereInstance1->_watch.watcher = watcher, __ecereInstance1->_watch.object = object, __ecereInstance1->_watch.watches = watches, __ecereInstance1;
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.designer = __ecereNameSpace__ecere__sys__CopyString(designer), __ecereInstance1;
});
}
-struct PropertyWatch * MkDeleteWatch(struct Statement * compound)
+struct ClassDef * MkClassDefNoExpansion()
{
return __extension__ ({
-struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->compound = compound, __ecereInstance1->deleteWatch = 0x1, __ecereInstance1;
+__ecereInstance1->type = 6, __ecereInstance1;
});
}
-struct PropertyWatch * MkPropertyWatch(struct __ecereNameSpace__ecere__sys__OldList * properties, struct Statement * compound)
+struct ClassDef * MkClassDefFixed()
{
return __extension__ ({
-struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->compound = compound, __ecereInstance1->properties = properties, __ecereInstance1;
+__ecereInstance1->type = 7, __ecereInstance1;
});
}
-struct Expression * MkExpClass(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * decl)
+struct ClassDef * MkClassDefDesignerDefaultProperty(struct Identifier * id)
{
return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 24, __ecereInstance1->_classExp.specifiers = specifiers, __ecereInstance1->_classExp.decl = decl, __ecereInstance1;
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.defaultProperty = id, __ecereInstance1;
});
}
-struct Expression * MkExpClassData(struct Identifier * id)
+struct ClassDef * MkClassDefDefaultProperty(struct __ecereNameSpace__ecere__sys__OldList * defProperties)
{
return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 25, __ecereInstance1->classData.id = id, __ecereInstance1;
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.defProperties = defProperties, __ecereInstance1;
});
}
-struct External * MkExternalDBTable(struct DBTableDef * table)
+struct ClassDef * MkClassDefProperty(struct PropertyDef * propertyDef)
{
return __extension__ ({
-struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 5, __ecereInstance1->table = table, __ecereInstance1;
+__ecereInstance1->type = 3, __ecereInstance1->__anon1.propertyDef = propertyDef, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct DBTableDef * MkDBTableDef(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * definitions)
+struct ClassDef * MkClassDefClassProperty(struct PropertyDef * propertyDef)
{
return __extension__ ({
-struct DBTableDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableDef);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->name = name, __ecereInstance1->symbol = symbol, __ecereInstance1->definitions = definitions, __ecereInstance1;
+__ecereInstance1->type = 10, __ecereInstance1->__anon1.propertyDef = propertyDef, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct DBTableEntry * MkDBFieldEntry(struct TypeName * type, struct Identifier * id, char * name)
+struct ClassDef * MkClassDefClassPropertyValue(struct Identifier * id, struct Initializer * initializer)
{
return __extension__ ({
-struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->type = 0, __ecereInstance1->dataType = type, __ecereInstance1->id = id, __ecereInstance1->name = name, __ecereInstance1;
+__ecereInstance1->type = 11, __ecereInstance1->__anon1.__anon1.id = id, __ecereInstance1->__anon1.__anon1.initializer = initializer, __ecereInstance1->loc = yylloc, __ecereInstance1;
});
}
-struct DBIndexItem * MkDBIndexItem(struct Identifier * id, int order)
+struct ClassDef * MkClassDefPropertyWatch(struct PropertyWatch * watcher)
{
return __extension__ ({
-struct DBIndexItem * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBIndexItem);
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-__ecereInstance1->id = id, __ecereInstance1->order = order, __ecereInstance1;
+__ecereInstance1->type = 4, __ecereInstance1->__anon1.propertyWatch = watcher, __ecereInstance1;
});
}
-struct DBTableEntry * MkDBIndexEntry(struct __ecereNameSpace__ecere__sys__OldList * items, struct Identifier * id)
+struct PropertyDef * MkProperty(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Identifier * id, struct Statement * setStmt, struct Statement * getStmt)
{
-return __extension__ ({
-struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
-
-__ecereInstance1->type = 1, __ecereInstance1->items = items, __ecereInstance1->id = id, __ecereInstance1;
-});
-}
+struct PropertyDef * prop = (prop = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyDef), prop->specifiers = specs, prop->declarator = decl, prop->setStmt = setStmt, prop->getStmt = getStmt, prop);
+struct Symbol * symbol;
+struct Type * type = ProcessType(specs, decl);
-struct Expression * MkExpDBOpen(struct Expression * ds, struct Expression * dbName)
+if(!id)
{
-return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+char typeString[1024];
-__ecereInstance1->type = 28, __ecereInstance1->dbopen.ds = ds, __ecereInstance1->dbopen.name = dbName, __ecereInstance1;
-});
+typeString[0] = '\0';
+PrintTypeNoConst(type, typeString, 0, 1);
+id = MkIdentifier(typeString);
+prop->__anon1.conversion = 1;
}
+prop->id = id;
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
-struct Expression * MkExpDBField(char * table, struct Identifier * id)
-{
-return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-
-__ecereInstance1->type = 29, __ecereInstance1->db.table = table, __ecereInstance1->db.id = id, __ecereInstance1;
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = type, __ecereInstance1;
});
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
+prop->symbol = symbol;
+return prop;
}
-struct Expression * MkExpDBIndex(char * table, struct Identifier * id)
+static struct Type * ProcessTypeDecls(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Type * parentType)
{
-return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-
-__ecereInstance1->type = 31, __ecereInstance1->db.table = table, __ecereInstance1->db.id = id, __ecereInstance1;
-});
-}
+struct Type * type = parentType;
+struct Declarator * subDecl = decl ? decl->declarator : (((void *)0));
-struct Expression * MkExpDBTable(char * table)
+if(!parentType)
+type = ProcessTypeSpecs(specs, decl == (((void *)0)), (decl && decl->type == 7) ? 1 : 0);
+if(decl)
{
-return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-
-__ecereInstance1->type = 30, __ecereInstance1->db.table = table, __ecereInstance1;
-});
-}
+switch(decl->type)
+{
+case 2:
+break;
+case 6:
+case 7:
+{
+struct ExtDecl * extDecl = decl->__anon1.extended.extended;
-struct Expression * MkExpArray(struct __ecereNameSpace__ecere__sys__OldList * expressions)
+if(extDecl)
{
-return __extension__ ({
-struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+switch(extDecl->type)
+{
+case 0:
+{
+char * s = extDecl->__anon1.s;
-__ecereInstance1->type = 35, __ecereInstance1->list = expressions, __ecereInstance1;
-});
+if(s)
+{
+if(!strcmp(s, "__declspec(dllexport)") || !strcmp(s, "dllexport"))
+type->dllExport = 1;
+else if(!strcmp(s, "__declspec(stdcall)") || !strcmp(s, "stdcall"))
+type->attrStdcall = 1;
}
-
-extern struct External * curExternal;
-
-extern void FullClassNameCat(char * output, const char * className, unsigned int includeTemplateParams);
-
-extern void MangleClassName(char * className);
-
-extern void DeclareClass(struct Symbol * classSym, const char * className);
-
-struct Expression * GetTemplateArgExpByName(const char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType)
+break;
+}
+case 1:
{
-struct Expression * argExp = (((void *)0));
-struct __ecereNameSpace__ecere__com__Class * _class = curClass ? curClass : ((curExternal && curExternal->type == 0 && curExternal->function) ? curExternal->function->_class : (((void *)0)));
+struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->__anon1.attr->attribs;
-if(_class)
+if(attribs)
{
-int id = 0;
-struct __ecereNameSpace__ecere__com__ClassTemplateParameter * curParam;
-struct __ecereNameSpace__ecere__com__Class * sClass;
+struct Attribute * attr;
-for(sClass = _class; sClass; sClass = sClass->base)
-{
-id = 0;
-for(curParam = sClass->templateParams.first; curParam; curParam = curParam->next)
+for(attr = (*attribs).first; attr; attr = attr->next)
{
-if(!strcmp(curParam->name, paramName))
+char * s = attr->attr;
+
+if(s)
{
-for(sClass = sClass->base; sClass; sClass = sClass->base)
-id += sClass->templateParams.count;
-break;
+if(!strcmp(s, "dllexport"))
+type->dllExport = 1;
+else if(!strcmp(s, "stdcall"))
+type->attrStdcall = 1;
}
-id++;
}
-if(curParam)
+}
+type->keepCast = 1;
break;
}
-if(curParam && curParam->type != tplType)
-curParam = (((void *)0));
-if(curParam)
-{
-char idString[32];
-char className[1024];
-struct Expression * classExp;
-
-sprintf(idString, "%d", id);
-strcpy(className, "__ecereClass_");
-FullClassNameCat(className, _class->fullName, 0x1);
-MangleClassName(className);
-DeclareClass(FindClass(_class->fullName), className);
-argExp = MkExpIndex((MkExpMember)(MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class")), MkIdentifier("templateArgs")), MkListOne(MkExpConstant(idString)));
}
}
-return argExp;
+break;
}
+case 0:
+{
+struct Expression * exp = decl->__anon1.structDecl.exp;
-struct Expression * GetTemplateArgExp(struct TemplateParameter * param, struct __ecereNameSpace__ecere__com__Class * curClass, unsigned int pointer)
+if(exp)
{
-return param->identifier ? GetTemplateArgExpByName(param->identifier->string, curClass, 0) : (((void *)0));
+ProcessExpressionType(exp);
+ComputeExpression(exp);
+if(exp->type == 2)
+type->bitFieldCount = strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
}
-
-extern const char * GetSourceFile(void);
-
-extern const char * GetOutputFile(void);
-
-extern char * __ecereNameSpace__ecere__sys__ChangeExtension(const char * string, const char * ext, char * output);
-
-extern struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__sys__FileOpen(const char * fileName, int mode);
-
-extern char * __ecereNameSpace__ecere__sys__GetSlashPathBuffer(char * d, const char * p);
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__MapIterator;
-
-struct __ecereNameSpace__ecere__com__MapIterator
+break;
+}
+case 4:
{
-struct __ecereNameSpace__ecere__com__Instance * container;
-struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
-} __attribute__ ((gcc_struct));
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Iterator;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__CustomAVLTree;
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-struct __ecereNameSpace__ecere__com__CustomAVLTree
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 11, __ecereInstance1->__anon1.__anon2.returnType = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
+});
+if(decl->__anon1.function.parameters)
{
-struct __ecereNameSpace__ecere__com__AVLNode * root;
-int count;
-} __attribute__ ((gcc_struct));
-
-struct __ecereNameSpace__ecere__com__Instance * __ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_map(struct __ecereNameSpace__ecere__com__MapIterator * this);
-
-void __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(struct __ecereNameSpace__ecere__com__MapIterator * this, struct __ecereNameSpace__ecere__com__Instance * value);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__com__MapIterator_map;
-
-unsigned int __ecereMethod___ecereNameSpace__ecere__com__Iterator_Next();
-
-const uint64 __ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_key(struct __ecereNameSpace__ecere__com__MapIterator * this);
-
-extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__com__MapIterator_key;
-
-int __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(struct __ecereNameSpace__ecere__com__Instance * this, const char * format, ...);
-
-extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpace__ecere__com__Instance * instance);
-
-int __ecereVMethodID___ecereNameSpace__ecere__com__Container_Free;
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Map;
+struct TypeName * param;
-void OutputIntlStrings()
-{
-if(((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)intlStrings + structSize_Instance)))->count)
+for(param = (*decl->__anon1.function.parameters).first; param; param = param->next)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->__anon1.__anon2.params, ProcessType(param->qualifiers, param->declarator));
+}
+break;
+}
+case 3:
{
-const char * srcFile = GetSourceFile();
-const char * objFile = GetOutputFile();
-char srcFileFixed[797];
-char potFile[797];
-struct __ecereNameSpace__ecere__com__Instance * f;
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-__ecereNameSpace__ecere__sys__ChangeExtension(objFile, "bowl", potFile);
-f = __ecereNameSpace__ecere__sys__FileOpen(potFile, 2);
-if(f)
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 12, __ecereInstance1->__anon1.__anon4.arraySizeExp = CopyExpression(decl->__anon1.array.exp), __ecereInstance1->__anon1.__anon4.freeExp = 1, __ecereInstance1->__anon1.type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
+});
+if(decl->__anon1.array.enumClass)
+type->__anon1.__anon4.enumClass = decl->__anon1.array.enumClass->__anon1.__anon1.symbol;
+break;
+}
+case 5:
{
-const char * filePrefix = "";
+struct Pointer * pointer = decl->__anon1.pointer.pointer;
-if(!(srcFile[0] && (srcFile[1] == ':' || srcFile[0] == '/')))
-filePrefix = "./";
-__ecereNameSpace__ecere__sys__GetSlashPathBuffer(srcFileFixed, srcFile);
+while(pointer)
{
-struct __ecereNameSpace__ecere__com__MapIterator s = (s.container = (void *)0, s.pointer = (void *)0, __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(&s, (intlStrings)), s);
+struct __ecereNameSpace__ecere__sys__OldList * qualifiers = pointer->qualifiers;
-while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next(&s))
-{
-struct ContextStringPair pair = (*(struct ContextStringPair *)__ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_key(&s));
+if(type->classObjectType)
+type->byReference = 1;
+else
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+__ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1;
+});
+if(qualifiers)
{
-struct __ecereNameSpace__ecere__com__Iterator l =
-{
-((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&s)), 0
-};
+struct Specifier * spec;
-while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next(&l))
-__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "#: %s%s:%d\n", filePrefix, srcFileFixed, (*(struct Location *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&l)).start.line);
+for(spec = (*qualifiers).first; spec; spec = spec->next)
+{
+if(spec->type == 0 && spec->__anon1.specifier == CONST)
+type->constant = 1;
}
-if(pair.context)
-__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgctxt \"%s\"\n", pair.context);
-__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgid \"%s\"\n", pair.string);
-__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "msgstr \"%s\"\n\n", pair.string);
}
+pointer = pointer->pointer;
}
-(__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0);
+break;
}
-((void (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({
-struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = intlStrings;
+case 1:
+{
+struct Identifier * id = decl->__anon1.identifier;
+struct Specifier * _class = id->_class;
-__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl;
-})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Free])(intlStrings);
-}
+(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
+type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+if(_class)
+{
+if(_class->type == 8)
+{
+type->__anon1.__anon2.thisClassTemplate = _class->__anon1.templateParameter;
+type->extraParam = 1;
}
+else
+{
+char * name = _class->__anon1.__anon1.name;
-extern int yyparse();
-
-extern int yylex();
-
-void SetAST(struct __ecereNameSpace__ecere__sys__OldList * list)
+if(!name)
+type->__anon1.__anon2.staticMethod = 1;
+else
{
-ast = list;
+if(!id->classSym)
+id->classSym = _class->__anon1.__anon1.symbol;
+if(name[strlen(name) - 1] == '&')
+{
+type->__anon1.__anon2.thisClass = FindClass("class");
+type->byReference = 1;
}
-
-struct __ecereNameSpace__ecere__sys__OldList * GetAST()
+else
+type->__anon1.__anon2.thisClass = _class->__anon1.__anon1.symbol;
+if(type->__anon1.__anon2.thisClass && strcmp(type->__anon1.__anon2.thisClass->string, "class"))
+type->extraParam = 1;
+else if(!strcmp(name, "any_object"))
{
-return ast;
+type->extraParam = 1;
+type->__anon1.__anon2.thisClass = FindClass("class");
}
-
-void ParseEc()
+else if(!strcmp(name, "class"))
{
-yyparse();
+type->__anon1.__anon2.thisClass = FindClass("class");
+type->classObjectType = 1;
}
-
-int LexEc()
+else if(!strcmp(name, "typed_object") || !strcmp(name, "typed_object&"))
{
-return yylex();
+type->__anon1.__anon2.thisClass = FindClass("class");
+type->classObjectType = 2;
+}
+}
+}
+}
+break;
+}
+default:
+__ecereNameSpace__ecere__com__PrintLn(__ecereClass_char__PTR_, "Unhandled Declarator Type: ", __ecereClass_DeclaratorType, (void *)&decl->type, (void *)0);
+}
}
+if(subDecl)
+{
+struct Type * curType = type;
-const char * GetYYText()
+type = ProcessTypeDecls((((void *)0)), subDecl, type);
+if(curType && type->kind != 11)
{
-return yytext;
+curType->__anon1.__anon2.thisClassTemplate = type->__anon1.__anon2.thisClassTemplate;
+curType->extraParam = type->extraParam;
+curType->__anon1.__anon2.staticMethod = type->__anon1.__anon2.staticMethod;
+curType->__anon1.__anon2.thisClass = type->__anon1.__anon2.thisClass;
+curType->byReference = type->byReference;
+curType->classObjectType = type->classObjectType;
+}
+}
+return type;
}
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__GlobalFunction;
-
-struct __ecereNameSpace__ecere__com__GlobalFunction;
-
-extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_RegisterFunction(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;
-
-extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_AddMethod(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, void * function, int declMode);
-
-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 __ecereRegisterModule_ast(struct __ecereNameSpace__ecere__com__Instance * module)
{
-struct __ecereNameSpace__ecere__com__Class * class;
+struct __ecereNameSpace__ecere__com__Class __attribute__((unused)) * class;
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetDefaultNameSpace", "void SetDefaultNameSpace(const char * s)", SetDefaultNameSpace, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetStrictNameSpaces", "void SetStrictNameSpaces(bool b)", SetStrictNameSpaces, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpDummy", "Expression MkExpDummy(void)", MkExpDummy, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpConstant", "Expression MkExpConstant(const char * string)", MkExpConstant, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpString", "Expression MkExpString(const char * string)", MkExpString, module, 2);
-class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(1, "ContextStringPair", 0, sizeof(struct ContextStringPair), 0, 0, 0, module, 1, 1);
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpWideString", "Expression MkExpWideString(const char * string)", MkExpWideString, module, 2);
+class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(1, "ContextStringPair", 0, sizeof(struct ContextStringPair), 0, (void *)0, (void *)0, module, 1, 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_ContextStringPair = class;
__ecereNameSpace__ecere__com__eClass_AddMethod(class, "OnCompare", 0, __ecereMethod_ContextStringPair_OnCompare, 1);
__ecereNameSpace__ecere__com__eClass_AddMethod(class, "OnFree", 0, __ecereMethod_ContextStringPair_OnFree, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "string", "String", arch_PointerSize, arch_PointerSize, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "context", "String", arch_PointerSize, arch_PointerSize, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "string", "String", sizeof(void *), 0xF000F000, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "context", "String", sizeof(void *), 0xF000F000, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpIntlString", "Expression MkExpIntlString(const char * string, const char * context)", MkExpIntlString, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpOp", "Expression MkExpOp(Expression exp1, int op, Expression exp2)", MkExpOp, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpBrackets", "Expression MkExpBrackets(ecere::sys::OldList expressions)", MkExpBrackets, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDesignerDefaultProperty", "ClassDef MkClassDefDesignerDefaultProperty(Identifier id)", MkClassDefDesignerDefaultProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDefaultProperty", "ClassDef MkClassDefDefaultProperty(ecere::sys::OldList defProperties)", MkClassDefDefaultProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefFunction", "ClassDef MkClassDefFunction(ClassFunction function)", MkClassDefFunction, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClassAddNameSpace", "Symbol DeclClassAddNameSpace(int symbolID, const char * className)", DeclClassAddNameSpace, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClass", "Symbol DeclClass(int symbolID, const char * name)", DeclClass, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_DeclClass", "Symbol _DeclClass(int symbolID, const char * name)", _DeclClass, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClassAddNameSpace", "Symbol DeclClassAddNameSpace(Specifier _class, const char * className)", DeclClassAddNameSpace, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClass", "Symbol DeclClass(Specifier _class, const char * name)", DeclClass, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_DeclClass", "Symbol _DeclClass(Specifier _class, const char * name)", _DeclClass, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetupBaseSpecs", "void SetupBaseSpecs(Symbol symbol, ecere::sys::OldList baseSpecs)", SetupBaseSpecs, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClass", "ClassDefinition MkClass(Symbol symbol, ecere::sys::OldList baseSpecs, ecere::sys::OldList definitions)", MkClass, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpInstance", "Expression MkExpInstance(Instantiation inst)", MkExpInstance, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("PushContext", "Context PushContext(void)", PushContext, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("PopContext", "void PopContext(Context ctx)", PopContext, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindType", "Symbol FindType(Context ctx, const char * name)", FindType, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindStruct", "Symbol FindStruct(Context ctx, const char * name)", FindStruct, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindTemplateTypeParameter", "TemplatedType FindTemplateTypeParameter(Context ctx, const char * name)", FindTemplateTypeParameter, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ModuleAccess", "bool ModuleAccess(ecere::com::Module searchIn, ecere::com::Module searchFor)", ModuleAccess, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindModule", "ModuleImport FindModule(ecere::com::Module moduleToFind)", FindModule, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetYYText", "const char * GetYYText(void)", GetYYText, module, 1);
}
-void __ecereUnregisterModule_ast(struct __ecereNameSpace__ecere__com__Instance * module)
-{
-
-}
-
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Map_TPL_ContextStringPair__ecere__com__List_TPL_Location___;
-
-void __ecereCreateModuleInstances_ast()
-{
-intlStrings = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__Map_TPL_ContextStringPair__ecere__com__List_TPL_Location___);
-__ecereNameSpace__ecere__com__eInstance_IncRef(intlStrings);
-}
-
-void __ecereDestroyModuleInstances_ast()
-{
-(__ecereNameSpace__ecere__com__eInstance_DecRef(intlStrings), intlStrings = 0);
-}
-
Ecere Software / sdk / blobdiff