+/* 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;
+#ifndef _WIN32
+#define __declspec(x)
+#endif
#elif defined(__TINYC__)
#include <stdarg.h>
#define __builtin_va_list va_list
#define strcasecmp stricmp
#define strncasecmp strnicmp
#define __declspec(x) __attribute__((x))
+#else
+#define __declspec(x)
#endif
typedef long long int64;
typedef unsigned long long uint64;
#else
#define __ENDIAN_PAD(x) 0
#endif
+#include <stdint.h>
+#include <sys/types.h>
+
+#if /*defined(_W64) || */(defined(__WORDSIZE) && __WORDSIZE == 8) || defined(__x86_64__)
+#define _64BIT 1
+#else
+#define _64BIT 0
+#endif
+
+#define arch_PointerSize sizeof(void *)
+#define structSize_Instance (_64BIT ? 24 : 12)
+#define structSize_OldLink (_64BIT ? 24 : 12)
+#define structSize_NamedLink64 (_64BIT ? 32 : 24)
+
+struct __ecereNameSpace__ecere__com__Instance;
+
+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);
+
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__BTNode;
struct __ecereNameSpace__ecere__sys__BTNode;
{
struct __ecereNameSpace__ecere__sys__BTNode * root;
int count;
-int (* CompareKey)(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, unsigned int a, unsigned int b);
+int (* CompareKey)(struct __ecereNameSpace__ecere__sys__BinaryTree * tree, uintptr_t a, uintptr_t b);
void (* FreeKey)(void * key);
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldList;
int count;
unsigned int offset;
unsigned int circ;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Method;
struct __ecereNameSpace__ecere__com__Method
{
-char * name;
+const char * name;
struct __ecereNameSpace__ecere__com__Method * parent;
struct __ecereNameSpace__ecere__com__Method * left;
struct __ecereNameSpace__ecere__com__Method * right;
int type;
struct __ecereNameSpace__ecere__com__Class * _class;
void * symbol;
-char * dataTypeString;
+const char * dataTypeString;
struct Type * dataType;
int memberAccess;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Property;
{
struct __ecereNameSpace__ecere__com__Property * prev;
struct __ecereNameSpace__ecere__com__Property * next;
-char * name;
+const char * name;
unsigned int isProperty;
int memberAccess;
int id;
struct __ecereNameSpace__ecere__com__Class * _class;
-char * dataTypeString;
+const char * dataTypeString;
struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
struct Type * dataType;
-void (* Set)();
-int (* Get)();
-unsigned int (* IsSet)();
+void (* Set)(void * , int);
+int (* Get)(void * );
+unsigned int (* IsSet)(void * );
void * data;
void * symbol;
int vid;
unsigned int conversion;
unsigned int watcherOffset;
-char * category;
+const char * category;
unsigned int compiled;
unsigned int selfWatchable;
unsigned int isWatchable;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_CodePosition;
int line;
int charPos;
int pos;
-unsigned int included;
-};
+int included;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Location;
{
struct CodePosition start;
struct CodePosition end;
-};
+} __attribute__ ((gcc_struct));
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Attrib;
+
+struct Attrib
+{
+struct Location loc;
+int type;
+struct __ecereNameSpace__ecere__sys__OldList * attribs;
+} __attribute__ ((gcc_struct));
+
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ExtDecl;
+
+struct ExtDecl
+{
+struct Location loc;
+int type;
+union
+{
+char * s;
+struct Attrib * attr;
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDefinition;
int endid;
int declMode;
unsigned int deleteWatchable;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Context;
struct ClassDefinition * classDef;
unsigned int templateTypesOnly;
unsigned int hasNameSpace;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Instantiation;
struct Location nameLoc;
struct Location insideLoc;
unsigned int built;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declaration;
{
struct __ecereNameSpace__ecere__sys__OldList * specifiers;
struct __ecereNameSpace__ecere__sys__OldList * declarators;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct Instantiation * inst;
struct
{
struct Identifier * id;
struct Expression * exp;
-};
-};
+} __attribute__ ((gcc_struct)) __anon2;
+} __attribute__ ((gcc_struct)) __anon1;
struct Specifier * extStorage;
struct Symbol * symbol;
int declMode;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Statement;
{
struct Identifier * id;
struct Statement * stmt;
-} labeled;
+} __attribute__ ((gcc_struct)) labeled;
struct
{
struct Expression * exp;
struct Statement * stmt;
-} caseStmt;
+} __attribute__ ((gcc_struct)) caseStmt;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * declarations;
struct __ecereNameSpace__ecere__sys__OldList * statements;
struct Context * context;
unsigned int isSwitch;
-} compound;
+} __attribute__ ((gcc_struct)) compound;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * exp;
struct Statement * stmt;
struct Statement * elseStmt;
-} ifStmt;
+} __attribute__ ((gcc_struct)) ifStmt;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * exp;
struct Statement * stmt;
-} switchStmt;
+} __attribute__ ((gcc_struct)) switchStmt;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * exp;
struct Statement * stmt;
-} whileStmt;
+} __attribute__ ((gcc_struct)) whileStmt;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * exp;
struct Statement * stmt;
-} doWhile;
+} __attribute__ ((gcc_struct)) doWhile;
struct
{
struct Statement * init;
struct Statement * check;
struct __ecereNameSpace__ecere__sys__OldList * increment;
struct Statement * stmt;
-} forStmt;
+} __attribute__ ((gcc_struct)) forStmt;
struct
{
struct Identifier * id;
-} gotoStmt;
+} __attribute__ ((gcc_struct)) gotoStmt;
struct
{
struct Specifier * spec;
struct __ecereNameSpace__ecere__sys__OldList * inputFields;
struct __ecereNameSpace__ecere__sys__OldList * outputFields;
struct __ecereNameSpace__ecere__sys__OldList * clobberedFields;
-} asmStmt;
+} __attribute__ ((gcc_struct)) asmStmt;
struct
{
struct Expression * watcher;
struct Expression * object;
struct __ecereNameSpace__ecere__sys__OldList * watches;
-} _watch;
+} __attribute__ ((gcc_struct)) _watch;
struct
{
struct Identifier * id;
struct __ecereNameSpace__ecere__sys__OldList * exp;
struct __ecereNameSpace__ecere__sys__OldList * filter;
struct Statement * stmt;
-} forEachStmt;
+} __attribute__ ((gcc_struct)) forEachStmt;
struct Declaration * decl;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TypeName;
struct Declarator * declarator;
int classObjectType;
struct Expression * bitCount;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Initializer;
{
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___ecereNameSpace__ecere__com__DataValue;
double d;
long long i64;
uint64 ui64;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Expression;
{
char * constant;
struct Identifier * identifier;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct Statement * compound;
struct Instantiation * instance;
+struct
+{
char * string;
+unsigned int intlString;
+} __attribute__ ((gcc_struct)) __anon2;
struct __ecereNameSpace__ecere__sys__OldList * list;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * specifiers;
struct Declarator * decl;
-} _classExp;
+} __attribute__ ((gcc_struct)) _classExp;
struct
{
struct Identifier * id;
-} classData;
+} __attribute__ ((gcc_struct)) classData;
struct
{
struct Expression * exp;
struct __ecereNameSpace__ecere__sys__OldList * arguments;
struct Location argLoc;
-} call;
+} __attribute__ ((gcc_struct)) call;
struct
{
struct Expression * exp;
struct __ecereNameSpace__ecere__sys__OldList * index;
-} index;
+} __attribute__ ((gcc_struct)) index;
struct
{
struct Expression * exp;
struct Identifier * member;
int memberType;
unsigned int thisPtr;
-} member;
+} __attribute__ ((gcc_struct)) member;
struct
{
int op;
struct Expression * exp1;
struct Expression * exp2;
-} op;
+} __attribute__ ((gcc_struct)) op;
struct TypeName * typeName;
struct Specifier * _class;
struct
{
struct TypeName * typeName;
struct Expression * exp;
-} cast;
+} __attribute__ ((gcc_struct)) cast;
struct
{
struct Expression * cond;
struct __ecereNameSpace__ecere__sys__OldList * exp;
struct Expression * elseExp;
-} cond;
+} __attribute__ ((gcc_struct)) cond;
struct
{
struct TypeName * typeName;
struct Expression * size;
-} _new;
+} __attribute__ ((gcc_struct)) _new;
struct
{
struct TypeName * typeName;
struct Expression * size;
struct Expression * exp;
-} _renew;
+} __attribute__ ((gcc_struct)) _renew;
struct
{
char * table;
struct Identifier * id;
-} db;
+} __attribute__ ((gcc_struct)) db;
struct
{
struct Expression * ds;
struct Expression * name;
-} dbopen;
+} __attribute__ ((gcc_struct)) dbopen;
struct
{
struct TypeName * typeName;
struct Initializer * initializer;
-} initializer;
+} __attribute__ ((gcc_struct)) initializer;
struct
{
struct Expression * exp;
struct TypeName * typeName;
-} vaArg;
-};
+} __attribute__ ((gcc_struct)) vaArg;
+} __attribute__ ((gcc_struct)) __anon1;
unsigned int debugValue;
struct __ecereNameSpace__ecere__com__DataValue val;
-unsigned int address;
+uint64 address;
unsigned int hasAddress;
struct Type * expType;
struct Type * destType;
unsigned int addedThis;
unsigned int needCast;
unsigned int thisPtr;
-};
+unsigned int opDestType;
+unsigned int needTemplateCast;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateDatatype;
{
struct __ecereNameSpace__ecere__sys__OldList * specifiers;
struct Declarator * decl;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateArgument;
struct Expression * expression;
struct Identifier * identifier;
struct TemplateDatatype * templateDatatype;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplateParameter;
{
struct TemplateDatatype * dataType;
int memberType;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct TemplateArgument * defaultArgument;
-char * dataTypeString;
+const char * dataTypeString;
struct Type * baseType;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Specifier;
int specifier;
struct
{
+struct ExtDecl * extDecl;
char * name;
struct Symbol * symbol;
struct __ecereNameSpace__ecere__sys__OldList * templateArgs;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct
{
struct Identifier * id;
struct __ecereNameSpace__ecere__sys__OldList * definitions;
unsigned int addNameSpace;
struct Context * ctx;
-};
+struct ExtDecl * extDeclStruct;
+} __attribute__ ((gcc_struct)) __anon2;
struct Expression * expression;
struct Specifier * _class;
struct TemplateParameter * templateParameter;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Identifier;
struct Specifier * _class;
char * string;
struct Identifier * badID;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Pointer;
struct Location loc;
struct __ecereNameSpace__ecere__sys__OldList * qualifiers;
struct Pointer * pointer;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Declarator;
{
struct Expression * exp;
struct Expression * posExp;
-char * attrib;
-} structDecl;
+struct Attrib * attrib;
+} __attribute__ ((gcc_struct)) structDecl;
struct
{
struct Expression * exp;
struct Specifier * enumClass;
-} array;
+} __attribute__ ((gcc_struct)) array;
struct
{
struct __ecereNameSpace__ecere__sys__OldList * parameters;
-} function;
+} __attribute__ ((gcc_struct)) function;
struct
{
struct Pointer * pointer;
-} pointer;
+} __attribute__ ((gcc_struct)) pointer;
struct
{
-char * extended;
-} extended;
-};
-};
+struct ExtDecl * extended;
+} __attribute__ ((gcc_struct)) extended;
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_FunctionDefinition;
struct Symbol * propSet;
int tempCount;
unsigned int propertyNoThis;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableDef;
struct Symbol * symbol;
struct __ecereNameSpace__ecere__sys__OldList * definitions;
int declMode;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_External;
char * importString;
struct Identifier * id;
struct DBTableDef * table;
-};
+} __attribute__ ((gcc_struct)) __anon1;
int importType;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ModuleImport;
struct __ecereNameSpace__ecere__sys__OldList functions;
int importType;
int importAccess;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassImport;
struct __ecereNameSpace__ecere__com__Method * method;
struct __ecereNameSpace__ecere__com__Property * _property;
struct __ecereNameSpace__ecere__com__Class * registered;
-};
+} __attribute__ ((gcc_struct)) __anon1;
int id;
int idCode;
union
{
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;
struct Context * ctx;
int isIterator;
struct Expression * propCategory;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Type;
{
struct __ecereNameSpace__ecere__sys__OldList members;
char * enumName;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct
{
struct Type * returnType;
struct Symbol * thisClass;
unsigned int staticMethod;
struct TemplateParameter * thisClassTemplate;
-};
+} __attribute__ ((gcc_struct)) __anon2;
struct
{
struct __ecereNameSpace__ecere__com__Method * method;
struct __ecereNameSpace__ecere__com__Class * methodClass;
struct __ecereNameSpace__ecere__com__Class * usedClass;
-};
+} __attribute__ ((gcc_struct)) __anon3;
struct
{
struct Type * arrayType;
struct Expression * arraySizeExp;
unsigned int freeExp;
struct Symbol * enumClass;
-};
+} __attribute__ ((gcc_struct)) __anon4;
struct Type * type;
struct TemplateParameter * templateParameter;
-};
-unsigned int isSigned;
+} __attribute__ ((gcc_struct)) __anon1;
int kind;
-unsigned int constant;
unsigned int size;
char * name;
char * typeName;
-unsigned int count;
-unsigned int truth;
int classObjectType;
-unsigned int byReference;
-unsigned int extraParam;
int alignment;
-unsigned int directClassAccess;
-unsigned int computing;
-unsigned int dllExport;
unsigned int offset;
-unsigned int keepCast;
-unsigned int passAsTemplate;
int bitFieldCount;
-};
+int count;
+unsigned int isSigned : 1;
+unsigned int constant : 1;
+unsigned int truth : 1;
+unsigned int byReference : 1;
+unsigned int extraParam : 1;
+unsigned int directClassAccess : 1;
+unsigned int computing : 1;
+unsigned int keepCast : 1;
+unsigned int passAsTemplate : 1;
+unsigned int dllExport : 1;
+unsigned int attrStdcall : 1;
+unsigned int declaredWithStruct : 1;
+unsigned int typedByReference : 1;
+unsigned int casted : 1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Class;
{
struct __ecereNameSpace__ecere__com__Class * prev;
struct __ecereNameSpace__ecere__com__Class * next;
-char * name;
+const char * name;
int offset;
int structSize;
int (* * _vTbl)();
int type;
struct __ecereNameSpace__ecere__com__Instance * module;
struct __ecereNameSpace__ecere__com__NameSpace * nameSpace;
-char * dataTypeString;
+const char * dataTypeString;
struct Type * dataType;
int typeSize;
int defaultAlignment;
void (* Initialize)();
int memberOffset;
struct __ecereNameSpace__ecere__sys__OldList selfWatchers;
-char * designerClass;
+const char * designerClass;
unsigned int noExpansion;
-char * defaultProperty;
+const char * defaultProperty;
unsigned int comRedefinition;
int count;
-unsigned int isRemote;
+int isRemote;
unsigned int internalDecl;
void * data;
unsigned int computeSize;
unsigned int fixed;
struct __ecereNameSpace__ecere__sys__OldList delayedCPValues;
int inheritanceAccess;
-char * fullName;
+const char * fullName;
void * symbol;
struct __ecereNameSpace__ecere__sys__OldList conversions;
struct __ecereNameSpace__ecere__sys__OldList templateParams;
struct __ecereNameSpace__ecere__com__Class * templateClass;
struct __ecereNameSpace__ecere__sys__OldList templatized;
int numParams;
-};
+unsigned int isInstanceClass;
+unsigned int byValueSystemClass;
+} __attribute__ ((gcc_struct));
+
+extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name);
+
+extern void __ecereNameSpace__ecere__com__eClass_SetProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, long long value);
+
+extern void __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
+
+extern void __ecereNameSpace__ecere__com__eInstance_SetMethod(struct __ecereNameSpace__ecere__com__Instance * instance, const char * name, void * function);
+
+extern void __ecereNameSpace__ecere__com__eInstance_IncRef(struct __ecereNameSpace__ecere__com__Instance * instance);
+
+extern void __ecereNameSpace__ecere__com__eInstance_StopWatching(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property, struct __ecereNameSpace__ecere__com__Instance * object);
+
+extern void __ecereNameSpace__ecere__com__eInstance_Watch(void * instance, struct __ecereNameSpace__ecere__com__Property * _property, void * object, void (* callback)(void * , void * ));
+
+extern void __ecereNameSpace__ecere__com__eInstance_FireWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property);
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Instance;
int (* * _vTbl)();
struct __ecereNameSpace__ecere__com__Class * _class;
int _refCount;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DataMember;
{
struct __ecereNameSpace__ecere__com__DataMember * prev;
struct __ecereNameSpace__ecere__com__DataMember * next;
-char * name;
+const char * name;
unsigned int isProperty;
int memberAccess;
int id;
struct __ecereNameSpace__ecere__com__Class * _class;
-char * dataTypeString;
+const char * dataTypeString;
struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
struct Type * dataType;
int type;
struct __ecereNameSpace__ecere__sys__BinaryTree membersAlpha;
int memberOffset;
int structAlignment;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SerialBuffer;
unsigned int count;
unsigned int _size;
unsigned int pos;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ClassTemplateArgument;
{
struct
{
-char * dataTypeString;
+const char * dataTypeString;
struct __ecereNameSpace__ecere__com__Class * dataTypeClass;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct __ecereNameSpace__ecere__com__DataValue expression;
struct
{
-char * memberString;
+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));
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, EXT_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
+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 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 DBTableEntry * dbtableEntry;
struct DBIndexItem * dbindexItem;
struct DBTableDef * dbtableDef;
-} YYSTYPE;
+} __attribute__ ((gcc_struct)) YYSTYPE;
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_Enumerator;
struct Location loc;
struct Identifier * id;
struct Expression * exp;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_InitDeclarator;
struct Location loc;
struct Declarator * declarator;
struct Initializer * initializer;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_AsmField;
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;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassFunction;
unsigned int dontMangle;
int id;
int idCode;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MembersInit;
{
struct __ecereNameSpace__ecere__sys__OldList * dataMembers;
struct ClassFunction * function;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_MemberInit;
unsigned int used;
unsigned int variable;
unsigned int takeOutExp;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyDef;
struct Statement * setStmt;
struct Statement * issetStmt;
struct Symbol * symbol;
-unsigned int conversion;
-unsigned int isWatchable;
struct Expression * category;
-};
+struct
+{
+unsigned int conversion : 1;
+unsigned int isWatchable : 1;
+unsigned int isDBProp : 1;
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_PropertyWatch;
struct Statement * compound;
struct __ecereNameSpace__ecere__sys__OldList * properties;
unsigned int deleteWatch;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_ClassDef;
{
struct Identifier * id;
struct Initializer * initializer;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct)) __anon1;
int memberAccess;
void * object;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableEntry;
{
struct TypeName * dataType;
char * name;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct __ecereNameSpace__ecere__sys__OldList * items;
-};
-};
+} __attribute__ ((gcc_struct)) __anon1;
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBIndexItem;
struct DBIndexItem * next;
struct Identifier * id;
int order;
-};
+} __attribute__ ((gcc_struct));
extern YYSTYPE yylval;
extern char * yytext;
-char * defaultNameSpace;
+const char * defaultNameSpace;
int defaultNameSpaceLen;
-extern int strlen(const char * );
+extern size_t strlen(const char * );
-void SetDefaultNameSpace(char * s)
+void SetDefaultNameSpace(const char * s)
{
defaultNameSpace = s;
defaultNameSpaceLen = s ? strlen(s) : 0;
int declMode = 2;
+int structDeclMode = 2;
+
void SetDeclMode(int accessMode)
{
-declMode = accessMode;
+structDeclMode = declMode = accessMode;
}
int defaultDeclMode = 2;
defaultDeclMode = accessMode;
}
-char * currentNameSpace;
+const char * currentNameSpace;
int currentNameSpaceLen;
-void SetCurrentNameSpace(char * s)
+void SetCurrentNameSpace(const char * s)
{
currentNameSpace = s;
currentNameSpaceLen = s ? strlen(s) : 0;
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(list, (((void *)0)), item);
}
-extern void * memcpy(void * , const void * , unsigned int size);
+extern void * memcpy(void * , const void * , size_t size);
extern int strcmp(const char * , const char * );
-struct Specifier * MkSpecifierName(char * name);
+struct Specifier * MkSpecifierName(const char * name);
-extern char * __ecereNameSpace__ecere__sys__CopyString(char * string);
+extern char * __ecereNameSpace__ecere__sys__CopyString(const char * string);
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_TemplatedType;
struct TemplatedType
{
-unsigned int key;
+uintptr_t key;
struct __ecereNameSpace__ecere__sys__BTNode * parent;
struct __ecereNameSpace__ecere__sys__BTNode * left;
struct __ecereNameSpace__ecere__sys__BTNode * right;
int depth;
struct TemplateParameter * param;
-};
+} __attribute__ ((gcc_struct));
-struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, char * name);
+struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, const char * name);
extern struct Context * curContext;
-struct Symbol * FindClass(char * name);
+struct Symbol * FindClass(const char * name);
-struct Specifier * _MkSpecifierName(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs);
+struct Specifier * _MkSpecifierName(const char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs);
extern void * __ecereNameSpace__ecere__com__eInstance_New(struct __ecereNameSpace__ecere__com__Class * _class);
-struct Identifier * MkIdentifier(char * string)
+struct Identifier * MkIdentifier(const char * string)
{
-void * __ecereTemp1;
struct Identifier * id = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Identifier);
int c;
id->_class = (((void *)0));
if(string)
{
-char * namePart;
-unsigned int gotColon = 0x0;
+const char * namePart;
+unsigned int gotColon = 0;
for(c = strlen(string) - 1; c >= 0; c--)
if(string[c] == ':')
{
-gotColon = 0x1;
+gotColon = 1;
break;
}
namePart = string + c + 1;
name[c + 1] = '\0';
if(!strcmp(name, "typed_object"))
{
-id->_class = MkSpecifierName("class");
+id->_class = MkSpecifierName("typed_object");
id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
else if(!strcmp(name, "property"))
if(templatedType)
{
-id->_class = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 8, ((struct Specifier *)__ecereTemp1)->templateParameter = templatedType->param, ((struct Specifier *)__ecereTemp1));
+id->_class = __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
+
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.templateParameter = templatedType->param, __ecereInstance1;
+});
id->string = __ecereNameSpace__ecere__sys__CopyString(namePart);
}
else
{
if(identifier->string)
{
-struct TemplateParameter * param = (param = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), param->type = 0, param->identifier = identifier, param->dataType = baseTplDatatype, param->defaultArgument = defaultArgument, param);
-struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = (unsigned int)identifier->string, type->param = param, type);
+struct 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(type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor(type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
+((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));
{
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;
}
struct Expression * MkExpExtensionCompound(struct Statement * compound)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 25, ((struct Expression *)__ecereTemp1)->compound = compound, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 23, __ecereInstance1->__anon1.compound = compound, __ecereInstance1;
+});
}
struct Expression * MkExpExtensionExpression(struct __ecereNameSpace__ecere__sys__OldList * expressions)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 34, ((struct Expression *)__ecereTemp1)->list = expressions, ((struct Expression *)__ecereTemp1)->loc = yylloc, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 32, __ecereInstance1->__anon1.list = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpExtensionInitializer(struct TypeName * typeName, struct Initializer * initializer)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 35, ((struct Expression *)__ecereTemp1)->initializer.typeName = typeName, ((struct Expression *)__ecereTemp1)->initializer.initializer = initializer, ((struct Expression *)__ecereTemp1)->loc = yylloc, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 33, __ecereInstance1->__anon1.initializer.typeName = typeName, __ecereInstance1->__anon1.initializer.initializer = initializer, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpIdentifier(struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 0, ((struct Expression *)__ecereTemp1)->identifier = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.__anon1.identifier = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpDummy()
return exp;
}
-struct Expression * MkExpConstant(char * string)
+struct Expression * MkExpConstant(const char * string)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 2, ((struct Expression *)__ecereTemp1)->constant = __ecereNameSpace__ecere__sys__CopyString(string), ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
-struct Expression * MkExpString(char * string)
+struct Expression * MkExpString(const char * string)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 3, ((struct Expression *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(string), ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->__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;
extern unsigned int inCompiler;
-extern struct Expression * QMkExpId(char * id);
+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);
{
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, uint64 index, unsigned int create);
+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);
int __ecereVMethodID___ecereNameSpace__ecere__com__Container_Add;
-struct Expression * MkExpIntlString(char * string, char * context)
+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 =
+struct ContextStringPair pair =
{
0, 0
};
memcpy(pair.context, context + 1, len - 2);
pair.context[len - 2] = '\0';
}
-list = (__extension__ ({
-struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
+list = (((struct __ecereNameSpace__ecere__com__Instance *)(__extension__ ({
+struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
{
intlStrings, 0
};
-__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, (((&pair))), 0x0);
+__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&pair)), 0);
((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&__internalIterator));
-}));
+}))));
if(!list)
{
list = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__List_TPL_Location_);
__extension__ ({
-struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
+struct __ecereNameSpace__ecere__com__Iterator __internalIterator =
{
intlStrings, 0
};
-__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, (((&pair))), 0x1);
-__ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, list);
+__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&pair)), 1);
+__ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)(list)));
});
}
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))list->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Add])(list, (&yylloc));
+((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)(&yylloc));
}
-ListAdd(list, QMkExpId("__thisModule"));
+s = QMkString(i18nModuleName ? i18nModuleName : "");
+ListAdd(list, MkExpString(s));
+(__ecereNameSpace__ecere__com__eSystem_Delete(s), s = 0);
ListAdd(list, MkExpString(string));
if(context)
{
ListAdd(list, QMkExpId("null"));
return MkExpCall(QMkExpId("GetTranslatedString"), list);
}
+else
+{
+struct Expression * e = MkExpString(string);
+
+e->__anon1.__anon2.intlString = 1;
+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)
{
struct Expression * MkExpIndex(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * index)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 6, ((struct Expression *)__ecereTemp1)->index.exp = expression, ((struct Expression *)__ecereTemp1)->index.index = index, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->__anon1.index.exp = expression, __ecereInstance1->__anon1.index.index = index, __ecereInstance1;
+});
}
struct Expression * MkExpCall(struct Expression * expression, struct __ecereNameSpace__ecere__sys__OldList * arguments)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 7, ((struct Expression *)__ecereTemp1)->call.exp = expression, ((struct Expression *)__ecereTemp1)->call.arguments = arguments, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->__anon1.call.exp = expression, __ecereInstance1->__anon1.call.arguments = arguments, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpMember(struct Expression * expression, struct Identifier * member)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 8, ((struct Expression *)__ecereTemp1)->member.exp = expression, ((struct Expression *)__ecereTemp1)->member.member = member, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.member.exp = expression, __ecereInstance1->__anon1.member.member = member, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpPointer(struct Expression * expression, struct Identifier * member)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 9, ((struct Expression *)__ecereTemp1)->member.exp = expression, ((struct Expression *)__ecereTemp1)->member.member = member, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 9, __ecereInstance1->__anon1.member.exp = expression, __ecereInstance1->__anon1.member.member = member, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpTypeSize(struct TypeName * typeName)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
+
+__ecereInstance1->type = 10, __ecereInstance1->__anon1.typeName = typeName, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
+}
+
+struct Expression * MkExpTypeAlign(struct TypeName * typeName)
+{
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 10, ((struct Expression *)__ecereTemp1)->typeName = typeName, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 36, __ecereInstance1->__anon1.typeName = typeName, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpClassSize(struct Specifier * _class)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 15, ((struct Expression *)__ecereTemp1)->_class = _class, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 15, __ecereInstance1->__anon1._class = _class, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpCast(struct TypeName * typeName, struct Expression * expression)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 11, ((struct Expression *)__ecereTemp1)->cast.typeName = typeName, ((struct Expression *)__ecereTemp1)->cast.exp = expression, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 11, __ecereInstance1->__anon1.cast.typeName = typeName, __ecereInstance1->__anon1.cast.exp = expression, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpCondition(struct Expression * cond, struct __ecereNameSpace__ecere__sys__OldList * expressions, struct Expression * elseExp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 12, ((struct Expression *)__ecereTemp1)->cond.cond = cond, ((struct Expression *)__ecereTemp1)->cond.exp = expressions, ((struct Expression *)__ecereTemp1)->cond.elseExp = elseExp, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 12, __ecereInstance1->__anon1.cond.cond = cond, __ecereInstance1->__anon1.cond.exp = expressions, __ecereInstance1->__anon1.cond.elseExp = elseExp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpRenew(struct Expression * memExp, struct TypeName * type, struct Expression * size)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 14, ((struct Expression *)__ecereTemp1)->_renew.exp = memExp, ((struct Expression *)__ecereTemp1)->_renew.typeName = type, ((struct Expression *)__ecereTemp1)->_renew.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 14, __ecereInstance1->__anon1._renew.exp = memExp, __ecereInstance1->__anon1._renew.typeName = type, __ecereInstance1->__anon1._renew.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpRenew0(struct Expression * memExp, struct TypeName * type, struct Expression * size)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 29, ((struct Expression *)__ecereTemp1)->_renew.exp = memExp, ((struct Expression *)__ecereTemp1)->_renew.typeName = type, ((struct Expression *)__ecereTemp1)->_renew.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 27, __ecereInstance1->__anon1._renew.exp = memExp, __ecereInstance1->__anon1._renew.typeName = type, __ecereInstance1->__anon1._renew.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpNew(struct TypeName * type, struct Expression * size)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 13, ((struct Expression *)__ecereTemp1)->_new.typeName = type, ((struct Expression *)__ecereTemp1)->_new.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 13, __ecereInstance1->__anon1._new.typeName = type, __ecereInstance1->__anon1._new.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpNew0(struct TypeName * type, struct Expression * size)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 28, ((struct Expression *)__ecereTemp1)->_new.typeName = type, ((struct Expression *)__ecereTemp1)->_new.size = size, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 26, __ecereInstance1->__anon1._new.typeName = type, __ecereInstance1->__anon1._new.size = size, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Expression * MkExpVaArg(struct Expression * exp, struct TypeName * type)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 36, ((struct Expression *)__ecereTemp1)->vaArg.exp = exp, ((struct Expression *)__ecereTemp1)->vaArg.typeName = type, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 34, __ecereInstance1->__anon1.vaArg.exp = exp, __ecereInstance1->__anon1.vaArg.typeName = type, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Specifier * MkSpecifier(int specifier)
{
-void * __ecereTemp1;
+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 = 0, __ecereInstance1->__anon1.specifier = specifier, __ecereInstance1;
+});
+else
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 0, ((struct Specifier *)__ecereTemp1)->specifier = specifier, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.specifier = specifier, __ecereInstance1;
+});
}
struct Specifier * MkSpecifierTypeOf(struct Expression * expression)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 6, ((struct Specifier *)__ecereTemp1)->expression = expression, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->__anon1.expression = expression, __ecereInstance1;
+});
}
struct Specifier * MkSpecifierSubClass(struct Specifier * _class)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 7, ((struct Specifier *)__ecereTemp1)->_class = _class, ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->__anon1._class = _class, __ecereInstance1;
+});
}
-struct Specifier * MkSpecifierExtended(char * name)
+struct Specifier * MkSpecifierExtended(struct ExtDecl * extDecl)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Specifier * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), ((struct Specifier *)__ecereTemp1)->type = 5, ((struct Specifier *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(name), ((struct Specifier *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.__anon1.extDecl = extDecl, __ecereInstance1;
+});
}
struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
-extern char * strstr(char * , const char * );
+extern char * strstr(const char * , const char * );
extern void FreeSymbol(struct Symbol * symbol);
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))
{
struct Type * type;
struct Enumerator * e;
-struct __ecereNameSpace__ecere__sys__OldList specs =
+struct __ecereNameSpace__ecere__sys__OldList specs =
{
0, 0, 0, 0, 0
};
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, char * name);
+struct Symbol * FindType(struct Context * ctx, const char * name);
struct Specifier * MkStructOrUnion(int type, struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * definitions)
{
-void * __ecereTemp1;
-struct Specifier * spec = (spec = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Specifier), spec->type = type, spec->id = id, spec);
+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))
-declMode = 0;
-spec->definitions = definitions;
-if(definitions && id && !declMode)
+structDeclMode = 0;
+spec->__anon1.__anon2.definitions = definitions;
+if(definitions && id && structDeclMode == 0)
{
-struct __ecereNameSpace__ecere__sys__OldList specs =
+struct __ecereNameSpace__ecere__sys__OldList specs =
{
0, 0, 0, 0, 0
};
struct Symbol * symbol;
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec);
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(&specs, (((void *)0))), ((struct Symbol *)__ecereTemp1)->isStruct = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 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)
{
-void * __ecereTemp1;
-
-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 =
+struct __ecereNameSpace__ecere__sys__OldList specs =
{
0, 0, 0, 0, 0
};
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec);
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(spec->id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(&specs, (((void *)0))), ((struct Symbol *)__ecereTemp1)->isStruct = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(spec->__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);
}
}
+struct Attribute * MkAttribute(char * attr, struct Expression * exp)
+{
+return __extension__ ({
+struct Attribute * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Attribute);
+
+__ecereInstance1->attr = attr, __ecereInstance1->exp = exp, __ecereInstance1;
+});
+}
+
+struct Attrib * MkAttrib(int type, struct __ecereNameSpace__ecere__sys__OldList * attribs)
+{
+return __extension__ ({
+struct Attrib * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Attrib);
+
+__ecereInstance1->type = type, __ecereInstance1->attribs = attribs, __ecereInstance1;
+});
+}
+
+struct ExtDecl * MkExtDeclString(char * s)
+{
+return __extension__ ({
+struct ExtDecl * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl);
+
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.s = s, __ecereInstance1;
+});
+}
+
+struct ExtDecl * MkExtDeclAttrib(struct Attrib * attr)
+{
+return __extension__ ({
+struct ExtDecl * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ExtDecl);
+
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.attr = attr, __ecereInstance1;
+});
+}
+
struct Declarator * MkDeclaratorIdentifier(struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 1, ((struct Declarator *)__ecereTemp1)->identifier = id, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.identifier = id, __ecereInstance1;
+});
}
struct Declarator * MkDeclaratorFunction(struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * parameters)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 4, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->function.parameters = parameters, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 4, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.function.parameters = parameters, __ecereInstance1;
+});
}
-struct Declarator * MkDeclaratorExtended(char * extended, struct Declarator * declarator)
+struct Declarator * MkDeclaratorExtended(struct ExtDecl * extended, struct Declarator * declarator)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 6, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->extended.extended = extended, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.extended.extended = extended, __ecereInstance1;
+});
}
-struct Declarator * MkDeclaratorExtendedEnd(char * extended, struct Declarator * declarator)
+struct Declarator * MkDeclaratorExtendedEnd(struct ExtDecl * extended, struct Declarator * declarator)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 7, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->extended.extended = extended, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.extended.extended = extended, __ecereInstance1;
+});
}
struct Declarator * MkStructDeclarator(struct Declarator * declarator, struct Expression * exp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 0, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->structDecl.exp = exp, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.structDecl.exp = exp, __ecereInstance1;
+});
}
struct Declarator * MkDeclaratorBrackets(struct Declarator * declarator)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 2, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
}
struct Declarator * MkDeclaratorArray(struct Declarator * declarator, struct Expression * exp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 3, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->array.exp = exp, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.array.exp = exp, __ecereInstance1;
+});
}
struct Declarator * MkDeclaratorEnumArray(struct Declarator * declarator, struct Specifier * _class)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 3, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->array.enumClass = _class, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.array.enumClass = _class, __ecereInstance1;
+});
}
struct Declarator * MkDeclaratorPointer(struct Pointer * pointer, struct Declarator * declarator)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Declarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declarator), ((struct Declarator *)__ecereTemp1)->type = 5, ((struct Declarator *)__ecereTemp1)->declarator = declarator, ((struct Declarator *)__ecereTemp1)->pointer.pointer = pointer, ((struct Declarator *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->declarator = declarator, __ecereInstance1->__anon1.pointer.pointer = pointer, __ecereInstance1;
+});
}
struct Enumerator * MkEnumerator(struct Identifier * id, struct Expression * exp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Enumerator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Enumerator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Enumerator), ((struct Enumerator *)__ecereTemp1)->id = id, ((struct Enumerator *)__ecereTemp1)->exp = exp, ((struct Enumerator *)__ecereTemp1));
+__ecereInstance1->id = id, __ecereInstance1->exp = exp, __ecereInstance1;
+});
}
struct Pointer * MkPointer(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Pointer * pointer)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Pointer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Pointer);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Pointer), ((struct Pointer *)__ecereTemp1)->qualifiers = qualifiers, ((struct Pointer *)__ecereTemp1)->pointer = pointer, ((struct Pointer *)__ecereTemp1));
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->pointer = pointer, __ecereInstance1;
+});
}
struct Initializer * MkInitializerAssignment(struct Expression * exp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Initializer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer), ((struct Initializer *)__ecereTemp1)->type = 0, ((struct Initializer *)__ecereTemp1)->exp = exp, ((struct Initializer *)__ecereTemp1)->loc = yylloc, ((struct Initializer *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.exp = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Initializer * MkInitializerList(struct __ecereNameSpace__ecere__sys__OldList * list)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Initializer * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Initializer), ((struct Initializer *)__ecereTemp1)->type = 1, ((struct Initializer *)__ecereTemp1)->list = list, ((struct Initializer *)__ecereTemp1)->loc = yylloc, ((struct Initializer *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.list = list, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct InitDeclarator * MkInitDeclarator(struct Declarator * declarator, struct Initializer * initializer)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct InitDeclarator * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_InitDeclarator);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_InitDeclarator), ((struct InitDeclarator *)__ecereTemp1)->declarator = declarator, ((struct InitDeclarator *)__ecereTemp1)->initializer = initializer, ((struct InitDeclarator *)__ecereTemp1));
+__ecereInstance1->declarator = declarator, __ecereInstance1->initializer = initializer, __ecereInstance1;
+});
}
+int CheckType(const char * text);
+
+extern void FreeDeclarator(struct Declarator * decl);
+
struct TypeName * MkTypeName(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
{
-void * __ecereTemp1;
+if(qualifiers != (((void *)0)))
+{
+struct Declarator * parentDecl = declarator;
+struct Declarator * decl = declarator;
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), ((struct TypeName *)__ecereTemp1)->qualifiers = qualifiers, ((struct TypeName *)__ecereTemp1)->declarator = declarator, ((struct TypeName *)__ecereTemp1));
-}
+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;
-struct Identifier * GetDeclId(struct Declarator * decl)
+for(spec = qualifiers->first; spec; spec = spec->next)
{
-while(decl && decl->type != 1)
-decl = decl->declarator;
-return decl ? decl->identifier : (((void *)0));
+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;
}
-
-struct Declaration * MkDeclarationClassInst(struct Instantiation * inst)
+else if(spec->type != 5)
+break;
+}
+if(!spec)
{
-void * __ecereTemp1;
+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);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), ((struct Declaration *)__ecereTemp1)->type = 2, ((struct Declaration *)__ecereTemp1)->inst = inst, ((struct Declaration *)__ecereTemp1)->loc = yylloc, ((struct Declaration *)__ecereTemp1));
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
}
-extern struct Context * globalContext;
+extern char * __ecereNameSpace__ecere__sys__RSearchString(const char * buffer, const char * subStr, int maxLen, unsigned int matchCase, unsigned int matchWord);
-struct Type * MkClassTypeSymbol(struct Symbol * symbol);
+extern void FreeSpecifier(struct Specifier * spec);
-extern struct __ecereNameSpace__ecere__sys__OldList * excludedSymbols;
+void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
-struct Declaration * MkDeclarationInst(struct Instantiation * inst)
+struct TypeName * MkTypeNameGuessDecl(struct __ecereNameSpace__ecere__sys__OldList * qualifiers, struct Declarator * declarator)
{
-void * __ecereTemp1;
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 2, decl->inst = inst, decl->loc = yylloc, decl);
-struct Symbol * symbol;
-
-if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+if(qualifiers != (((void *)0)))
{
-char name[1024];
-int len = 0, stringLen;
+unsigned int gotType = 0;
+unsigned int gotFullType = 0;
+struct Specifier * spec, * next;
+
+for(spec = qualifiers->first; spec; spec = next)
+{
+next = spec->next;
+if(gotType && !declarator && ((spec->type == 1 && spec->__anon1.__anon1.name) || (spec->type == 0 && gotFullType)))
+{
+const char * s = (((void *)0));
+
+if(spec->type == 1)
+{
+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;
+}
+else if(spec->type == 0)
+{
+if(spec->__anon1.specifier == INT64)
+s = "int64";
+}
+if(s)
+{
+declarator = MkDeclaratorIdentifier(MkIdentifier(s));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(qualifiers, spec);
+FreeSpecifier(spec);
+spec = (((void *)0));
+}
+}
+if(spec && spec->type != 5)
+{
+if(spec->type == 0)
+{
+if(spec->__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;
+}
+else
+{
+gotFullType = 1;
+gotType = 1;
+}
+}
+}
+}
+return __extension__ ({
+struct TypeName * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName);
+
+__ecereInstance1->qualifiers = qualifiers, __ecereInstance1->declarator = declarator, __ecereInstance1;
+});
+}
+
+struct Identifier * GetDeclId(struct Declarator * decl)
+{
+while(decl && decl->type != 1)
+decl = decl->declarator;
+return decl ? decl->__anon1.identifier : (((void *)0));
+}
+
+struct Declaration * MkDeclarationClassInst(struct Instantiation * inst)
+{
+return __extension__ ({
+struct Declaration * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration);
+
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.inst = inst, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
+}
+
+extern struct Context * globalContext;
+
+struct Type * MkClassTypeSymbol(struct Symbol * symbol);
+
+extern struct __ecereNameSpace__ecere__sys__OldList * excludedSymbols;
+
+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;
+
+if(curContext == globalContext && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
+{
+char name[1024];
+int len = 0, stringLen;
if(defaultNameSpace)
{
name[len++] = ':';
name[len++] = ':';
}
-stringLen = strlen(inst->exp->identifier->string);
-memcpy(name + len, inst->exp->identifier->string, stringLen);
+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->identifier->string), inst->exp->identifier->string = 0);
-inst->exp->identifier->string = __ecereNameSpace__ecere__sys__CopyString(name);
+(__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 = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys__CopyString(inst->exp->identifier->string) : (((void *)0)), ((struct Symbol *)__ecereTemp1)->type = MkClassTypeSymbol(inst->_class->symbol), ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys__CopyString(inst->exp->__anon1.__anon1.identifier->string) : (((void *)0)), __ecereInstance1->type = MkClassTypeSymbol(inst->_class->__anon1.__anon1.symbol), __ecereInstance1;
+});
symbol->idCode = symbol->id = curContext->nextID++;
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))
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
decl->symbol = inst->symbol = symbol;
struct __ecereNameSpace__ecere__com__DefinedExpression;
-extern struct __ecereNameSpace__ecere__com__DefinedExpression * __ecereNameSpace__ecere__com__eSystem_FindDefine(struct __ecereNameSpace__ecere__com__Instance * module, char * name);
+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(char * name, char * value, struct __ecereNameSpace__ecere__com__Instance * module, int declMode);
+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(char * format, ...);
+extern void Compiler_Warning(const char * format, ...);
-extern char * __ecereNameSpace__ecere__GetTranslatedString(struct __ecereNameSpace__ecere__com__Instance * module, char * string, char * stringAndContext);
-
-extern struct __ecereNameSpace__ecere__com__Instance * __thisModule;
+extern const char * __ecereNameSpace__ecere__GetTranslatedString(const char * name, const char * string, const char * stringAndContext);
struct Declaration * MkDeclarationDefine(struct Identifier * id, struct Expression * exp)
{
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 3, decl->id = id, decl->exp = exp, decl->loc = yylloc, decl);
+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];
expString[0] = '\0';
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(__thisModule, "Redefinition of %s ignored\n", (((void *)0))), id->string);
+Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "Redefinition of %s ignored\n", (((void *)0))), id->string);
return decl;
}
-extern int sprintf(char * , char * , ...);
+extern int sprintf(char * , const char * , ...);
-struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(struct __ecereNameSpace__ecere__sys__BinaryTree * this, char * key);
+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)
{
-void * __ecereTemp1;
-struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 1, decl->declarators = initDeclarators, decl->specifiers = specifiers, decl->loc = yylloc, decl);
-unsigned int variable = 0x1;
+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;
if(specifiers != (((void *)0)))
{
-struct Specifier * spec;
+unsigned int gotType = 0;
+struct Specifier * spec, * next;
-for(spec = specifiers->first; spec; spec = spec->next)
+for(spec = specifiers->first; spec; spec = next)
{
-if(spec->type == 0 && spec->specifier == TYPEDEF)
+next = spec->next;
+if(spec->type == 0 && spec->__anon1.specifier == TYPEDEF)
{
if(initDeclarators != (((void *)0)))
{
}
else if(spec->next)
{
-for(; spec; spec = spec->next)
+spec = specifiers->last;
+{
+if((spec->type == 1 && spec->__anon1.__anon1.name) || spec->type == 0)
+{
+const char * s = (((void *)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;
+}
+else if(spec->type == 0)
{
-if(spec->type == 1 && spec->name)
+if(spec->__anon1.specifier == INT64)
+s = "int64";
+}
+if(s)
{
-struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(spec->name), type->type = ProcessType(specifiers, (((void *)0))), type);
+struct Symbol * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), type->string = __ecereNameSpace__ecere__sys__CopyString(s), type->type = ProcessType(specifiers, (((void *)0))), type);
type->id = type->idCode = curContext->nextID++;
+decl->symbol = type;
+decl->__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);
-decl->symbol = type;
}
}
}
-variable = 0x0;
+}
+variable = 0;
break;
}
-else if(spec->type == 0 && (spec->specifier == STRUCT || spec->specifier == UNION))
-variable = 0x0;
+else if(spec->type == 0 && (spec->__anon1.specifier == STRUCT || spec->__anon1.specifier == UNION))
+variable = 0;
+else
+{
+if(gotType && initDeclarators == (((void *)0)) && !spec->next && ((spec->type == 1 && spec->__anon1.__anon1.name) || spec->type == 0))
+{
+const char * s = (((void *)0));
+
+if(spec->type == 1)
+{
+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;
+}
+else if(spec->type == 0)
+{
+if(spec->__anon1.specifier == INT64)
+s = "int64";
+}
+if(s)
+{
+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));
+}
+}
+}
+if(spec && spec->type != 5)
+gotType = 1;
}
}
if(variable && initDeclarators)
symbol = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&(curContext->templateTypesOnly ? curContext->parent : curContext)->symbols, id->string);
if(!symbol)
{
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(specifiers, d->declarator), ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(specifiers, d->declarator), __ecereInstance1;
+});
if(strstr(symbol->string, "::"))
-curContext->hasNameSpace = 0x1;
+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);
-if(symbol->type && symbol->type->kind == 12 && !symbol->type->arraySizeExp && d->initializer)
+if(symbol->type && symbol->type->kind == 12 && !symbol->type->__anon1.__anon4.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;
+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->exp->type == 3 && d->initializer->exp->string)
+else if(d->initializer->type == 0 && d->initializer->__anon1.exp->type == 3 && d->initializer->__anon1.exp->__anon1.__anon2.string)
{
char string[256];
int c, count = 0;
char ch;
-unsigned int escaped = 0x0;
-char * s = d->initializer->exp->string;
+unsigned int escaped = 0;
+char * s = d->initializer->__anon1.exp->__anon1.__anon2.string;
for(c = 1; (ch = s[c]); c++)
{
if(ch == '\\' && !escaped)
-escaped = 0x1;
+escaped = 1;
else
{
count++;
-escaped = 0x0;
+escaped = 0;
}
}
sprintf(string, "%d", count);
-symbol->type->arraySizeExp = MkExpConstant(string);
-symbol->type->freeExp = 0x1;
+symbol->type->__anon1.__anon4.arraySizeExp = MkExpConstant(string);
+symbol->type->__anon1.__anon4.freeExp = 1;
}
}
symbol->id = symbol->idCode = curContext->nextID++;
struct Declaration * MkStructDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * declarators, struct Specifier * extStorage)
{
-void * __ecereTemp1;
+struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), decl->type = 0, decl->__anon1.__anon1.declarators = declarators, decl->__anon1.__anon1.specifiers = specifiers, decl->extStorage = extStorage, decl->loc = yylloc, decl);
+
+if(specifiers != (((void *)0)))
+{
+unsigned int gotType = 0;
+struct Specifier * spec, * next;
+
+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));
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Declaration), ((struct Declaration *)__ecereTemp1)->type = 0, ((struct Declaration *)__ecereTemp1)->declarators = declarators, ((struct Declaration *)__ecereTemp1)->specifiers = specifiers, ((struct Declaration *)__ecereTemp1)->extStorage = extStorage, ((struct Declaration *)__ecereTemp1)->loc = yylloc, ((struct Declaration *)__ecereTemp1));
+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;
+}
+else if(spec->type == 0)
+{
+if(spec->__anon1.specifier == INT64)
+s = "int64";
+}
+if(s)
+{
+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));
+}
+}
+if(spec && spec->type != 5)
+gotType = 1;
+}
+}
+return decl;
}
struct Statement * MkLabeledStmt(struct Identifier * id, struct Statement * statement)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 0, ((struct Statement *)__ecereTemp1)->labeled.id = id, ((struct Statement *)__ecereTemp1)->labeled.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.labeled.id = id, __ecereInstance1->__anon1.labeled.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkCaseStmt(struct Expression * exp, struct Statement * statement)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 1, ((struct Statement *)__ecereTemp1)->caseStmt.exp = exp, ((struct Statement *)__ecereTemp1)->caseStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.caseStmt.exp = exp, __ecereInstance1->__anon1.caseStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkCompoundStmt(struct __ecereNameSpace__ecere__sys__OldList * declarations, struct __ecereNameSpace__ecere__sys__OldList * statements)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 2, ((struct Statement *)__ecereTemp1)->compound.declarations = declarations, ((struct Statement *)__ecereTemp1)->compound.statements = statements, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.compound.declarations = declarations, __ecereInstance1->__anon1.compound.statements = statements, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkExpressionStmt(struct __ecereNameSpace__ecere__sys__OldList * expressions)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 3, ((struct Statement *)__ecereTemp1)->expressions = expressions, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->__anon1.expressions = expressions, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkBadDeclStmt(struct Declaration * decl)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 14, ((struct Statement *)__ecereTemp1)->decl = decl, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 14, __ecereInstance1->__anon1.decl = decl, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkIfStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement, struct Statement * elseStmt)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 4, ((struct Statement *)__ecereTemp1)->ifStmt.exp = exp, ((struct Statement *)__ecereTemp1)->ifStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->ifStmt.elseStmt = elseStmt, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 4, __ecereInstance1->__anon1.ifStmt.exp = exp, __ecereInstance1->__anon1.ifStmt.stmt = statement, __ecereInstance1->__anon1.ifStmt.elseStmt = elseStmt, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkSwitchStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
{
-void * __ecereTemp1;
-
if(statement)
-statement->compound.isSwitch = 0x1;
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 5, ((struct Statement *)__ecereTemp1)->switchStmt.exp = exp, ((struct Statement *)__ecereTemp1)->switchStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+statement->__anon1.compound.isSwitch = 1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
+
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.switchStmt.exp = exp, __ecereInstance1->__anon1.switchStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkWhileStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 6, ((struct Statement *)__ecereTemp1)->whileStmt.exp = exp, ((struct Statement *)__ecereTemp1)->whileStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1->__anon1.whileStmt.exp = exp, __ecereInstance1->__anon1.whileStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkDoWhileStmt(struct Statement * statement, struct __ecereNameSpace__ecere__sys__OldList * exp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 7, ((struct Statement *)__ecereTemp1)->doWhile.exp = exp, ((struct Statement *)__ecereTemp1)->doWhile.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1->__anon1.doWhile.exp = exp, __ecereInstance1->__anon1.doWhile.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkForStmt(struct Statement * init, struct Statement * check, struct __ecereNameSpace__ecere__sys__OldList * inc, struct Statement * statement)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 8, ((struct Statement *)__ecereTemp1)->forStmt.init = init, ((struct Statement *)__ecereTemp1)->forStmt.check = check, ((struct Statement *)__ecereTemp1)->forStmt.increment = inc, ((struct Statement *)__ecereTemp1)->forStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.forStmt.init = init, __ecereInstance1->__anon1.forStmt.check = check, __ecereInstance1->__anon1.forStmt.increment = inc, __ecereInstance1->__anon1.forStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkForEachStmt(struct Identifier * id, struct __ecereNameSpace__ecere__sys__OldList * exp, struct __ecereNameSpace__ecere__sys__OldList * filter, struct Statement * statement)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 18, ((struct Statement *)__ecereTemp1)->forEachStmt.id = id, ((struct Statement *)__ecereTemp1)->forEachStmt.exp = exp, ((struct Statement *)__ecereTemp1)->forEachStmt.filter = filter, ((struct Statement *)__ecereTemp1)->forEachStmt.stmt = statement, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 18, __ecereInstance1->__anon1.forEachStmt.id = id, __ecereInstance1->__anon1.forEachStmt.exp = exp, __ecereInstance1->__anon1.forEachStmt.filter = filter, __ecereInstance1->__anon1.forEachStmt.stmt = statement, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkGotoStmt(struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 9, ((struct Statement *)__ecereTemp1)->gotoStmt.id = id, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 9, __ecereInstance1->__anon1.gotoStmt.id = id, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkContinueStmt()
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 10, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 10, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkBreakStmt()
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 11, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 11, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct Statement * MkReturnStmt(struct __ecereNameSpace__ecere__sys__OldList * exp)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 12, ((struct Statement *)__ecereTemp1)->expressions = exp, ((struct Statement *)__ecereTemp1)->loc = yylloc, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 12, __ecereInstance1->__anon1.expressions = exp, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
+struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList, unsigned int errorOnOmit);
+
struct FunctionDefinition * MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList)
{
-void * __ecereTemp1;
-
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionDefinition), ((struct FunctionDefinition *)__ecereTemp1)->specifiers = specifiers, ((struct FunctionDefinition *)__ecereTemp1)->declarator = declarator, ((struct FunctionDefinition *)__ecereTemp1)->declarations = declarationList, ((struct FunctionDefinition *)__ecereTemp1));
+return _MkFunction(specifiers, declarator, declarationList, 1);
}
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)
+{
+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 __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;
extern struct __ecereNameSpace__ecere__com__Property ** __ecereProp___ecereNameSpace__ecere__sys__BTNode_next;
-void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(struct __ecereNameSpace__ecere__sys__OldList * this, void * item);
-
void ProcessFunctionBody(struct FunctionDefinition * func, struct Statement * body)
{
-void * __ecereTemp1;
struct Declarator * declarator = func->declarator;
struct Declarator * funcDecl = GetFuncDecl(declarator);
struct Symbol * symbol;
func->body = body;
-if(funcDecl && funcDecl->function.parameters && body)
+if(funcDecl && funcDecl->__anon1.function.parameters && body)
{
-struct Context * context = body->compound.context;
+struct Context * context = body->__anon1.compound.context;
struct TypeName * param;
-for(param = (*funcDecl->function.parameters).first; param; param = param->next)
+for(param = (*funcDecl->__anon1.function.parameters).first; param; param = param->next)
{
if(param->declarator)
{
break;
if(!symbol && id)
{
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(param->qualifiers, param->declarator), ((struct Symbol *)__ecereTemp1)->isParam = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 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);
symbol->id = context->nextID++;
(__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0);
id->string = __ecereNameSpace__ecere__sys__CopyString(name);
}
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(func->specifiers, declarator), ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(func->specifiers, declarator), __ecereInstance1;
+});
symbol->idCode = symbol->id = globalContext->nextID++;
if(strstr(symbol->string, "::"))
-globalContext->hasNameSpace = 0x1;
+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);
declarator->symbol = 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;
+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)
}
if(symbol->type && (symbol->type->kind == 11 || symbol->type->kind == 16))
{
-if(!symbol->type->params.count)
+if(!symbol->type->__anon1.__anon2.params.count)
{
struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&symbol->type->params, type);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&symbol->type->__anon1.__anon2.params, type);
}
}
else
struct External * MkExternalFunction(struct FunctionDefinition * function)
{
-struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 0, external->function = function, external->symbol = function->declarator->symbol, external);
+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(function->specifiers)
{
struct Specifier * spec;
for(spec = (*function->specifiers).first; spec; spec = spec->next)
-if(spec->type == 0 && spec->specifier == STATIC)
+if(spec->type == 0 && spec->__anon1.specifier == STATIC)
{
-declMode = 3;
+structDeclMode = declMode = 3;
break;
}
}
-if(external->symbol && !external->symbol->methodExternal)
-external->symbol->methodExternal = external;
+if(external->symbol && !external->symbol->__anon2.__anon3.methodExternal)
+external->symbol->__anon2.__anon3.methodExternal = external;
return external;
}
-extern char * strncpy(char * , const char * , int n);
+extern char * strncpy(char * , const char * , size_t n);
-extern void ImportModule(char * name, int importType, int importAccess, unsigned int loadDllOnly);
+extern void ImportModule(const char * name, int importType, int importAccess, unsigned int loadDllOnly);
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;
-external->importString = __ecereNameSpace__ecere__com__eSystem_New(sizeof(char) * (len + 1));
-strncpy(external->importString, name + 1, len);
-external->importString[len] = '\0';
+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->importString, importType, importAccess, 0x1);
-ImportModule(external->importString, importType, importAccess, 0x0);
+ImportModule(external->__anon1.importString, importType, importAccess, 1);
+ImportModule(external->__anon1.importString, importType, importAccess, 0);
}
return external;
}
struct External * MkExternalDeclaration(struct Declaration * declaration)
{
-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 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->specifiers)
+if(declaration && declaration->type == 1 && declaration->__anon1.__anon1.specifiers)
{
struct Specifier * spec;
-for(spec = (*declaration->specifiers).first; spec; spec = spec->next)
-if(spec->type == 0 && spec->specifier == TYPEDEF)
+for(spec = (*declaration->__anon1.__anon1.specifiers).first; spec; spec = spec->next)
+if(spec->type == 0 && spec->__anon1.specifier == TYPEDEF)
{
-declMode = 0;
+structDeclMode = declMode = 0;
break;
}
-else if(spec->type == 0 && spec->specifier == STATIC)
+else if(spec->type == 0 && spec->__anon1.specifier == STATIC)
{
-declMode = 3;
+structDeclMode = declMode = 3;
break;
}
}
-if(declaration && declaration->symbol && !declaration->symbol->methodExternal)
-declaration->symbol->methodExternal = external;
+if(declaration && declaration->symbol && !declaration->symbol->__anon2.__anon3.methodExternal)
+declaration->symbol->__anon2.__anon3.methodExternal = external;
return external;
}
struct External * MkExternalNameSpace(struct Identifier * identifier)
{
-struct External * external = (external = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), external->type = 4, external->id = identifier, external);
+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;
extern char * StringFromSpecDecl(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl);
-struct Symbol * _DeclClass(int symbolID, char * name);
+struct Symbol * _DeclClass(int symbolID, const char * name);
-extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* )(void * ));
+extern void FreeList(struct __ecereNameSpace__ecere__sys__OldList * list, void (* FreeFunction)(void * ));
extern void FreeTemplateArgument(struct TemplateArgument * arg);
struct __ecereNameSpace__ecere__sys__OldLink * prev;
struct __ecereNameSpace__ecere__sys__OldLink * next;
void * data;
-};
+} __attribute__ ((gcc_struct));
void SetClassTemplateArgs(struct Specifier * spec, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
{
-void * __ecereTemp1;
-
if(spec->type == 1)
{
-struct Symbol * symbol = spec->symbol;
+struct Symbol * symbol = spec->__anon1.__anon1.symbol;
-spec->templateArgs = templateArgs;
+spec->__anon1.__anon1.templateArgs = templateArgs;
if(templateArgs && templateArgs->first)
{
char templateString[1024];
struct TemplateArgument * arg;
-strcpy(templateString, symbol ? symbol->string : spec->name);
+strcpy(templateString, symbol ? symbol->string : spec->__anon1.__anon1.name);
strcat(templateString, "<");
for(arg = templateArgs->first; arg; arg = arg->next)
{
thisClass = (((void *)0));
expString[0] = '\0';
-PrintExpression(arg->expression, expString);
+PrintExpression(arg->__anon1.expression, expString);
strcat(argument, expString);
thisClass = backupThisClass;
break;
}
case 1:
{
-strcat(argument, arg->identifier->string);
+strcat(argument, arg->__anon1.identifier->string);
break;
}
case 0:
{
-char * typeString = StringFromSpecDecl(arg->templateDatatype->specifiers, arg->templateDatatype->decl);
+char * typeString = StringFromSpecDecl(arg->__anon1.templateDatatype->specifiers, arg->__anon1.templateDatatype->decl);
strcat(argument, typeString);
(__ecereNameSpace__ecere__com__eSystem_Delete(typeString), typeString = 0);
templateString[len++] = '\0';
}
symbol = FindClass(templateString);
-if(!symbol && spec->symbol)
+if(!symbol && spec->__anon1.__anon1.symbol)
{
symbol = _DeclClass((((int)0x7fffffff)), templateString);
}
-if(spec->symbol)
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&spec->symbol->templatedClasses, (__ecereTemp1 = __ecereNameSpace__ecere__com__eSystem_New0(12), ((struct __ecereNameSpace__ecere__sys__OldLink *)__ecereTemp1)->data = symbol, ((struct __ecereNameSpace__ecere__sys__OldLink *)__ecereTemp1)));
-(__ecereNameSpace__ecere__com__eSystem_Delete(spec->name), spec->name = 0);
-spec->symbol = symbol;
-spec->name = __ecereNameSpace__ecere__sys__CopyString(symbol ? symbol->string : templateString);
+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(structSize_OldLink);
+
+__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, FreeTemplateArgument);
}
-extern int strncmp(const char * , const char * , int n);
+extern int strncmp(const char * , const char * , size_t n);
-struct Specifier * _MkSpecifierName(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
+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(templatedType)
{
-spec->templateParameter = templatedType->param;
+spec->__anon1.templateParameter = templatedType->param;
spec->type = 8;
return spec;
}
else
symbol = FindClass(name);
}
-if(symbol && symbol->registered && symbol->registered->isRemote == (unsigned int)1)
+if(symbol && symbol->__anon1.registered && symbol->__anon1.registered->isRemote == 1)
{
char className[1024];
strcpy(className, "DCOMClient_");
if(!strncmp(name, className, strlen(className)))
-spec->name = __ecereNameSpace__ecere__sys__CopyString(name);
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(name);
else
{
strcat(className, name);
-spec->name = __ecereNameSpace__ecere__sys__CopyString(className);
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(className);
}
}
else if(symbol)
-spec->name = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(symbol->string);
else
-spec->name = __ecereNameSpace__ecere__sys__CopyString(name);
-spec->symbol = symbol;
+spec->__anon1.__anon1.name = __ecereNameSpace__ecere__sys__CopyString(name);
+spec->__anon1.__anon1.symbol = symbol;
if(templateArgs != (((void *)0)))
SetClassTemplateArgs(spec, templateArgs);
}
return spec;
}
-struct Specifier * MkSpecifierName(char * name)
+struct Specifier * MkSpecifierName(const char * name)
{
return _MkSpecifierName(name, (((void *)0)), (((void *)0)));
}
-struct Specifier * MkSpecifierNameArgs(char * name, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
+struct Specifier * MkSpecifierNameArgs(const char * name, struct __ecereNameSpace__ecere__sys__OldList * templateArgs)
{
return _MkSpecifierName(name, (((void *)0)), templateArgs);
}
struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassFunction * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassFunction);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassFunction), ((struct ClassFunction *)__ecereTemp1)->specifiers = specifiers, ((struct ClassFunction *)__ecereTemp1)->declarator = decl, ((struct ClassFunction *)__ecereTemp1)->declarations = declList, ((struct ClassFunction *)__ecereTemp1));
+__ecereInstance1->specifiers = specifiers, __ecereInstance1->declarator = decl, __ecereInstance1->declarations = declList, __ecereInstance1;
+});
}
extern struct Specifier * CopySpecifier(struct Specifier * spec);
-extern void FreeSpecifier(struct Specifier * spec);
-
void ProcessClassFunctionBody(struct ClassFunction * func, struct Statement * body)
{
-void * __ecereTemp1;
struct Symbol * symbol;
struct Declarator * decl = func->declarator;
struct Declarator * funcDecl = GetFuncDecl(func->declarator);
{
struct __ecereNameSpace__ecere__sys__OldList * symbolSpecs = MkList();
-if(funcDecl && funcDecl->function.parameters && body)
+if(funcDecl && funcDecl->__anon1.function.parameters && body)
{
-struct Context * context = body->compound.context;
+struct Context * context = body->__anon1.compound.context;
struct TypeName * param;
-for(param = (*funcDecl->function.parameters).first; param; param = param->next)
+for(param = (*funcDecl->__anon1.function.parameters).first; param; param = param->next)
{
if(param->declarator)
{
}
if(!symbol && id)
{
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = ProcessType(param->qualifiers, param->declarator), ((struct Symbol *)__ecereTemp1)->isParam = 0x1, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 1, __ecereInstance1;
+});
symbol->idCode = symbol->id = context->nextID++;
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&context->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct MemberInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MemberInit), ((struct MemberInit *)__ecereTemp1)->identifiers = ids, ((struct MemberInit *)__ecereTemp1)->initializer = initializer, ((struct MemberInit *)__ecereTemp1));
+__ecereInstance1->identifiers = ids, __ecereInstance1->initializer = initializer, __ecereInstance1;
+});
}
extern void FreeExpression(struct Expression * exp);
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->member.exp)
+for(exp = idExp; exp && exp->type == 8; exp = exp->__anon1.member.exp)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*init->identifiers), (((void *)0)), exp->member.member);
-exp->member.member = (((void *)0));
+__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->identifier);
-exp->identifier = (((void *)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)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit), ((struct MembersInit *)__ecereTemp1)->type = 0, ((struct MembersInit *)__ecereTemp1)->dataMembers = dataMembers, ((struct MembersInit *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.dataMembers = dataMembers, __ecereInstance1;
+});
}
struct MembersInit * MkMembersInitMethod(struct ClassFunction * function)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct MembersInit * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MembersInit), ((struct MembersInit *)__ecereTemp1)->type = 1, ((struct MembersInit *)__ecereTemp1)->function = function, ((struct MembersInit *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.function = function, __ecereInstance1;
+});
}
struct Instantiation * MkInstantiation(struct Specifier * _class, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Instantiation * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation), ((struct Instantiation *)__ecereTemp1)->_class = _class, ((struct Instantiation *)__ecereTemp1)->exp = exp, ((struct Instantiation *)__ecereTemp1)->members = members, ((struct Instantiation *)__ecereTemp1));
+__ecereInstance1->_class = _class, __ecereInstance1->exp = exp, __ecereInstance1->members = members, __ecereInstance1;
+});
}
-extern void Compiler_Error(char * format, ...);
-
struct Instantiation * MkInstantiationNamed(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members)
{
struct Instantiation * inst = (inst = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Instantiation), inst->exp = exp, inst->members = members, inst);
FreeList(specs, FreeSpecifier);
if(!spec)
{
-Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString(__thisModule, "Expecting class specifier\n", (((void *)0))));
+Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Expecting class specifier\n", (((void *)0))));
inst->_class = MkSpecifierName("");
}
}
struct ClassDef * MkClassDefAccessOverride(int access, struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 13, ((struct ClassDef *)__ecereTemp1)->id = id, ((struct ClassDef *)__ecereTemp1)->memberAccess = access, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 13, __ecereInstance1->__anon1.__anon1.id = id, __ecereInstance1->memberAccess = access, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefMemberAccess()
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 12, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 12, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefDeclaration(struct Declaration * decl)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 2, ((struct ClassDef *)__ecereTemp1)->decl = decl, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->__anon1.decl = decl, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefClassData(struct Declaration * decl)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 9, ((struct ClassDef *)__ecereTemp1)->decl = decl, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 9, __ecereInstance1->__anon1.decl = decl, __ecereInstance1;
+});
}
-struct ClassDef * MkClassDefDesigner(char * designer)
+struct ClassDef * MkClassDefDesigner(const char * designer)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 5, ((struct ClassDef *)__ecereTemp1)->designer = __ecereNameSpace__ecere__sys__CopyString(designer), ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.designer = __ecereNameSpace__ecere__sys__CopyString(designer), __ecereInstance1;
+});
}
struct ClassDef * MkClassDefNoExpansion()
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 6, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 6, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefFixed()
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 7, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 7, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefDesignerDefaultProperty(struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 8, ((struct ClassDef *)__ecereTemp1)->defaultProperty = id, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 8, __ecereInstance1->__anon1.defaultProperty = id, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefDefaultProperty(struct __ecereNameSpace__ecere__sys__OldList * defProperties)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 1, ((struct ClassDef *)__ecereTemp1)->defProperties = defProperties, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.defProperties = defProperties, __ecereInstance1;
+});
}
extern void FreeClassFunction(struct ClassFunction * func);
if(funcDecl && funcDecl->declarator && funcDecl->declarator->type == 2)
{
def->type = 2;
-def->decl = MkStructDeclaration(function->specifiers, MkListOne(MkStructDeclarator(function->declarator, (((void *)0)))), (((void *)0)));
+def->__anon1.decl = MkStructDeclaration(function->specifiers, MkListOne(MkStructDeclarator(function->declarator, (((void *)0)))), (((void *)0)));
function->declarator = (((void *)0));
function->specifiers = (((void *)0));
FreeClassFunction(function);
}
}
def->type = 0;
-def->function = function;
+def->__anon1.function = function;
return def;
}
-struct Symbol * DeclClassAddNameSpace(int symbolID, char * className)
+struct Symbol * DeclClassAddNameSpace(int symbolID, const char * className)
{
char name[1024];
int len = 0, stringLen;
return _DeclClass(symbolID, name);
}
-extern char * strchr(char * , int);
+extern char * strchr(const char * , int);
-struct Symbol * DeclClass(int symbolID, char * name)
+struct Symbol * DeclClass(int symbolID, const char * name)
{
if(strchr(name, ':'))
return _DeclClass(symbolID, name);
return DeclClassAddNameSpace(symbolID, name);
}
-struct Symbol * _DeclClass(int symbolID, char * name)
+struct Symbol * _DeclClass(int symbolID, const char * name)
{
-void * __ecereTemp1;
struct Symbol * symbol = FindClass(name);
if(!symbol)
{
if(name[0] == ':' && name[1] == ':')
name += 2;
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(name), ((struct Symbol *)__ecereTemp1)->idCode = symbolID, ((struct Symbol *)__ecereTemp1)->id = symbolID, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->idCode = symbolID, __ecereInstance1->id = symbolID, __ecereInstance1;
+});
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol))
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
{
{
struct __ecereNameSpace__ecere__com__ClassTemplateParameter * prev;
struct __ecereNameSpace__ecere__com__ClassTemplateParameter * next;
-char * name;
+const char * name;
int type;
union
{
-char * dataTypeString;
+const char * dataTypeString;
int memberType;
-};
+} __attribute__ ((gcc_struct)) __anon1;
struct __ecereNameSpace__ecere__com__ClassTemplateArgument defaultArg;
void * param;
-char __ecere_padding[4];
-};
+} __attribute__ ((gcc_struct));
void SetupBaseSpecs(struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * baseSpecs)
{
-void * __ecereTemp1;
-
if(baseSpecs && baseSpecs->first && ((struct Specifier *)baseSpecs->first)->type == 1)
{
char name[1024];
struct Symbol * baseClass;
char * tpl;
-strcpy(name, ((struct Specifier *)baseSpecs->first)->name);
+strcpy(name, ((struct Specifier *)baseSpecs->first)->__anon1.__anon1.name);
tpl = strchr(name, '<');
if(tpl)
*tpl = (char)0;
baseClass = FindClass(name);
-if(baseClass->ctx)
+if(baseClass && baseClass->ctx)
{
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))
+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))
{
struct TemplatedType * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), type->key = copy->key, type->param = copy->param, type);
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor(type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor(type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
+((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->registered)
+else if(baseClass && baseClass->__anon1.registered)
{
struct __ecereNameSpace__ecere__com__Class * sClass;
-for(sClass = baseClass->registered; sClass; sClass = sClass->base)
+for(sClass = baseClass->__anon1.registered; sClass; sClass = sClass->base)
{
struct __ecereNameSpace__ecere__com__ClassTemplateParameter * p;
if(!param)
{
-p->param = param = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter), ((struct TemplateParameter *)__ecereTemp1)->identifier = MkIdentifier(p->name), ((struct TemplateParameter *)__ecereTemp1)->type = p->type, ((struct TemplateParameter *)__ecereTemp1)->dataTypeString = p->dataTypeString, ((struct TemplateParameter *)__ecereTemp1));
+p->param = param = __extension__ ({
+struct TemplateParameter * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplateParameter);
+
+__ecereInstance1->identifier = MkIdentifier(p->name), __ecereInstance1->type = p->type, __ecereInstance1->dataTypeString = p->__anon1.dataTypeString, __ecereInstance1;
+});
}
-type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType), ((struct TemplatedType *)__ecereTemp1)->key = (unsigned int)p->name, ((struct TemplatedType *)__ecereTemp1)->param = param, ((struct TemplatedType *)__ecereTemp1));
+type = __extension__ ({
+struct TemplatedType * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TemplatedType);
+
+__ecereInstance1->key = (uintptr_t)p->name, __ecereInstance1->param = param, __ecereInstance1;
+});
if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->templateTypes, (struct __ecereNameSpace__ecere__sys__BTNode *)type))
-((type ? (__ecereClass_TemplatedType->Destructor ? __ecereClass_TemplatedType->Destructor(type) : 0, __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__BTNode->Destructor(type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0);
+((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);
}
}
}
}
}
+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)
{
-void * __ecereTemp1;
struct ClassDefinition * classDef;
SetupBaseSpecs(symbol, baseSpecs);
if(symbol->ctx)
{
+struct ClassDefinition * classDef = symbol->ctx->classDef;
+
+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;
+}
+}
+}
FreeContext(symbol->ctx);
-((symbol->ctx ? (__ecereClass_Context->Destructor ? __ecereClass_Context->Destructor(symbol->ctx) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(symbol->ctx)) : 0), symbol->ctx = 0);
+((symbol->ctx ? (__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 = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDefinition), ((struct ClassDefinition *)__ecereTemp1)->symbol = symbol, ((struct ClassDefinition *)__ecereTemp1)->_class = MkSpecifierName(symbol->string), ((struct ClassDefinition *)__ecereTemp1)->baseSpecs = baseSpecs, ((struct ClassDefinition *)__ecereTemp1)->definitions = definitions, ((struct ClassDefinition *)__ecereTemp1)->nameLoc = symbol->nameLoc, ((struct ClassDefinition *)__ecereTemp1));
+classDef = __extension__ ({
+struct ClassDefinition * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDefinition);
+
+__ecereInstance1->symbol = symbol, __ecereInstance1->_class = MkSpecifierName(symbol->string), __ecereInstance1->baseSpecs = baseSpecs, __ecereInstance1->definitions = definitions, __ecereInstance1->nameLoc = symbol->nameLoc, __ecereInstance1;
+});
curContext->classDef = classDef;
return classDef;
}
struct Expression * MkExpInstance(struct Instantiation * inst)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 1, ((struct Expression *)__ecereTemp1)->instance = inst, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.instance = inst, __ecereInstance1;
+});
}
struct External * MkExternalClass(struct ClassDefinition * _class)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), ((struct External *)__ecereTemp1)->type = 2, ((struct External *)__ecereTemp1)->_class = _class, ((struct External *)__ecereTemp1)->symbol = _class->symbol, ((struct External *)__ecereTemp1));
+__ecereInstance1->type = 2, __ecereInstance1->__anon1._class = _class, __ecereInstance1->symbol = _class->symbol, __ecereInstance1;
+});
}
-extern void PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
+extern void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName);
struct PropertyDef * MkProperty(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl, struct Identifier * id, struct Statement * setStmt, struct Statement * getStmt)
{
-void * __ecereTemp1;
struct PropertyDef * prop = (prop = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyDef), prop->specifiers = specs, prop->declarator = decl, prop->setStmt = setStmt, prop->getStmt = getStmt, prop);
struct Symbol * symbol;
struct Type * type = ProcessType(specs, decl);
char typeString[1024];
typeString[0] = '\0';
-PrintType(type, typeString, 0x0, 0x1);
+PrintTypeNoConst(type, typeString, 0, 1);
id = MkIdentifier(typeString);
-prop->conversion = 0x1;
+prop->__anon1.conversion = 1;
}
prop->id = id;
-symbol = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(id->string), ((struct Symbol *)__ecereTemp1)->type = type, ((struct Symbol *)__ecereTemp1));
+symbol = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = type, __ecereInstance1;
+});
symbol->idCode = symbol->id = globalContext->nextID++;
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol);
globalContext->nextID++;
struct ClassDef * MkClassDefProperty(struct PropertyDef * propertyDef)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 3, ((struct ClassDef *)__ecereTemp1)->propertyDef = propertyDef, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 3, __ecereInstance1->__anon1.propertyDef = propertyDef, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefClassProperty(struct PropertyDef * propertyDef)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 10, ((struct ClassDef *)__ecereTemp1)->propertyDef = propertyDef, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 10, __ecereInstance1->__anon1.propertyDef = propertyDef, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
struct ClassDef * MkClassDefClassPropertyValue(struct Identifier * id, struct Initializer * initializer)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 11, ((struct ClassDef *)__ecereTemp1)->id = id, ((struct ClassDef *)__ecereTemp1)->initializer = initializer, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 11, __ecereInstance1->__anon1.__anon1.id = id, __ecereInstance1->__anon1.__anon1.initializer = initializer, __ecereInstance1->loc = yylloc, __ecereInstance1;
+});
}
-int CheckType(char * text)
+int CheckType(const char * text)
{
if(FindTemplateTypeParameter(curContext, text))
{
curContext = ctx->parent;
}
-struct Symbol * FindType(struct Context * ctx, char * name)
+struct Symbol * FindType(struct Context * ctx, const char * name)
{
struct Symbol * type = (((void *)0));
return type;
}
-struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, char * name)
+struct TemplatedType * FindTemplateTypeParameter(struct Context * ctx, const char * name)
{
struct TemplatedType * templatedType = (((void *)0));
struct __ecereNameSpace__ecere__com__NameSpace
{
-char * name;
+const char * name;
struct __ecereNameSpace__ecere__com__NameSpace * btParent;
struct __ecereNameSpace__ecere__com__NameSpace * left;
struct __ecereNameSpace__ecere__com__NameSpace * right;
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__sys__OldList modules;
struct __ecereNameSpace__ecere__com__Instance * prev;
struct __ecereNameSpace__ecere__com__Instance * next;
-char * name;
+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));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SubModule;
struct __ecereNameSpace__ecere__com__SubModule * next;
struct __ecereNameSpace__ecere__com__Instance * module;
int importMode;
-};
+} __attribute__ ((gcc_struct));
unsigned int ModuleAccess(struct __ecereNameSpace__ecere__com__Instance * searchIn, struct __ecereNameSpace__ecere__com__Instance * searchFor)
{
struct __ecereNameSpace__ecere__com__SubModule * subModule;
if(searchFor == searchIn)
-return 0x1;
-for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + 12)))->modules.first; subModule; subModule = subModule->next)
+return 1;
+for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->modules.first; subModule; subModule = subModule->next)
{
if(subModule->importMode == 1)
{
if(ModuleAccess(subModule->module, searchFor))
-return 0x1;
+return 1;
}
}
-return 0x0;
+return 0;
}
extern struct ModuleImport * mainModule;
struct ModuleImport * FindModule(struct __ecereNameSpace__ecere__com__Instance * moduleToFind)
{
-void * __ecereTemp1;
struct ModuleImport * module;
-if(!((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->name)
+if(!((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name)
return mainModule;
for(module = (*imports).first; module; module = module->next)
-if(module->name && !strcmp(module->name, ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->name))
+if(module->name && !strcmp(module->name, ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name))
break;
if(!module)
{
-module = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport), ((struct ModuleImport *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->name), ((struct ModuleImport *)__ecereTemp1)->importType = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + 12)))->importType, ((struct ModuleImport *)__ecereTemp1)->importAccess = ModuleAccess(privateModule, moduleToFind) ? 1 : 2, ((struct ModuleImport *)__ecereTemp1));
+module = __extension__ ({
+struct ModuleImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport);
+
+__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->name), __ecereInstance1->importType = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)moduleToFind + structSize_Instance)))->importType, __ecereInstance1->importAccess = ModuleAccess(privateModule, moduleToFind) ? 1 : 2, __ecereInstance1;
+});
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*imports), module);
}
return module;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, char * name);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, const char * name);
-struct Symbol * FindClass(char * name)
+struct Symbol * FindClass(const char * name)
{
-void * __ecereTemp1;
struct Symbol * cl = (((void *)0));
struct __ecereNameSpace__ecere__com__Class * _class;
-unsigned int global = 0x0;
+unsigned int global = 0;
char fullName[1024];
if(name[0] == ':' && name[1] == ':')
{
-global = 0x1;
+global = 1;
name += 2;
}
if(!global && (currentNameSpace || defaultNameSpace) && declMode != 0 && defaultDeclMode != 0)
cl = (struct Symbol *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&globalContext->classes, name);
if(!cl)
{
-cl = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol), ((struct Symbol *)__ecereTemp1)->string = __ecereNameSpace__ecere__sys__CopyString(name), ((struct Symbol *)__ecereTemp1)->registered = _class, ((struct Symbol *)__ecereTemp1)->id = (((int)0x7fffffff)), ((struct Symbol *)__ecereTemp1)->idCode = (((int)0x7fffffff)), ((struct Symbol *)__ecereTemp1)->imported = 0x1, ((struct Symbol *)__ecereTemp1));
+cl = __extension__ ({
+struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol);
+
+__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(name), __ecereInstance1->__anon1.registered = _class, __ecereInstance1->id = (((int)0x7fffffff)), __ecereInstance1->idCode = (((int)0x7fffffff)), __ecereInstance1->imported = 1, __ecereInstance1;
+});
_class->symbol = cl;
if(_class->module)
cl->module = FindModule(_class->module);
return cl;
}
-extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink;
+extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64;
-struct __ecereNameSpace__ecere__sys__NamedLink
+struct __ecereNameSpace__ecere__sys__NamedLink64
{
-struct __ecereNameSpace__ecere__sys__NamedLink * prev;
-struct __ecereNameSpace__ecere__sys__NamedLink * next;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * prev;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * next;
char * name;
-void * data;
-};
+long long data;
+} __attribute__ ((gcc_struct));
extern struct Expression * CopyExpression(struct Expression * exp);
void CopyTypeInto(struct Type * type, struct Type * src)
{
-void * __ecereTemp1;
-
*type = *src;
type->name = __ecereNameSpace__ecere__sys__CopyString(src->name);
-type->enumName = __ecereNameSpace__ecere__sys__CopyString(src->enumName);
type->refCount = 1;
if(src->kind == 15)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * member;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * member;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&type->members);
-for(member = src->members.first; member; member = member->next)
+__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->members, (__ecereTemp1 = __ecereNameSpace__ecere__com__eSystem_New0(16), ((struct __ecereNameSpace__ecere__sys__NamedLink *)__ecereTemp1)->name = __ecereNameSpace__ecere__sys__CopyString(member->name), ((struct __ecereNameSpace__ecere__sys__NamedLink *)__ecereTemp1)->data = member->data, ((struct __ecereNameSpace__ecere__sys__NamedLink *)__ecereTemp1)));
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->__anon1.__anon1.members, __extension__ ({
+struct __ecereNameSpace__ecere__sys__NamedLink64 * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64);
+
+__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 Type * member;
-for(member = type->members.first; member; member = member->next)
+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 Type * param;
-type->returnType->refCount++;
-for(param = type->params.first; param; param = param->next)
+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->type->refCount++;
+type->__anon1.type->refCount++;
if(src->kind == 12)
{
-if(type->arraySizeExp)
-type->arraySizeExp = CopyExpression(type->arraySizeExp);
+if(type->__anon1.__anon4.arraySizeExp)
+type->__anon1.__anon4.arraySizeExp = CopyExpression(type->__anon1.__anon4.arraySizeExp);
}
}
}
-extern void ProcessExpressionType(struct Expression * exp);
+extern int targetBits;
-extern void ComputeExpression(struct Expression * exp);
+extern int targetPlatform;
-extern unsigned long strtoul(const char * nptr, char * * endptr, int base);
+extern long long strtoll(const char * nptr, char * * endptr, int base);
-extern struct Symbol * FindSymbol(char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace);
+extern struct Symbol * FindSymbol(const char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace);
-struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl)
+static struct Type * ProcessTypeSpecs(struct __ecereNameSpace__ecere__sys__OldList * specs, unsigned int assumeEllipsis, unsigned int keepTypeName)
{
-void * __ecereTemp1;
-struct Type * type = (((void *)0));
-unsigned int isTypedef = 0x0;
+struct Type * specType = (specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), specType->refCount = 1, specType->kind = 3, specType->isSigned = 1, specType);
-if(!specs || specs->first)
+if(specs != (((void *)0)))
{
-struct Declarator * funcDecl = GetFuncDecl(decl);
-struct Type * specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-unsigned int dllExport = 0x0;
+unsigned int isTypedef = 0;
+struct Specifier * spec;
+unsigned int isLong = 0;
-specType->kind = 3;
-specType->isSigned = 0x1;
-specType->refCount = 1;
-type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-while(decl && (decl->type == 0 || decl->type == 6 || decl->type == 7))
-{
-if(decl->type == 0 && decl->structDecl.exp)
+for(spec = specs->first; spec; spec = spec->next)
{
-ProcessExpressionType(decl->structDecl.exp);
-ComputeExpression(decl->structDecl.exp);
-if(decl->structDecl.exp->type == 2)
-specType->bitFieldCount = strtoul(decl->structDecl.exp->constant, (((void *)0)), 0);
-}
-if((decl->type == 6 || decl->type == 7) && decl->extended.extended && (!strcmp(decl->extended.extended, "__declspec(dllexport)") || !strcmp(decl->extended.extended, "dllexport")))
+if(spec->type == 5)
{
-dllExport = 0x1;
-}
-if((decl->type == 6 || decl->type == 7) && decl->extended.extended && (strstr(decl->extended.extended, "__attribute__")))
+struct ExtDecl * extDecl = spec->__anon1.__anon1.extDecl;
+
+if(extDecl->type == 0)
{
-specType->keepCast = 0x1;
-}
-decl = decl->declarator;
+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;
}
-if(funcDecl || !decl || decl->type == 1)
+else if(extDecl->type == 1)
{
-struct Specifier * spec;
+struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->__anon1.attr->attribs;
-if(specs != (((void *)0)))
+if(attribs)
{
-unsigned int isLong = 0x0;
+struct Attribute * attr;
-for(spec = specs->first; spec; spec = spec->next)
+for(attr = (*attribs).first; attr; attr = attr->next)
{
-if(spec->type == 5 && (!strcmp(spec->name, "__declspec(dllexport)") || !strcmp(spec->name, "dllexport")))
+char * s = attr->attr;
+
+if(s)
{
-dllExport = 0x1;
+if(!strcmp(s, "dllexport"))
+specType->dllExport = 1;
+else if(!strcmp(s, "stdcall"))
+specType->attrStdcall = 1;
+}
}
-if(spec->type == 5 && strstr(spec->name, "__attribute__"))
-{
-specType->keepCast = 0x1;
}
-if(spec->specifier != CONST && (specType->kind == 9 || specType->kind == 10))
+specType->keepCast = 1;
+}
+}
+if(spec->__anon1.specifier != CONST && (specType->kind == 9 || specType->kind == 10))
{
FreeType(specType);
-specType = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->kind = 3, ((struct Type *)__ecereTemp1)->isSigned = 0x1, ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
+specType = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 1, __ecereInstance1->refCount = 1, __ecereInstance1;
+});
}
-if(spec->type == 0)
+if(isTypedef && keepTypeName)
+{
+specType->kind = 18;
+return specType;
+}
+else if(spec->type == 0)
{
-if(spec->specifier == TYPEDEF)
-isTypedef = 0x1;
-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)
+if(specType->kind != 2 && specType->kind != 5 && !isLong)
specType->kind = 3;
}
-else if(spec->specifier == UINT)
+else if(spec->__anon1.specifier == _BOOL || spec->__anon1.specifier == BOOL)
+specType->kind = 24;
+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)
+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)
+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)
{
-specType->classObjectType = 2;
-specType->kind = 8;
-specType->_class = FindClass("class");
-}
-else if(spec->specifier == ANY_OBJECT)
+switch(spec->__anon1.specifier)
{
+case TYPED_OBJECT:
+specType->classObjectType = 2;
+break;
+case ANY_OBJECT:
specType->classObjectType = 3;
-specType->kind = 8;
-specType->_class = FindClass("class");
-}
-else if(spec->specifier == CLASS)
-{
+break;
+case CLASS:
specType->classObjectType = 1;
+break;
+}
specType->kind = 8;
-specType->_class = FindClass("class");
+specType->__anon1._class = FindClass("class");
}
-else if(spec->specifier == THISCLASS)
+else if(spec->__anon1.specifier == THISCLASS)
specType->kind = 21;
}
else if(spec->type == 1)
{
-struct Symbol * symbol = spec->name ? FindType(curContext, spec->name) : (((void *)0));
+if(spec->__anon1.__anon1.name && (!strcmp(spec->__anon1.__anon1.name, "intptr") || !strcmp(spec->__anon1.__anon1.name, "uintptr")))
+{
+specType->kind = 22;
+if(!strcmp(spec->__anon1.__anon1.name, "uintptr"))
+specType->isSigned = 0;
+}
+else if(spec->__anon1.__anon1.name && (!strcmp(spec->__anon1.__anon1.name, "uintsize") || !strcmp(spec->__anon1.__anon1.name, "intsize")))
+{
+specType->kind = 23;
+if(!strcmp(spec->__anon1.__anon1.name, "uintsize"))
+specType->isSigned = 0;
+}
+else
+{
+struct Symbol * symbol = spec->__anon1.__anon1.name ? FindType(curContext, spec->__anon1.__anon1.name) : (((void *)0));
if(symbol && symbol->type)
{
+unsigned int isConstant = specType->constant;
struct Type * dummy = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
*dummy = *specType;
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->__anon1._class = spec->__anon1.__anon1.name ? FindClass(spec->__anon1.__anon1.name) : (((void *)0));
specType->kind = 8;
-if(!specType->_class)
+if(!specType->__anon1._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)
+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 Enumerator * e;
-int nextValue = 0;
-for(e = (*spec->list).first; e; e = e->next)
+for(e = (*spec->__anon1.__anon2.list).first; e; e = e->next)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(16), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i);
+struct __ecereNameSpace__ecere__sys__NamedLink64 * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, i);
+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);
}
}
}
else if(spec->type == 8)
{
specType->kind = 20;
-specType->templateParameter = spec->templateParameter;
+specType->__anon1.templateParameter = spec->__anon1.templateParameter;
}
else if(spec->type == 3 || spec->type == 4)
{
-struct Symbol * _class = spec->id ? FindClass(spec->id->string) : (((void *)0));
+struct Symbol * _class = spec->__anon1.__anon2.id ? FindClass(spec->__anon1.__anon2.id->string) : (((void *)0));
if(_class)
{
-if(!_class->registered || _class->registered->type != 1)
-specType->directClassAccess = 0x1;
-specType->_class = _class;
+specType->declaredWithStruct = 1;
+if(!_class->__anon1.registered || _class->__anon1.registered->type != 1)
+specType->directClassAccess = 1;
+specType->__anon1._class = _class;
specType->kind = 8;
break;
}
+__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->id)
+if(spec->__anon1.__anon2.id)
{
-if(!spec->definitions && !isTypedef)
+if(!spec->__anon1.__anon2.definitions && !isTypedef)
{
-struct Symbol * symbol = spec->id->string ? FindSymbol(spec->id->string, curContext, globalContext, 0x1, 0x0) : (((void *)0));
+struct Symbol * symbol = spec->__anon1.__anon2.id->string ? FindSymbol(spec->__anon1.__anon2.id->string, curContext, globalContext, 1, 0) : (((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->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)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * member;
+struct __ecereNameSpace__ecere__sys__NamedLink64 * member;
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->members);
-for(member = symbol->type->members.first; member; member = member->next)
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(&specType->__anon1.__anon1.members);
+for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next)
{
-struct __ecereNameSpace__ecere__sys__NamedLink * item = (item = __ecereNameSpace__ecere__com__eSystem_New0(16), item->name = __ecereNameSpace__ecere__sys__CopyString(member->name), item->data = member->data, item);
+struct __ecereNameSpace__ecere__sys__NamedLink64 * item = (item = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64), item->name = __ecereNameSpace__ecere__sys__CopyString(member->name), item->data = member->data, item);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, item);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, item);
}
}
else if(symbol->type->kind == 9 || symbol->type->kind == 10)
{
struct Type * member;
-for(member = specType->members.first; member; member = member->next)
+for(member = specType->__anon1.__anon1.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)
+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->type->refCount++;
+specType->__anon1.type->refCount++;
if(symbol->type->kind == 12)
{
-if(specType->arraySizeExp)
-specType->arraySizeExp = CopyExpression(specType->arraySizeExp);
+if(specType->__anon1.__anon4.arraySizeExp)
+specType->__anon1.__anon4.arraySizeExp = CopyExpression(specType->__anon1.__anon4.arraySizeExp);
}
}
}
else
-specType->enumName = __ecereNameSpace__ecere__sys__CopyString(spec->id->string);
+specType->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string);
}
else
-specType->enumName = __ecereNameSpace__ecere__sys__CopyString(spec->id->string);
+specType->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string);
}
-if(spec->definitions)
+if(spec->__anon1.__anon2.definitions)
{
struct ClassDef * def;
-for(def = (*spec->definitions).first; def; def = def->next)
+for(def = (*spec->__anon1.__anon2.definitions).first; def; def = def->next)
{
-if(def->type == 2 && def->decl->type == 0)
+if(def->type == 2 && def->__anon1.decl->type == 0)
{
-struct Declaration * decl = def->decl;
+struct Declaration * decl = def->__anon1.decl;
-if(decl->declarators)
+if(decl->__anon1.__anon1.declarators)
{
struct Declarator * d;
-for(d = (*decl->declarators).first; d; d = d->next)
+for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next)
{
-struct Type * memberType = ProcessType(decl->specifiers, d);
+struct Type * memberType = ProcessType(decl->__anon1.__anon1.specifiers, d);
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, memberType);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, memberType);
}
}
-else if(decl->specifiers)
+else if(decl->__anon1.__anon1.specifiers)
{
-struct Type * memberType = ProcessType(decl->specifiers, (((void *)0)));
+struct Type * memberType = ProcessType(decl->__anon1.__anon1.specifiers, (((void *)0)));
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->members, memberType);
+__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, memberType);
}
}
}
}
else if(spec->type == 7)
{
-specType->kind = specType->kind = 19;
-specType->_class = spec->_class->symbol;
+specType->kind = 19;
+specType->__anon1._class = spec->__anon1._class->__anon1.__anon1.symbol;
}
}
}
-else if(!decl)
+else if(assumeEllipsis)
specType->kind = 14;
+return specType;
}
-if(funcDecl)
+
+extern void ProcessExpressionType(struct Expression * exp);
+
+extern void ComputeExpression(struct Expression * exp);
+
+extern unsigned long strtoul(const char * nptr, char * * endptr, int base);
+
+extern void __ecereNameSpace__ecere__com__PrintLn(struct __ecereNameSpace__ecere__com__Class * class, 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 Declarator * d = funcDecl->declarator;
-struct Type * funcType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
-struct TypeName * param;
+struct Type * type = parentType;
+struct Declarator * subDecl = decl ? decl->declarator : (((void *)0));
-funcType->kind = 11;
-funcType->refCount = 1;
-if(funcDecl->function.parameters)
+if(!parentType)
+type = ProcessTypeSpecs(specs, decl == (((void *)0)), (decl && decl->type == 7) ? 1 : 0);
+if(decl)
{
-for(param = (*funcDecl->function.parameters).first; param; param = param->next)
+switch(decl->type)
{
-__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&funcType->params, ProcessType(param->qualifiers, param->declarator));
-}
-}
-if(decl->type == 5)
+case 2:
+break;
+case 6:
+case 7:
{
-struct Pointer * pointer = decl->pointer.pointer;
-struct Type * ptrType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+struct ExtDecl * extDecl = decl->__anon1.extended.extended;
-funcType->returnType = ptrType;
-funcType->returnType->refCount = 1;
-while(pointer)
-{
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
+if(extDecl)
{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
-}
-}
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-*ptrType->type = *specType;
-}
-else
+switch(extDecl->type)
{
-funcType->returnType = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-*funcType->returnType = *specType;
-}
-while(d && (d->type == 2 || d->type == 6 || d->type == 7))
+case 0:
{
-if((d->type == 6 || d->type == 7) && d->extended.extended && (!strcmp(d->extended.extended, "__declspec(dllexport)") || !strcmp(d->extended.extended, "dllexport")))
+char * s = extDecl->__anon1.s;
+
+if(s)
{
-dllExport = 0x1;
+if(!strcmp(s, "__declspec(dllexport)") || !strcmp(s, "dllexport"))
+type->dllExport = 1;
+else if(!strcmp(s, "__declspec(stdcall)") || !strcmp(s, "stdcall"))
+type->attrStdcall = 1;
}
-d = d->declarator;
+break;
}
-funcType->dllExport = dllExport;
-if(d && d->type == 5)
+case 1:
{
-struct Type * ptrType;
-struct Identifier * id;
+struct __ecereNameSpace__ecere__sys__OldList * attribs = extDecl->__anon1.attr->attribs;
-if(d->declarator && d->declarator->type == 3)
+if(attribs)
{
-struct Pointer * pointer = d->pointer.pointer;
+struct Attribute * attr;
-type->kind = 12;
-type->arraySizeExp = CopyExpression(d->declarator->array.exp);
-type->freeExp = 0x1;
-if(d->declarator->array.enumClass)
-type->enumClass = d->declarator->array.enumClass->symbol;
-if(d->declarator->declarator && d->declarator->declarator->type == 3)
+for(attr = (*attribs).first; attr; attr = attr->next)
{
-struct Type * tmpType = type;
-struct Type * inType;
+char * s = attr->attr;
-type = ProcessType((((void *)0)), d->declarator->declarator);
-inType = type->type;
-type->type = tmpType;
-tmpType->type = inType;
-}
-else
-type->type = ProcessType((((void *)0)), d->declarator->declarator);
-for(ptrType = type->type; ptrType && ptrType->kind && ptrType->type; ptrType = ptrType->type)
-;
-while(pointer)
+if(s)
{
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
-{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
+if(!strcmp(s, "dllexport"))
+type->dllExport = 1;
+else if(!strcmp(s, "stdcall"))
+type->attrStdcall = 1;
}
}
-ptrType->type = ProcessType(specs, (((void *)0)));
}
-else
-{
-struct Pointer * pointer = d->pointer.pointer;
-
-ptrType = type;
-while(pointer)
-{
-ptrType->kind = 13;
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-pointer = pointer->pointer;
-if(pointer)
-ptrType = ptrType->type;
+type->keepCast = 1;
+break;
}
}
-*ptrType->type = *funcType;
-id = GetDeclId(d);
-if(id)
-{
-if(id->_class && !id->_class->name)
-ptrType->type->staticMethod = 0x1;
-else
-{
-if(!id->classSym)
-{
-if(id->_class && id->_class->name)
-{
-id->classSym = id->_class->symbol;
}
+break;
}
-ptrType->type->thisClass = id->classSym;
-if(ptrType->type->thisClass && strcmp(ptrType->type->thisClass->string, "class"))
-ptrType->type->extraParam = 0x1;
-else if(id->_class && id->_class->name && !strcmp(id->_class->name, "any_object"))
+case 0:
{
-ptrType->type->extraParam = 0x1;
-ptrType->type->thisClass = FindClass("class");
-}
-}
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+struct Expression * exp = decl->__anon1.structDecl.exp;
+
+if(exp)
+{
+ProcessExpressionType(exp);
+ComputeExpression(exp);
+if(exp->type == 2)
+type->bitFieldCount = strtoul(exp->__anon1.__anon1.constant, (((void *)0)), 0);
}
+break;
}
-else if(!d || d->type == 1)
-{
-*type = *funcType;
-if(d)
+case 4:
{
-if(d->identifier->_class && d->identifier->_class->type == 8)
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__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)
{
-type->thisClassTemplate = d->identifier->_class->templateParameter;
-type->extraParam = 0x1;
+struct TypeName * param;
+
+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));
}
-else
+break;
+}
+case 3:
{
-if(d->identifier->_class && !d->identifier->_class->name)
-type->staticMethod = 0x1;
-else
+type = __extension__ ({
+struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type);
+
+__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:
{
-if(d->identifier->_class && d->identifier->_class->name && d->identifier->_class->name[strlen(d->identifier->_class->name) - 1] == '&')
+struct Pointer * pointer = decl->__anon1.pointer.pointer;
+
+while(pointer)
{
-type->thisClass = FindClass("class");
-type->byReference = 0x1;
-}
+struct __ecereNameSpace__ecere__sys__OldList * qualifiers = pointer->qualifiers;
+
+if(type->classObjectType)
+type->byReference = 1;
else
-type->thisClass = d->identifier->_class ? d->identifier->_class->symbol : (((void *)0));
-if(type->thisClass && strcmp(type->thisClass->string, "class"))
-{
-type->extraParam = 0x1;
-}
-else if(d->identifier->_class && d->identifier->_class->name && !strcmp(d->identifier->_class->name, "any_object"))
+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)
{
-type->extraParam = 0x1;
-type->thisClass = FindClass("class");
-}
-else if(d->identifier->_class && d->identifier->_class->name && !strcmp(d->identifier->_class->name, "class"))
+struct Specifier * spec;
+
+for(spec = (*qualifiers).first; spec; spec = spec->next)
{
-type->thisClass = FindClass("class");
-type->classObjectType = 1;
-}
-}
+if(spec->type == 0 && spec->__anon1.specifier == CONST)
+type->constant = 1;
}
-type->name = __ecereNameSpace__ecere__sys__CopyString(d->identifier->string);
}
+pointer = pointer->pointer;
}
-((funcType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor(funcType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(funcType)) : 0), funcType = 0);
+break;
}
-else if(decl && decl->type == 5)
-{
-if(decl->declarator && decl->declarator->type == 3)
-{
-struct Identifier * id;
-struct Pointer * pointer = decl->pointer.pointer;
-struct Type * ptrType;
-
-type->kind = 12;
-type->arraySizeExp = CopyExpression(decl->declarator->array.exp);
-type->freeExp = 0x1;
-if(decl->declarator->array.enumClass)
-type->enumClass = decl->declarator->array.enumClass->symbol;
-if(decl->declarator->declarator && decl->declarator->declarator->type == 3)
+case 1:
{
-struct Type * tmpType = type;
-struct Type * inType;
+struct Identifier * id = decl->__anon1.identifier;
+struct Specifier * _class = id->_class;
-type = ProcessType((((void *)0)), decl->declarator->declarator);
-inType = type->type;
-type->type = tmpType;
-tmpType->type = inType;
-}
-else
-type->type = ProcessType((((void *)0)), decl->declarator->declarator);
-for(ptrType = type->type; ptrType && ptrType->kind && ptrType->type; ptrType = ptrType->type)
-;
-while(pointer)
+(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
+type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+if(_class)
{
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
+if(_class->type == 8)
{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
-}
-}
-ptrType->type = ProcessType(specs, (((void *)0)));
-id = GetDeclId(decl);
-if(id)
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+type->__anon1.__anon2.thisClassTemplate = _class->__anon1.templateParameter;
+type->extraParam = 1;
}
else
{
-struct Identifier * id;
-struct Pointer * pointer = decl->pointer.pointer;
-struct Type * ptrType = type;
+char * name = _class->__anon1.__anon1.name;
-if(type->classObjectType)
-{
-type->byReference = 0x1;
-}
+if(!name)
+type->__anon1.__anon2.staticMethod = 1;
else
{
-while(pointer)
+if(!id->classSym)
+id->classSym = _class->__anon1.__anon1.symbol;
+if(name[strlen(name) - 1] == '&')
{
-ptrType->kind = 13;
-pointer = pointer->pointer;
-if(pointer)
+type->__anon1.__anon2.thisClass = FindClass("class");
+type->byReference = 1;
+}
+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"))
{
-ptrType->type = (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), ((struct Type *)__ecereTemp1)->refCount = 1, ((struct Type *)__ecereTemp1));
-ptrType = ptrType->type;
+type->extraParam = 1;
+type->__anon1.__anon2.thisClass = FindClass("class");
}
+else if(!strcmp(name, "class"))
+{
+type->__anon1.__anon2.thisClass = FindClass("class");
+type->classObjectType = 1;
}
-ptrType->type = ProcessType(specs, decl->declarator);
-if(type->type->classObjectType)
+else if(!strcmp(name, "typed_object") || !strcmp(name, "typed_object&"))
{
-struct Type * subType = type->type;
-
-type->classObjectType = subType->classObjectType;
-type->kind = subType->kind;
-type->_class = subType->_class;
-type->byReference = 0x1;
-FreeType(subType);
+type->__anon1.__anon2.thisClass = FindClass("class");
+type->classObjectType = 2;
}
-id = GetDeclId(decl);
-if(id)
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
}
}
}
-else if(decl && decl->type == 3)
-{
-struct Identifier * id;
-
-type->kind = 12;
-type->arraySizeExp = CopyExpression(decl->array.exp);
-type->freeExp = 0x1;
-if(decl->array.enumClass)
-type->enumClass = decl->array.enumClass->symbol;
-id = GetDeclId(decl);
-if(decl->declarator && decl->declarator->type == 3)
-{
-struct Type * tmpType = type;
-struct Type * inType;
-
-type = ProcessType(specs, decl->declarator);
-inType = type->type;
-type->type = tmpType;
-tmpType->type = inType;
+break;
}
-else
-type->type = ProcessType(specs, decl->declarator);
-if(id)
-{
-(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
-type->name = __ecereNameSpace__ecere__sys__CopyString(id->string);
+default:
+__ecereNameSpace__ecere__com__PrintLn(__ecereClass_char__PTR_, "Unhandled Declarator Type: ", __ecereClass_DeclaratorType, &decl->type, (void *)0);
}
}
-else
+if(subDecl)
{
-if(!decl || decl->type == 1)
+struct Type * curType = type;
+
+type = ProcessTypeDecls((((void *)0)), subDecl, type);
+if(curType && type->kind != 11)
{
-*type = *specType;
-(__ecereNameSpace__ecere__com__eSystem_Delete(type->name), type->name = 0);
-type->name = decl ? __ecereNameSpace__ecere__sys__CopyString(decl->identifier->string) : (((void *)0));
+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;
}
}
-((specType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor(specType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(specType)) : 0), specType = 0);
-}
return type;
}
-extern struct Declarator * SpecDeclFromString(char * string, struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * baseDecl);
+struct Type * ProcessType(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl)
+{
+return ProcessTypeDecls(specs, decl, (((void *)0)));
+}
-extern void FreeDeclarator(struct Declarator * decl);
+extern struct Declarator * SpecDeclFromString(const char * string, struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * baseDecl);
-struct Type * ProcessTypeString(char * string, unsigned int staticMethod)
+struct Type * ProcessTypeString(const char * string, unsigned int staticMethod)
{
struct __ecereNameSpace__ecere__sys__OldList * specs = MkList();
struct Declarator * decl = SpecDeclFromString(string, specs, (((void *)0)));
struct Type * type = ProcessType(specs, decl);
-if(type && !type->thisClass && staticMethod)
-type->staticMethod = 0x1;
+if(type && !type->__anon1.__anon2.thisClass && staticMethod)
+type->__anon1.__anon2.staticMethod = 1;
FreeList(specs, FreeSpecifier);
if(decl)
FreeDeclarator(decl);
{
if(symbol)
{
-struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->_class = symbol, type);
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->__anon1._class = symbol, type);
-if(!type->_class)
+if(!type->__anon1._class)
{
type->kind = 3;
}
return (((void *)0));
}
-struct Type * MkClassType(char * name)
+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);
+struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->kind = 8, type->__anon1._class = FindClass(name), type);
-if(!type->_class)
+if(!type->__anon1._class)
{
type->kind = 3;
}
return (((void *)0));
}
-struct AsmField * MkAsmField(char * command, struct Expression * expression)
+struct AsmField * MkAsmField(char * command, struct Expression * expression, struct Identifier * symbolic)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct AsmField * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_AsmField);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_AsmField), ((struct AsmField *)__ecereTemp1)->command = command, ((struct AsmField *)__ecereTemp1)->expression = expression, ((struct AsmField *)__ecereTemp1));
+__ecereInstance1->command = command, __ecereInstance1->expression = expression, __ecereInstance1->symbolic = symbolic, __ecereInstance1;
+});
}
struct Statement * MkAsmStmt(struct Specifier * spec, char * statements, struct __ecereNameSpace__ecere__sys__OldList * inputFields, struct __ecereNameSpace__ecere__sys__OldList * outputFields, struct __ecereNameSpace__ecere__sys__OldList * clobberedFields)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 13, ((struct Statement *)__ecereTemp1)->asmStmt.spec = spec, ((struct Statement *)__ecereTemp1)->asmStmt.statements = statements, ((struct Statement *)__ecereTemp1)->asmStmt.inputFields = inputFields, ((struct Statement *)__ecereTemp1)->asmStmt.outputFields = outputFields, ((struct Statement *)__ecereTemp1)->asmStmt.clobberedFields = clobberedFields, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 13, __ecereInstance1->__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 ClassDef * MkClassDefPropertyWatch(struct PropertyWatch * watcher)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct ClassDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassDef), ((struct ClassDef *)__ecereTemp1)->type = 4, ((struct ClassDef *)__ecereTemp1)->propertyWatch = watcher, ((struct ClassDef *)__ecereTemp1));
+__ecereInstance1->type = 4, __ecereInstance1->__anon1.propertyWatch = watcher, __ecereInstance1;
+});
}
struct Statement * MkFireWatchersStmt(struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 15, ((struct Statement *)__ecereTemp1)->_watch.object = object, ((struct Statement *)__ecereTemp1)->_watch.watches = watches, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 15, __ecereInstance1->__anon1._watch.object = object, __ecereInstance1->__anon1._watch.watches = watches, __ecereInstance1;
+});
}
struct Statement * MkStopWatchingStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 16, ((struct Statement *)__ecereTemp1)->_watch.watcher = watcher, ((struct Statement *)__ecereTemp1)->_watch.object = object, ((struct Statement *)__ecereTemp1)->_watch.watches = watches, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 16, __ecereInstance1->__anon1._watch.watcher = watcher, __ecereInstance1->__anon1._watch.object = object, __ecereInstance1->__anon1._watch.watches = watches, __ecereInstance1;
+});
}
struct Statement * MkWatchStmt(struct Expression * watcher, struct Expression * object, struct __ecereNameSpace__ecere__sys__OldList * watches)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement), ((struct Statement *)__ecereTemp1)->type = 17, ((struct Statement *)__ecereTemp1)->_watch.watcher = watcher, ((struct Statement *)__ecereTemp1)->_watch.object = object, ((struct Statement *)__ecereTemp1)->_watch.watches = watches, ((struct Statement *)__ecereTemp1));
+__ecereInstance1->type = 17, __ecereInstance1->__anon1._watch.watcher = watcher, __ecereInstance1->__anon1._watch.object = object, __ecereInstance1->__anon1._watch.watches = watches, __ecereInstance1;
+});
}
struct PropertyWatch * MkDeleteWatch(struct Statement * compound)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch), ((struct PropertyWatch *)__ecereTemp1)->compound = compound, ((struct PropertyWatch *)__ecereTemp1)->deleteWatch = 0x1, ((struct PropertyWatch *)__ecereTemp1));
+__ecereInstance1->compound = compound, __ecereInstance1->deleteWatch = 1, __ecereInstance1;
+});
}
struct PropertyWatch * MkPropertyWatch(struct __ecereNameSpace__ecere__sys__OldList * properties, struct Statement * compound)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch), ((struct PropertyWatch *)__ecereTemp1)->compound = compound, ((struct PropertyWatch *)__ecereTemp1)->properties = properties, ((struct PropertyWatch *)__ecereTemp1));
+__ecereInstance1->compound = compound, __ecereInstance1->properties = properties, __ecereInstance1;
+});
}
struct Expression * MkExpClass(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * decl)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 26, ((struct Expression *)__ecereTemp1)->_classExp.specifiers = specifiers, ((struct Expression *)__ecereTemp1)->_classExp.decl = decl, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 24, __ecereInstance1->__anon1._classExp.specifiers = specifiers, __ecereInstance1->__anon1._classExp.decl = decl, __ecereInstance1;
+});
}
struct Expression * MkExpClassData(struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 27, ((struct Expression *)__ecereTemp1)->classData.id = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 25, __ecereInstance1->__anon1.classData.id = id, __ecereInstance1;
+});
}
struct External * MkExternalDBTable(struct DBTableDef * table)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct External * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_External), ((struct External *)__ecereTemp1)->type = 5, ((struct External *)__ecereTemp1)->table = table, ((struct External *)__ecereTemp1));
+__ecereInstance1->type = 5, __ecereInstance1->__anon1.table = table, __ecereInstance1;
+});
}
struct DBTableDef * MkDBTableDef(char * name, struct Symbol * symbol, struct __ecereNameSpace__ecere__sys__OldList * definitions)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct DBTableDef * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableDef);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableDef), ((struct DBTableDef *)__ecereTemp1)->name = name, ((struct DBTableDef *)__ecereTemp1)->symbol = symbol, ((struct DBTableDef *)__ecereTemp1)->definitions = definitions, ((struct DBTableDef *)__ecereTemp1));
+__ecereInstance1->name = name, __ecereInstance1->symbol = symbol, __ecereInstance1->definitions = definitions, __ecereInstance1;
+});
}
struct DBTableEntry * MkDBFieldEntry(struct TypeName * type, struct Identifier * id, char * name)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry), ((struct DBTableEntry *)__ecereTemp1)->type = 0, ((struct DBTableEntry *)__ecereTemp1)->dataType = type, ((struct DBTableEntry *)__ecereTemp1)->id = id, ((struct DBTableEntry *)__ecereTemp1)->name = name, ((struct DBTableEntry *)__ecereTemp1));
+__ecereInstance1->type = 0, __ecereInstance1->__anon1.__anon1.dataType = type, __ecereInstance1->id = id, __ecereInstance1->__anon1.__anon1.name = name, __ecereInstance1;
+});
}
struct DBIndexItem * MkDBIndexItem(struct Identifier * id, int order)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct DBIndexItem * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBIndexItem);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBIndexItem), ((struct DBIndexItem *)__ecereTemp1)->id = id, ((struct DBIndexItem *)__ecereTemp1)->order = order, ((struct DBIndexItem *)__ecereTemp1));
+__ecereInstance1->id = id, __ecereInstance1->order = order, __ecereInstance1;
+});
}
struct DBTableEntry * MkDBIndexEntry(struct __ecereNameSpace__ecere__sys__OldList * items, struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct DBTableEntry * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DBTableEntry), ((struct DBTableEntry *)__ecereTemp1)->type = 1, ((struct DBTableEntry *)__ecereTemp1)->items = items, ((struct DBTableEntry *)__ecereTemp1)->id = id, ((struct DBTableEntry *)__ecereTemp1));
+__ecereInstance1->type = 1, __ecereInstance1->__anon1.items = items, __ecereInstance1->id = id, __ecereInstance1;
+});
}
struct Expression * MkExpDBOpen(struct Expression * ds, struct Expression * dbName)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 30, ((struct Expression *)__ecereTemp1)->dbopen.ds = ds, ((struct Expression *)__ecereTemp1)->dbopen.name = dbName, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 28, __ecereInstance1->__anon1.dbopen.ds = ds, __ecereInstance1->__anon1.dbopen.name = dbName, __ecereInstance1;
+});
}
struct Expression * MkExpDBField(char * table, struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 31, ((struct Expression *)__ecereTemp1)->db.table = table, ((struct Expression *)__ecereTemp1)->db.id = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 29, __ecereInstance1->__anon1.db.table = table, __ecereInstance1->__anon1.db.id = id, __ecereInstance1;
+});
}
struct Expression * MkExpDBIndex(char * table, struct Identifier * id)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 33, ((struct Expression *)__ecereTemp1)->db.table = table, ((struct Expression *)__ecereTemp1)->db.id = id, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 31, __ecereInstance1->__anon1.db.table = table, __ecereInstance1->__anon1.db.id = id, __ecereInstance1;
+});
}
struct Expression * MkExpDBTable(char * table)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 32, ((struct Expression *)__ecereTemp1)->db.table = table, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 30, __ecereInstance1->__anon1.db.table = table, __ecereInstance1;
+});
}
struct Expression * MkExpArray(struct __ecereNameSpace__ecere__sys__OldList * expressions)
{
-void * __ecereTemp1;
+return __extension__ ({
+struct Expression * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression);
-return (__ecereTemp1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Expression), ((struct Expression *)__ecereTemp1)->type = 37, ((struct Expression *)__ecereTemp1)->list = expressions, ((struct Expression *)__ecereTemp1));
+__ecereInstance1->type = 35, __ecereInstance1->__anon1.list = expressions, __ecereInstance1;
+});
}
extern struct External * curExternal;
-extern void FullClassNameCat(char * output, char * className, unsigned int includeTemplateParams);
+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);
-extern void DeclareClass(struct Symbol * classSym, char * className);
-
-struct Expression * GetTemplateArgExpByName(char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType)
+struct Expression * GetTemplateArgExpByName(const char * paramName, struct __ecereNameSpace__ecere__com__Class * curClass, int tplType)
{
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__com__Class * _class = curClass ? curClass : ((curExternal && curExternal->type == 0 && curExternal->__anon1.function) ? curExternal->__anon1.function->_class : (((void *)0)));
if(_class)
{
{
char idString[32];
char className[1024];
-struct Expression * classExp;
sprintf(idString, "%d", id);
strcpy(className, "__ecereClass_");
-FullClassNameCat(className, _class->fullName, 0x1);
-MangleClassName(className);
+FullClassNameCat(className, _class->fullName, 1);
DeclareClass(FindClass(_class->fullName), className);
argExp = MkExpIndex((MkExpMember)(MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class")), MkIdentifier("templateArgs")), MkListOne(MkExpConstant(idString)));
}
return param->identifier ? GetTemplateArgExpByName(param->identifier->string, curClass, 0) : (((void *)0));
}
-extern char * GetSourceFile(void);
+extern const char * GetSourceFile(void);
-extern char * GetOutputFile(void);
+extern const char * GetOutputFile(void);
-extern char * __ecereNameSpace__ecere__sys__ChangeExtension(char * string, char * ext, char * output);
+extern char * __ecereNameSpace__ecere__sys__ChangeExtension(const char * string, const char * ext, char * output);
-extern struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__sys__FileOpen(char * fileName, int mode);
+extern struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__sys__FileOpen(const char * fileName, int mode);
-extern char * __ecereNameSpace__ecere__sys__GetSlashPathBuffer(char * d, char * p);
+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__Instance * container;
struct __ecereNameSpace__ecere__com__IteratorPointer * pointer;
-};
+} __attribute__ ((gcc_struct));
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Iterator;
{
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);
unsigned int __ecereMethod___ecereNameSpace__ecere__com__Iterator_Next();
-uint64 __ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_key(struct __ecereNameSpace__ecere__com__MapIterator * this);
+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, char * format, ...);
+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;
+
void OutputIntlStrings()
{
-if(((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)intlStrings + 12)))->count)
+if(((struct __ecereNameSpace__ecere__com__CustomAVLTree *)(((char *)intlStrings + structSize_Instance)))->count)
{
-char * srcFile = GetSourceFile();
-char * objFile = GetOutputFile();
+const char * srcFile = GetSourceFile();
+const char * objFile = GetOutputFile();
char srcFileFixed[797];
char potFile[797];
struct __ecereNameSpace__ecere__com__Instance * f;
f = __ecereNameSpace__ecere__sys__FileOpen(potFile, 2);
if(f)
{
-char * filePrefix = "";
+const char * filePrefix = "";
if(!(srcFile[0] && (srcFile[1] == ':' || srcFile[0] == '/')))
filePrefix = "./";
{
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(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next(&s))
+while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next((void *)&s))
{
struct ContextStringPair pair = (*(struct ContextStringPair *)__ecereProp___ecereNameSpace__ecere__com__MapIterator_Get_key(&s));
{
-struct __ecereNameSpace__ecere__com__Iterator l =
+struct __ecereNameSpace__ecere__com__Iterator l =
{
-((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&s)), 0
+((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data((void *)&s)), 0
};
while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next(&l))
}
(__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0);
}
-((void (*)(struct __ecereNameSpace__ecere__com__Instance *))intlStrings->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Free])(intlStrings);
+((void (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({
+struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = intlStrings;
+
+__internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl;
+})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Free])(intlStrings);
}
}
-extern struct __ecereNameSpace__ecere__sys__OldList * ast;
-
extern int yyparse();
+extern int yylex();
+
void SetAST(struct __ecereNameSpace__ecere__sys__OldList * list)
{
ast = list;
yyparse();
}
+int LexEc()
+{
+return yylex();
+}
+
+const char * GetYYText()
+{
+return yytext;
+}
+
extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__GlobalFunction;
struct __ecereNameSpace__ecere__com__GlobalFunction;
-extern struct __ecereNameSpace__ecere__com__GlobalFunction * __ecereNameSpace__ecere__com__eSystem_RegisterFunction(char * name, char * type, void * func, struct __ecereNameSpace__ecere__com__Instance * module, int declMode);
+extern struct __ecereNameSpace__ecere__com__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__Class * __ecereNameSpace__ecere__com__eSystem_RegisterClass(int type, char * name, char * baseName, int size, int sizeClass, unsigned int (* )(void * ), void (* )(void * ), struct __ecereNameSpace__ecere__com__Instance * module, int declMode, int inheritanceAccess);
+extern struct __ecereNameSpace__ecere__com__Instance * __thisModule;
-extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_AddMethod(struct __ecereNameSpace__ecere__com__Class * _class, char * name, char * type, void * function, int declMode);
+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, char * name, char * type, unsigned int size, unsigned int alignment, 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(char * s)", SetDefaultNameSpace, module, 1);
+__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("SetDeclMode", "void SetDeclMode(ecere::com::AccessMode accessMode)", SetDeclMode, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetDefaultDeclMode", "void SetDefaultDeclMode(ecere::com::AccessMode accessMode)", SetDefaultDeclMode, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetCurrentNameSpace", "void SetCurrentNameSpace(char * s)", SetCurrentNameSpace, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetCurrentNameSpace", "void SetCurrentNameSpace(const char * s)", SetCurrentNameSpace, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkList", "ecere::sys::OldList * MkList(void)", MkList, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkListOne", "ecere::sys::OldList * MkListOne(void * item)", MkListOne, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ListAdd", "void ListAdd(ecere::sys::OldList list, void * item)", ListAdd, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ListAddFront", "void ListAddFront(ecere::sys::OldList list, void * item)", ListAddFront, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkIdentifier", "Identifier MkIdentifier(char * string)", MkIdentifier, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkIdentifier", "Identifier MkIdentifier(const char * string)", MkIdentifier, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkTypeTemplateParameter", "TemplateParameter MkTypeTemplateParameter(Identifier identifier, TemplateDatatype baseTplDatatype, TemplateArgument defaultArgument)", MkTypeTemplateParameter, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkIdentifierTemplateParameter", "TemplateParameter MkIdentifierTemplateParameter(Identifier identifier, ecere::com::TemplateMemberType memberType, TemplateArgument defaultArgument)", MkIdentifierTemplateParameter, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpressionTemplateParameter", "TemplateParameter MkExpressionTemplateParameter(Identifier identifier, TemplateDatatype dataType, TemplateArgument defaultArgument)", MkExpressionTemplateParameter, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpExtensionInitializer", "Expression MkExpExtensionInitializer(TypeName typeName, Initializer initializer)", MkExpExtensionInitializer, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpIdentifier", "Expression MkExpIdentifier(Identifier id)", MkExpIdentifier, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpDummy", "Expression MkExpDummy(void)", MkExpDummy, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpConstant", "Expression MkExpConstant(char * string)", MkExpConstant, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpString", "Expression MkExpString(char * string)", MkExpString, module, 2);
+__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 + 12)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + 12)))->application && class)
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
__ecereClass_ContextStringPair = class;
__ecereNameSpace__ecere__com__eClass_AddMethod(class, "OnCompare", 0, __ecereMethod_ContextStringPair_OnCompare, 1);
__ecereNameSpace__ecere__com__eClass_AddMethod(class, "OnFree", 0, __ecereMethod_ContextStringPair_OnFree, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "string", "String", 4, 4, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "context", "String", 4, 4, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpIntlString", "Expression MkExpIntlString(char * string, char * context)", MkExpIntlString, module, 2);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "string", "String", arch_PointerSize, arch_PointerSize, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "context", "String", arch_PointerSize, arch_PointerSize, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpIntlString", "Expression MkExpIntlString(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("MkExpIndex", "Expression MkExpIndex(Expression expression, ecere::sys::OldList index)", MkExpIndex, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpMember", "Expression MkExpMember(Expression expression, Identifier member)", MkExpMember, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpPointer", "Expression MkExpPointer(Expression expression, Identifier member)", MkExpPointer, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpTypeSize", "Expression MkExpTypeSize(TypeName typeName)", MkExpTypeSize, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpTypeAlign", "Expression MkExpTypeAlign(TypeName typeName)", MkExpTypeAlign, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpClassSize", "Expression MkExpClassSize(Specifier _class)", MkExpClassSize, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpCast", "Expression MkExpCast(TypeName typeName, Expression expression)", MkExpCast, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpCondition", "Expression MkExpCondition(Expression cond, ecere::sys::OldList expressions, Expression elseExp)", MkExpCondition, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifier", "Specifier MkSpecifier(int specifier)", MkSpecifier, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierTypeOf", "Specifier MkSpecifierTypeOf(Expression expression)", MkSpecifierTypeOf, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierSubClass", "Specifier MkSpecifierSubClass(Specifier _class)", MkSpecifierSubClass, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierExtended", "Specifier MkSpecifierExtended(char * name)", MkSpecifierExtended, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierExtended", "Specifier MkSpecifierExtended(ExtDecl extDecl)", MkSpecifierExtended, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkEnum", "Specifier MkEnum(Identifier id, ecere::sys::OldList list)", MkEnum, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkStructOrUnion", "Specifier MkStructOrUnion(SpecifierType type, Identifier id, ecere::sys::OldList definitions)", MkStructOrUnion, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("AddStructDefinitions", "void AddStructDefinitions(Specifier spec, ecere::sys::OldList definitions)", AddStructDefinitions, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkAttribute", "Attribute MkAttribute(String attr, Expression exp)", MkAttribute, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkAttrib", "Attrib MkAttrib(int type, ecere::sys::OldList * attribs)", MkAttrib, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExtDeclString", "ExtDecl MkExtDeclString(String s)", MkExtDeclString, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExtDeclAttrib", "ExtDecl MkExtDeclAttrib(Attrib attr)", MkExtDeclAttrib, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorIdentifier", "Declarator MkDeclaratorIdentifier(Identifier id)", MkDeclaratorIdentifier, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorFunction", "Declarator MkDeclaratorFunction(Declarator declarator, ecere::sys::OldList parameters)", MkDeclaratorFunction, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorExtended", "Declarator MkDeclaratorExtended(char * extended, Declarator declarator)", MkDeclaratorExtended, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorExtendedEnd", "Declarator MkDeclaratorExtendedEnd(char * extended, Declarator declarator)", MkDeclaratorExtendedEnd, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorExtended", "Declarator MkDeclaratorExtended(ExtDecl extended, Declarator declarator)", MkDeclaratorExtended, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorExtendedEnd", "Declarator MkDeclaratorExtendedEnd(ExtDecl extended, Declarator declarator)", MkDeclaratorExtendedEnd, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkStructDeclarator", "Declarator MkStructDeclarator(Declarator declarator, Expression exp)", MkStructDeclarator, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorBrackets", "Declarator MkDeclaratorBrackets(Declarator declarator)", MkDeclaratorBrackets, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclaratorArray", "Declarator MkDeclaratorArray(Declarator declarator, Expression exp)", MkDeclaratorArray, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkInitializerList", "Initializer MkInitializerList(ecere::sys::OldList list)", MkInitializerList, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkInitDeclarator", "InitDeclarator MkInitDeclarator(Declarator declarator, Initializer initializer)", MkInitDeclarator, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkTypeName", "TypeName MkTypeName(ecere::sys::OldList qualifiers, Declarator declarator)", MkTypeName, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkTypeNameGuessDecl", "TypeName MkTypeNameGuessDecl(ecere::sys::OldList qualifiers, Declarator declarator)", MkTypeNameGuessDecl, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetDeclId", "Identifier GetDeclId(Declarator decl)", GetDeclId, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclarationClassInst", "Declaration MkDeclarationClassInst(Instantiation inst)", MkDeclarationClassInst, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkDeclarationInst", "Declaration MkDeclarationInst(Instantiation inst)", MkDeclarationInst, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkBreakStmt", "Statement MkBreakStmt(void)", MkBreakStmt, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkReturnStmt", "Statement MkReturnStmt(ecere::sys::OldList exp)", MkReturnStmt, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkFunction", "FunctionDefinition MkFunction(ecere::sys::OldList specifiers, Declarator declarator, ecere::sys::OldList declarationList)", MkFunction, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_MkFunction", "FunctionDefinition _MkFunction(ecere::sys::OldList specifiers, Declarator declarator, ecere::sys::OldList declarationList, bool errorOnOmit)", _MkFunction, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessFunctionBody", "void ProcessFunctionBody(FunctionDefinition func, Statement body)", ProcessFunctionBody, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExternalFunction", "External MkExternalFunction(FunctionDefinition function)", MkExternalFunction, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExternalImport", "External MkExternalImport(char * name, ecere::com::ImportType importType, ecere::com::AccessMode importAccess)", MkExternalImport, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExternalDeclaration", "External MkExternalDeclaration(Declaration declaration)", MkExternalDeclaration, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExternalNameSpace", "External MkExternalNameSpace(Identifier identifier)", MkExternalNameSpace, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetClassTemplateArgs", "void SetClassTemplateArgs(Specifier spec, ecere::sys::OldList templateArgs)", SetClassTemplateArgs, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_MkSpecifierName", "Specifier _MkSpecifierName(char * name, Symbol symbol, ecere::sys::OldList templateArgs)", _MkSpecifierName, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierName", "Specifier MkSpecifierName(char * name)", MkSpecifierName, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierNameArgs", "Specifier MkSpecifierNameArgs(char * name, ecere::sys::OldList * templateArgs)", MkSpecifierNameArgs, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_MkSpecifierName", "Specifier _MkSpecifierName(const char * name, Symbol symbol, ecere::sys::OldList templateArgs)", _MkSpecifierName, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierName", "Specifier MkSpecifierName(const char * name)", MkSpecifierName, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecifierNameArgs", "Specifier MkSpecifierNameArgs(const char * name, ecere::sys::OldList * templateArgs)", MkSpecifierNameArgs, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassFunction", "ClassFunction MkClassFunction(ecere::sys::OldList specifiers, Specifier _class, Declarator decl, ecere::sys::OldList declList)", MkClassFunction, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessClassFunctionBody", "void ProcessClassFunctionBody(ClassFunction func, Statement body)", ProcessClassFunctionBody, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkSpecsClass", "ecere::sys::OldList * MkSpecsClass(Specifier _class)", MkSpecsClass, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefMemberAccess", "ClassDef MkClassDefMemberAccess(void)", MkClassDefMemberAccess, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDeclaration", "ClassDef MkClassDefDeclaration(Declaration decl)", MkClassDefDeclaration, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefClassData", "ClassDef MkClassDefClassData(Declaration decl)", MkClassDefClassData, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDesigner", "ClassDef MkClassDefDesigner(char * designer)", MkClassDefDesigner, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDesigner", "ClassDef MkClassDefDesigner(const char * designer)", MkClassDefDesigner, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefNoExpansion", "ClassDef MkClassDefNoExpansion(void)", MkClassDefNoExpansion, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefFixed", "ClassDef MkClassDefFixed(void)", MkClassDefFixed, 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, char * className)", DeclClassAddNameSpace, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClass", "Symbol DeclClass(int symbolID, char * name)", DeclClass, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_DeclClass", "Symbol _DeclClass(int symbolID, char * name)", _DeclClass, 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("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("MkClassDefProperty", "ClassDef MkClassDefProperty(PropertyDef propertyDef)", MkClassDefProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefClassProperty", "ClassDef MkClassDefClassProperty(PropertyDef propertyDef)", MkClassDefClassProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefClassPropertyValue", "ClassDef MkClassDefClassPropertyValue(Identifier id, Initializer initializer)", MkClassDefClassPropertyValue, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("CheckType", "int CheckType(char * text)", CheckType, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("CheckType", "int CheckType(const char * text)", CheckType, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("check_type", "int check_type(void)", check_type, 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, char * name)", FindType, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindTemplateTypeParameter", "TemplatedType FindTemplateTypeParameter(Context ctx, char * name)", FindTemplateTypeParameter, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindType", "Symbol FindType(Context ctx, const char * name)", FindType, 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("FindClass", "Symbol FindClass(char * name)", FindClass, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("FindClass", "Symbol FindClass(const char * name)", FindClass, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("CopyTypeInto", "void CopyTypeInto(Type type, Type src)", CopyTypeInto, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessType", "Type ProcessType(ecere::sys::OldList specs, Declarator decl)", ProcessType, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessTypeString", "Type ProcessTypeString(char * string, bool staticMethod)", ProcessTypeString, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ProcessTypeString", "Type ProcessTypeString(const char * string, bool staticMethod)", ProcessTypeString, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassTypeSymbol", "Type MkClassTypeSymbol(Symbol symbol)", MkClassTypeSymbol, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassType", "Type MkClassType(char * name)", MkClassType, module, 1);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkAsmField", "AsmField MkAsmField(char * command, Expression expression)", MkAsmField, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassType", "Type MkClassType(const char * name)", MkClassType, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkAsmField", "AsmField MkAsmField(char * command, Expression expression, Identifier symbolic)", MkAsmField, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkAsmStmt", "Statement MkAsmStmt(Specifier spec, char * statements, ecere::sys::OldList inputFields, ecere::sys::OldList outputFields, ecere::sys::OldList clobberedFields)", MkAsmStmt, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefPropertyWatch", "ClassDef MkClassDefPropertyWatch(PropertyWatch watcher)", MkClassDefPropertyWatch, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkFireWatchersStmt", "Statement MkFireWatchersStmt(Expression object, ecere::sys::OldList watches)", MkFireWatchersStmt, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpDBIndex", "Expression MkExpDBIndex(char * table, Identifier id)", MkExpDBIndex, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpDBTable", "Expression MkExpDBTable(char * table)", MkExpDBTable, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpArray", "Expression MkExpArray(ecere::sys::OldList * expressions)", MkExpArray, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetTemplateArgExpByName", "Expression GetTemplateArgExpByName(char * paramName, ecere::com::Class curClass, ecere::com::TemplateParameterType tplType)", GetTemplateArgExpByName, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetTemplateArgExpByName", "Expression GetTemplateArgExpByName(const char * paramName, ecere::com::Class curClass, ecere::com::TemplateParameterType tplType)", GetTemplateArgExpByName, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetTemplateArgExp", "Expression GetTemplateArgExp(TemplateParameter param, ecere::com::Class curClass, bool pointer)", GetTemplateArgExp, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("OutputIntlStrings", "void OutputIntlStrings(void)", OutputIntlStrings, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetAST", "void SetAST(ecere::sys::OldList * list)", SetAST, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetAST", "ecere::sys::OldList * GetAST(void)", GetAST, module, 1);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ParseEc", "void ParseEc(void)", ParseEc, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("LexEc", "int LexEc(void)", LexEc, module, 1);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("GetYYText", "const char * GetYYText(void)", GetYYText, module, 1);
}
void __ecereUnregisterModule_ast(struct __ecereNameSpace__ecere__com__Instance * module)