From 4c10cbf4fa2a5e7c1de6ee6dc5eb95ac0d06102f Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Sun, 8 Jun 2014 23:57:15 -0400 Subject: [PATCH] compiler/libec; ecere: Fixed 64 bit enums and related warnings - Fixed misdirected strto* functions --- compiler/bootstrap/ecc/bootstrap/ecc.c | 66 +- compiler/bootstrap/ecere/bootstrap/AVLTree.c | 4 +- compiler/bootstrap/ecere/bootstrap/Array.c | 2 +- compiler/bootstrap/ecere/bootstrap/BTNode.c | 36 +- compiler/bootstrap/ecere/bootstrap/BinaryTree.c | 6 +- compiler/bootstrap/ecere/bootstrap/BufferedFile.c | 20 +- .../bootstrap/ecere/bootstrap/BuiltInContainer.c | 6 +- compiler/bootstrap/ecere/bootstrap/Container.c | 6 +- compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c | 12 +- compiler/bootstrap/ecere/bootstrap/File.c | 58 +- compiler/bootstrap/ecere/bootstrap/LinkList.c | 4 +- compiler/bootstrap/ecere/bootstrap/List.c | 2 +- compiler/bootstrap/ecere/bootstrap/Map.c | 10 +- compiler/bootstrap/ecere/bootstrap/String.c | 118 +- compiler/bootstrap/ecere/bootstrap/System.c | 10 +- compiler/bootstrap/ecere/bootstrap/TempFile.c | 22 +- compiler/bootstrap/ecere/bootstrap/dataTypes.c | 206 ++- compiler/bootstrap/ecere/bootstrap/ecere.main.c | 7 +- compiler/bootstrap/ecere/bootstrap/i18n.c | 14 +- compiler/bootstrap/ecere/bootstrap/instance.c | 203 +-- compiler/bootstrap/ecp/bootstrap/ecp.c | 145 +- compiler/bootstrap/ecp/bootstrap/ecp.main.c | 4 +- compiler/bootstrap/ecs/bootstrap/ecs.c | 174 +- compiler/bootstrap/libec/bootstrap/ast.c | 200 +-- compiler/bootstrap/libec/bootstrap/dbpass.c | 20 +- compiler/bootstrap/libec/bootstrap/ec.main.c | 8 +- compiler/bootstrap/libec/bootstrap/ecdefs.c | 36 +- compiler/bootstrap/libec/bootstrap/expression.c | 8 +- compiler/bootstrap/libec/bootstrap/firstPass.c | 22 +- compiler/bootstrap/libec/bootstrap/freeAst.c | 24 +- compiler/bootstrap/libec/bootstrap/grammar.c | 62 +- compiler/bootstrap/libec/bootstrap/lexer.c | 2 +- compiler/bootstrap/libec/bootstrap/loadSymbols.c | 116 +- compiler/bootstrap/libec/bootstrap/output.c | 56 +- compiler/bootstrap/libec/bootstrap/pass0.c | 86 +- compiler/bootstrap/libec/bootstrap/pass1.c | 160 +- compiler/bootstrap/libec/bootstrap/pass15.c | 1849 ++++++++++---------- compiler/bootstrap/libec/bootstrap/pass16.c | 220 +-- compiler/bootstrap/libec/bootstrap/pass2.c | 264 +-- compiler/bootstrap/libec/bootstrap/pass3.c | 42 +- compiler/bootstrap/libec/bootstrap/shortcuts.c | 8 +- compiler/bootstrap/libec/bootstrap/type.c | 12 +- compiler/ecp/ecp.ec | 29 +- compiler/libec/precompiled/expression.c | 8 +- compiler/libec/precompiled/grammar.c | 62 +- compiler/libec/precompiled/type.c | 12 +- compiler/libec/src/ast.ec | 12 +- compiler/libec/src/freeAst.ec | 2 +- compiler/libec/src/loadSymbols.ec | 2 +- compiler/libec/src/pass1.ec | 42 +- compiler/libec/src/pass15.ec | 96 +- ecere/src/com/dataTypes.ec | 58 +- ecere/src/com/instance.ec | 25 +- ecere/src/gfx/Color.ec | 4 +- ecere/src/gui/typeEdit.ec | 6 +- ide/src/debugger/Debugger.ec | 15 +- ide/src/designer/CodeEditor.ec | 43 +- 57 files changed, 2484 insertions(+), 2262 deletions(-) diff --git a/compiler/bootstrap/ecc/bootstrap/ecc.c b/compiler/bootstrap/ecc/bootstrap/ecc.c index 351af29..7c0ea3d 100644 --- a/compiler/bootstrap/ecc/bootstrap/ecc.c +++ b/compiler/bootstrap/ecc/bootstrap/ecc.c @@ -887,9 +887,9 @@ char * cppCommand = (((void *)0)); char * cppOptions = (((void *)0)); int cppOptionsLen = 0; int c; -unsigned int valid = 0x1; +unsigned int valid = 1; char defaultOutputFile[797]; -unsigned int buildingBootStrap = 0x0; +unsigned int buildingBootStrap = 0; int targetPlatform = __ecereNameSpace__ecere__com__GetRuntimePlatform(); int targetBits = GetHostBits(); @@ -927,11 +927,11 @@ cppOptionsLen = cppOptionsLen + 1 + strlen(buf); if(arg[1] == 'D') { if(!strcmp(arg, "-DBUILDING_ECERE_COM")) -SetBuildingEcereCom(0x1); +SetBuildingEcereCom(1); else if(!strcmp(arg, "-DECERE_COM_MODULE")) -SetBuildingEcereComModule(0x1); +SetBuildingEcereComModule(1); else if(!strcmp(arg, "-DECERE_BOOTSTRAP")) -buildingBootStrap = 0x1; +buildingBootStrap = 1; } } else if(!strcmp(arg + 1, "t")) @@ -939,14 +939,14 @@ else if(!strcmp(arg + 1, "t")) if(++c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc) targetPlatform = __ecereProp___ecereNameSpace__ecere__com__Platform_Set_char__PTR_(((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argv[c]); else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "cpp")) { if(++c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc) cppCommand = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argv[c]); else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "o")) { @@ -956,7 +956,7 @@ SetOutputFile(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "c")) { @@ -966,7 +966,7 @@ SetSourceFile(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "isystem") || !strcmp(arg + 1, "isysroot")) { @@ -985,7 +985,7 @@ buf = PassArg(buf, arg1); cppOptionsLen = buf - cppOptions; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "fno-diagnostics-show-caret")) { @@ -1006,7 +1006,7 @@ SetSymbolsDir(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "module")) { @@ -1016,11 +1016,11 @@ SetI18nModuleName(((struct __ecereNameSpace__ecere__com__Application *)(((char * c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "memguard")) { -SetMemoryGuard(0x1); +SetMemoryGuard(1); } else if(!strcmp(arg + 1, "defaultns")) { @@ -1030,26 +1030,26 @@ SetDefaultNameSpace(((struct __ecereNameSpace__ecere__com__Application *)(((char c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "strictns")) { -SetStrictNameSpaces(0x1); +SetStrictNameSpaces(1); } else if(!strcmp(arg + 1, "nolinenumbers")) { -SetOutputLineNumbers(0x0); +SetOutputLineNumbers(0); } } else -valid = 0x0; +valid = 0; } if(valid) { if(!cppCommand) cppCommand = __ecereNameSpace__ecere__sys__CopyString("gcc"); if(!GetSourceFile()) -valid = 0x0; +valid = 0; else if(!GetOutputFile()) { strcpy(defaultOutputFile, ""); @@ -1074,58 +1074,58 @@ SetCurrentContext(globalContext); SetTopContext(globalContext); SetDefines(&defines); SetImports(&imports); -SetInCompiler(0x1); +SetInCompiler(1); SetTargetPlatform(targetPlatform); SetTargetBits(targetBits); -SetEchoOn(0x0); -privateModule = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com____ecere_COM_Initialize((unsigned int)(0x1 | (targetBits == sizeof(uintptr_t) * 8 ? (unsigned int)0 : targetBits == 64 ? 2 : targetBits == 32 ? 4 : (unsigned int)0) | 8), 1, (((void *)0))); +SetEchoOn(0); +privateModule = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com____ecere_COM_Initialize((unsigned int)(1 | (targetBits == sizeof(uintptr_t) * 8 ? (unsigned int)0 : targetBits == 64 ? 2 : targetBits == 32 ? 4 : (unsigned int)0) | 8), 1, (((void *)0))); SetPrivateModule(privateModule); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint64"), __ecereInstance1->type = ProcessTypeString("unsigned int64", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint64"), __ecereInstance1->type = ProcessTypeString("unsigned int64", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint32"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint32"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint16"), __ecereInstance1->type = ProcessTypeString("unsigned short", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint16"), __ecereInstance1->type = ProcessTypeString("unsigned short", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("byte"), __ecereInstance1->type = ProcessTypeString("unsigned char", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("byte"), __ecereInstance1->type = ProcessTypeString("unsigned char", 0), __ecereInstance1; })); if(buildingBootStrap) { __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("intptr_t"), __ecereInstance1->type = ProcessTypeString("intptr", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("intptr_t"), __ecereInstance1->type = ProcessTypeString("intptr", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"), __ecereInstance1->type = ProcessTypeString("uintptr", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"), __ecereInstance1->type = ProcessTypeString("uintptr", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("ssize_t"), __ecereInstance1->type = ProcessTypeString("intsize", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("ssize_t"), __ecereInstance1->type = ProcessTypeString("intsize", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("size_t"), __ecereInstance1->type = ProcessTypeString("uintsize", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("size_t"), __ecereInstance1->type = ProcessTypeString("uintsize", 0), __ecereInstance1; })); } { @@ -1136,7 +1136,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalData.functions } snprintf(command, sizeof (command), "%s%s -x c -E %s\"%s\"", cppCommand, cppOptions ? cppOptions : "", buildingBootStrap ? "" : "-include stdint.h -include sys/types.h ", GetSourceFile()); command[sizeof (command) - 1] = (char)0; -if((cppOutput = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(0x1))), command))) +if((cppOutput = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(1))), command))) { char impFile[797]; struct ImportedModule * module; @@ -1194,7 +1194,7 @@ strcpy(symFile, sourceFileName); __ecereNameSpace__ecere__sys__ChangeExtension(symFile, "sym", symFile); strcpy(symLocation, GetSymbolsDir()); __ecereNameSpace__ecere__sys__PathCat(symLocation, symFile); -LoadSymbols(symLocation, 3, 0x0); +LoadSymbols(symLocation, 3, 0); for(module = defines.first; module; module = next) { next = module->next; @@ -1209,7 +1209,7 @@ __ecereNameSpace__ecere__com__eModule_LoadStrict(privateModule, "ecereCOM", 1); } ParseEc(); CheckDataRedefinitions(); -SetYydebug(0x0); +SetYydebug(0); SetCurrentNameSpace((((void *)0))); SetDefaultNameSpace((((void *)0))); SetDeclMode(2); diff --git a/compiler/bootstrap/ecere/bootstrap/AVLTree.c b/compiler/bootstrap/ecere/bootstrap/AVLTree.c index c046c10..9ad955b 100644 --- a/compiler/bootstrap/ecere/bootstrap/AVLTree.c +++ b/compiler/bootstrap/ecere/bootstrap/AVLTree.c @@ -332,9 +332,9 @@ memcpy((void *)(((unsigned char *)&node->key) + __ENDIAN_PAD(sizeof(void *))), ( else node->key = value; ((struct __ecereNameSpace__ecere__com__IteratorPointer * (*)(struct __ecereNameSpace__ecere__com__Instance *, uint64 value))__ecereClass___ecereNameSpace__ecere__com__AVLTree->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Add])(this, (uint64)node); -return 0x1; +return 1; } -return 0x0; +return 0; } extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__CustomAVLTree; diff --git a/compiler/bootstrap/ecere/bootstrap/Array.c b/compiler/bootstrap/ecere/bootstrap/Array.c index 9bcdbf5..9454e93 100644 --- a/compiler/bootstrap/ecere/bootstrap/Array.c +++ b/compiler/bootstrap/ecere/bootstrap/Array.c @@ -355,7 +355,7 @@ struct __ecereNameSpace__ecere__com__Array * __ecerePointer___ecereNameSpace__ec uint64 * item = (uint64 *)ip; (memcpy(item, (((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[0].__anon1.__anon1.dataTypeClass->type == 1) ? (char *)(uintptr_t)(((uint64)(value))) : ((char *)&value + __ENDIAN_PAD(((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[0].__anon1.__anon1.dataTypeClass->typeSize)), ((struct __ecereNameSpace__ecere__com__Instance * )(char * )this)->_class->templateArgs[0].__anon1.__anon1.dataTypeClass->typeSize)); -return 0x1; +return 1; } struct __ecereNameSpace__ecere__com__IteratorPointer * __ecereMethod___ecereNameSpace__ecere__com__Array_GetAtPosition(struct __ecereNameSpace__ecere__com__Instance * this, const uint64 pos, unsigned int create) diff --git a/compiler/bootstrap/ecere/bootstrap/BTNode.c b/compiler/bootstrap/ecere/bootstrap/BTNode.c index dd22cf9..599c310 100644 --- a/compiler/bootstrap/ecere/bootstrap/BTNode.c +++ b/compiler/bootstrap/ecere/bootstrap/BTNode.c @@ -328,7 +328,7 @@ void __ecereMethod___ecereNameSpace__ecere__sys__BTNode_OnSerialize(struct __ece if((struct __ecereNameSpace__ecere__sys__BTNode *)this) { unsigned int __internalValue000; -unsigned int truth = 0x1; +unsigned int truth = 1; __ecereMethod___ecereNameSpace__ecere__com__IOChannel_Serialize(channel, __ecereClass_bool, &truth); __ecereMethod___ecereNameSpace__ecere__com__IOChannel_Serialize(channel, __ecereClass_uint, __extension__ ({ @@ -466,13 +466,13 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Add(struct __ece { uintptr_t newKey = node->key; -while(0x1) +while(1) { int result = tree->CompareKey(tree, newKey, this->key); if(!result) { -return 0x0; +return 0; } else if(result > 0) { @@ -496,7 +496,7 @@ break; n->depth = newDepth; } } -return 0x1; +return 1; } } else @@ -521,7 +521,7 @@ break; n->depth = newDepth; } } -return 0x1; +return 1; } } } @@ -530,12 +530,12 @@ return 0x1; unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BTNode_FindNode(struct __ecereNameSpace__ecere__sys__BTNode * this, struct __ecereNameSpace__ecere__sys__BTNode * node) { if(this == node) -return 0x1; +return 1; else if(this->left && __ecereMethod___ecereNameSpace__ecere__sys__BTNode_FindNode(this->left, node)) -return 0x1; +return 1; else if(this->right && __ecereMethod___ecereNameSpace__ecere__sys__BTNode_FindNode(this->right, node)) -return 0x1; -return 0x0; +return 1; +return 0; } struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Find(struct __ecereNameSpace__ecere__sys__BTNode * this, struct __ecereNameSpace__ecere__sys__BinaryTree * tree, uintptr_t key) @@ -792,7 +792,7 @@ void __ecereMethod___ecereNameSpace__ecere__sys__BTNode_SingleRotateLeft(); struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Rebalance(struct __ecereNameSpace__ecere__sys__BTNode * this) { -while(0x1) +while(1) { int factor = __ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_balanceFactor(this); @@ -934,7 +934,7 @@ int c; for(c = 0; c < ((1 << (maxDepth - curDepth)) - 1) * 4 / 2; c++) strcat(output, " "); -__ecereMethod___ecereNameSpace__ecere__sys__BTNode_PrintDepth(this, output, curDepth, 0, maxDepth, 0x1); +__ecereMethod___ecereNameSpace__ecere__sys__BTNode_PrintDepth(this, output, curDepth, 0, maxDepth, 1); strcat(output, "\n"); } return output; @@ -980,7 +980,7 @@ extern int printf(const char * , ...); unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Check(struct __ecereNameSpace__ecere__sys__BTNode * this, struct __ecereNameSpace__ecere__sys__BinaryTree * tree) { -unsigned int valid = 0x1; +unsigned int valid = 1; int leftHeight = this->left ? __ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_depthProp(this->left) + 1 : 0; int rightHeight = this->right ? __ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_depthProp(this->right) + 1 : 0; int diffHeight = rightHeight - leftHeight; @@ -990,7 +990,7 @@ if(this->left) if(this->left->parent != this) { printf("Parent not set properly at node %d\n", (int)this->left->key); -valid = 0x0; +valid = 0; } valid *= __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Check(this->left, tree); } @@ -999,7 +999,7 @@ if(this->right) if(this->right->parent != this) { printf("Parent not set properly at node %d\n", (int)this->right->key); -valid = 0x0; +valid = 0; } valid *= __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Check(this->right, tree); } @@ -1020,12 +1020,12 @@ printf("Height difference %d doesnt match balance-factor of %d at node %d\n", di } if(this->left && tree->CompareKey(tree, this->left->key, this->key) > 0) { -valid = 0x0; +valid = 0; printf("Node %d is *smaller* than left subtree %d\n", (int)this->key, (int)this->left->key); } if(this->right && tree->CompareKey(tree, this->right->key, this->key) < 0) { -valid = 0x0; +valid = 0; printf("Node %d is *greater* than right subtree %d\n", (int)this->key, (int)this->right->key); } return valid; @@ -1046,7 +1046,7 @@ void __ecereMethod___ecereNameSpace__ecere__sys__StringBTNode_OnSerialize(struct { if((struct __ecereNameSpace__ecere__sys__StringBTNode *)this) { -unsigned int truth = 0x1; +unsigned int truth = 1; __ecereMethod___ecereNameSpace__ecere__com__IOChannel_Serialize(channel, __ecereClass_bool, &truth); __ecereMethod___ecereNameSpace__ecere__com__IOChannel_Serialize(channel, __ecereClass_String, this->key); @@ -1126,7 +1126,7 @@ struct __ecereNameSpace__ecere__com__NameSpace publicNameSpace; extern struct __ecereNameSpace__ecere__com__Instance * __thisModule; -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__GlobalFunction; diff --git a/compiler/bootstrap/ecere/bootstrap/BinaryTree.c b/compiler/bootstrap/ecere/bootstrap/BinaryTree.c index 95731a8..aee8b50 100644 --- a/compiler/bootstrap/ecere/bootstrap/BinaryTree.c +++ b/compiler/bootstrap/ecere/bootstrap/BinaryTree.c @@ -359,9 +359,9 @@ this->root = node; else if(__ecereMethod___ecereNameSpace__ecere__sys__BTNode_Add(this->root, this, node)) this->root = __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Rebalance(node); else -return 0x0; +return 0; this->count++; -return 0x1; +return 1; } struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Find(struct __ecereNameSpace__ecere__sys__BTNode * this, struct __ecereNameSpace__ecere__sys__BinaryTree * tree, uintptr_t key); @@ -430,7 +430,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Check(struct __e unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Check(struct __ecereNameSpace__ecere__sys__BinaryTree * this) { -return this->root ? __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Check(this->root, this) : 0x1; +return this->root ? __ecereMethod___ecereNameSpace__ecere__sys__BTNode_Check(this->root, this) : 1; } struct __ecereNameSpace__ecere__sys__BTNode * __ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_minimum(struct __ecereNameSpace__ecere__sys__BTNode * this); diff --git a/compiler/bootstrap/ecere/bootstrap/BufferedFile.c b/compiler/bootstrap/ecere/bootstrap/BufferedFile.c index f295f2a..3d2473c 100644 --- a/compiler/bootstrap/ecere/bootstrap/BufferedFile.c +++ b/compiler/bootstrap/ecere/bootstrap/BufferedFile.c @@ -324,7 +324,7 @@ struct __ecereNameSpace__ecere__sys__BufferedFile * __ecerePointer___ecereNameSp __ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Set_bufferSize(this, 512 * 1024); __ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Set_bufferRead(this, 1 * 1024); -return 0x1; +return 1; } extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpace__ecere__com__Instance * instance); @@ -386,7 +386,7 @@ unsigned char * fileBuffer = __ecerePointer___ecereNameSpace__ecere__sys__Buffer unsigned int readCount = count; readCount *= size; -while(0x1) +while(1) { unsigned int bytesRead = (bufferCount > bufferPos) ? (bufferCount - bufferPos) : 0; @@ -444,7 +444,7 @@ fileBuffer = __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->buffer + bufferCount += read; if(!read) { -__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->eof = 0x1; +__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->eof = 1; break; } } @@ -519,14 +519,14 @@ struct __ecereNameSpace__ecere__sys__BufferedFile * __ecerePointer___ecereNameSp if(__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->handle) { -while(0x1) +while(1) { if(__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferCount > __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferPos) { *ch = *(__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->buffer + __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferPos); __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferPos++; __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->pos++; -return 0x1; +return 1; } else { @@ -543,13 +543,13 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Read])(__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->handle, __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->buffer, 1, __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferSize); if(!__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferCount) { -__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->eof = 0x1; +__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->eof = 1; break; } } } } -return 0x0; +return 0; } unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BufferedFile_Putc(struct __ecereNameSpace__ecere__com__Instance * this, char ch) @@ -646,7 +646,7 @@ __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferPos = 0; __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->eof = newPosition > __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->fileSize; __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->pos = newPosition; } -return 0x1; +return 1; } unsigned int __ecereMethod___ecereNameSpace__ecere__sys__BufferedFile_Tell(struct __ecereNameSpace__ecere__com__Instance * this) @@ -686,7 +686,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Truncate])(__ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->handle, size); __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferCount = (__simpleStruct0 = __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->bufferCount, (__simpleStruct0 < bytesAhead) ? __simpleStruct0 : bytesAhead); __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->fileSize = (__simpleStruct1 = __ecerePointer___ecereNameSpace__ecere__sys__BufferedFile->fileSize, (__simpleStruct1 < size) ? __simpleStruct1 : size); -return 0x1; +return 1; } int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Lock; @@ -800,7 +800,7 @@ __ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Set_handle(__ecTemp1, __e __ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Get_handle(__ecTemp1); }))) { -__ecereProp___ecereNameSpace__ecere__sys__File_Set_buffered(__ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Get_handle(f), 0x1); +__ecereProp___ecereNameSpace__ecere__sys__File_Set_buffered(__ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Get_handle(f), 1); ((struct __ecereNameSpace__ecere__sys__BufferedFile *)(((char *)f + structSize_File)))->fileSize = ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = __ecereProp___ecereNameSpace__ecere__sys__BufferedFile_Get_handle(f); diff --git a/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c b/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c index da2cb6c..35a6c38 100644 --- a/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c +++ b/compiler/bootstrap/ecere/bootstrap/BuiltInContainer.c @@ -343,7 +343,7 @@ return ((((this->type->type == 1) ? ((uint64)item) : ((this->type->typeSize == 1 unsigned int __ecereMethod___ecereNameSpace__ecere__com__BuiltInContainer_SetData(struct __ecereNameSpace__ecere__com__BuiltInContainer * this, struct __ecereNameSpace__ecere__com__IteratorPointer * pointer, uint64 data) { -return 0x0; +return 0; } struct __ecereNameSpace__ecere__com__IteratorPointer * __ecereMethod___ecereNameSpace__ecere__com__BuiltInContainer_GetAtPosition(struct __ecereNameSpace__ecere__com__BuiltInContainer * this, const uint64 pos, unsigned int create) @@ -430,7 +430,7 @@ if(this) { struct __ecereNameSpace__ecere__com__Class * Dclass = this->type; char itemString[4096]; -unsigned int first = 0x1; +unsigned int first = 1; unsigned char * data = this->data; int i; @@ -444,7 +444,7 @@ result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(voi if(!first) strcat(tempString, ", "); strcat(tempString, result); -first = 0x0; +first = 0; data += Dclass->typeSize; } } diff --git a/compiler/bootstrap/ecere/bootstrap/Container.c b/compiler/bootstrap/ecere/bootstrap/Container.c index d72a2a5..6190d61 100644 --- a/compiler/bootstrap/ecere/bootstrap/Container.c +++ b/compiler/bootstrap/ecere/bootstrap/Container.c @@ -475,7 +475,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this->container, index, create); return this->pointer != (((void *)0)); } -return 0x0; +return 0; } int __ecereVMethodID___ecereNameSpace__ecere__com__Container_RemoveAll; @@ -771,7 +771,7 @@ const char * __ecereMethod___ecereNameSpace__ecere__com__Container_OnGetString(s if((struct __ecereNameSpace__ecere__com__Instance *)this) { char itemString[4096]; -unsigned int first = 0x1; +unsigned int first = 1; struct __ecereNameSpace__ecere__com__IteratorPointer * i; tempString[0] = '\0'; @@ -798,7 +798,7 @@ result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(voi if(!first) strcat(tempString, ", "); strcat(tempString, result); -first = 0x0; +first = 0; } } else diff --git a/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c b/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c index fb9273c..0760a94 100644 --- a/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c +++ b/compiler/bootstrap/ecere/bootstrap/CustomAVLTree.c @@ -397,7 +397,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__com__AVLNode_Add(struct __ec { if(!Tclass) Tclass = __ecereClass_uint64; -while(0x1) +while(1) { int result; unsigned char * a, * b; @@ -417,7 +417,7 @@ b = (unsigned char *)*(uint64 *)(&this->key); result = ((int (*)(void *, void *, void *))(void *)Tclass->_vTbl[__ecereVMethodID_class_OnCompare])(Tclass, a, b); if(!result) { -return 0x0; +return 0; } else if(result > 0) { @@ -441,7 +441,7 @@ break; n->depth = newDepth; } } -return 0x1; +return 1; } } else @@ -466,7 +466,7 @@ break; n->depth = newDepth; } } -return 0x1; +return 1; } } } @@ -676,7 +676,7 @@ void __ecereMethod___ecereNameSpace__ecere__com__AVLNode_SingleRotateLeft(); struct __ecereNameSpace__ecere__com__AVLNode * __ecereMethod___ecereNameSpace__ecere__com__AVLNode_Rebalance(struct __ecereNameSpace__ecere__com__AVLNode * this) { -while(0x1) +while(1) { int factor = __ecereProp___ecereNameSpace__ecere__com__AVLNode_Get_balanceFactor(this); @@ -830,7 +830,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__com__CustomAVLTree_SetData(s { struct __ecereNameSpace__ecere__com__CustomAVLTree * __ecerePointer___ecereNameSpace__ecere__com__CustomAVLTree = (struct __ecereNameSpace__ecere__com__CustomAVLTree *)(this ? (((char *)this) + structSize_Instance) : 0); -return 0x0; +return 0; } extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, const char * name); diff --git a/compiler/bootstrap/ecere/bootstrap/File.c b/compiler/bootstrap/ecere/bootstrap/File.c index e117d53..4a8191b 100644 --- a/compiler/bootstrap/ecere/bootstrap/File.c +++ b/compiler/bootstrap/ecere/bootstrap/File.c @@ -408,7 +408,7 @@ multiplier = (unsigned int)1024 * 1024; else if(strstr(end, "KB") || strstr(end, "kb")) multiplier = 1024; (*this) = (unsigned int)((double)multiplier * value); -return 0x1; +return 1; } static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__FileSize64; @@ -452,7 +452,7 @@ multiplier = (uint64)1024 * 1024; else if(strstr(end, "KB") || strstr(end, "kb")) multiplier = 1024; (*this) = (uint64)((double)multiplier * value); -return 0x1; +return 1; } static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__FileSystem; @@ -553,7 +553,7 @@ struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ece if(!string[0]) { (*this) = (((void *)0)); -return 0x1; +return 1; } else { @@ -582,10 +582,10 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : class->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write])((*this), buffer, 1, read); } (__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0); -return 0x1; +return 1; } } -return 0x0; +return 0; } int __ecereVMethodID___ecereNameSpace__ecere__sys__File_GetSize; @@ -656,16 +656,16 @@ if(ich != (-1)) { if(ch) *ch = (char)ich; -return 0x1; +return 1; } -return 0x0; +return 0; } unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Putc(struct __ecereNameSpace__ecere__com__Instance * this, char ch) { struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); -return (fputc((int)ch, __ecerePointer___ecereNameSpace__ecere__sys__File->output) == (-1)) ? 0x0 : 0x1; +return (fputc((int)ch, __ecerePointer___ecereNameSpace__ecere__sys__File->output) == (-1)) ? 0 : 1; } extern int fputs(const char * , void * stream); @@ -673,11 +673,11 @@ extern int fputs(const char * , void * stream); unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Puts(struct __ecereNameSpace__ecere__com__Instance * this, const char * string) { struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); -unsigned int result = 0x0; +unsigned int result = 0; if(__ecerePointer___ecereNameSpace__ecere__sys__File->output) { -result = (fputs(string, __ecerePointer___ecereNameSpace__ecere__sys__File->output) == (-1)) ? 0x0 : 0x1; +result = (fputs(string, __ecerePointer___ecereNameSpace__ecere__sys__File->output) == (-1)) ? 0 : 1; } return result; } @@ -686,7 +686,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Eof(struct __ecere { struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); -return __ecerePointer___ecereNameSpace__ecere__sys__File->input ? feof(__ecerePointer___ecereNameSpace__ecere__sys__File->input) != 0 : 0x1; +return __ecerePointer___ecereNameSpace__ecere__sys__File->input ? feof(__ecerePointer___ecereNameSpace__ecere__sys__File->input) != 0 : 1; } unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Truncate(struct __ecereNameSpace__ecere__com__Instance * this, unsigned int size) @@ -694,7 +694,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Truncate(struct __ struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); fprintf((bsl_stderr()), "WARNING: File::Truncate unimplemented in ecereBootstrap.\n"); -return 0x0; +return 0; } unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_GetSize(struct __ecereNameSpace__ecere__com__Instance * this) @@ -824,7 +824,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Flush(struct __ece struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); fflush(__ecerePointer___ecereNameSpace__ecere__sys__File->output); -return 0x1; +return 1; } int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Getc; @@ -833,7 +833,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_GetLine(struct __e { struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); int c = 0; -unsigned int result = 0x1; +unsigned int result = 1; s[c] = (char)0; if(((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({ @@ -842,7 +842,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Eof])(this)) { -result = 0x0; +result = 0; } else { @@ -856,7 +856,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Getc])(this, &ch)) { -result = 0x0; +result = 0; break; } if(ch == '\n') @@ -874,18 +874,18 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_GetString(struct _ struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); int c; char ch; -unsigned int quoted = 0x0; -unsigned int result = 0x1; +unsigned int quoted = 0; +unsigned int result = 1; *string = (char)0; -while(0x1) +while(1) { if(!((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, char * ch))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Getc])(this, &ch)) -result = 0x0; +result = 0; if((ch != '\n') && (ch != '\r') && (ch != ' ') && (ch != ',') && (ch != '\t')) break; if(((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({ @@ -901,7 +901,7 @@ for(c = 0; c < max - 1; c++) { if(!quoted && ((ch == '\n') || (ch == '\r') || (ch == ' ') || (ch == ',') || (ch == '\t'))) { -result = 0x1; +result = 1; break; } if(ch == '\"') @@ -918,7 +918,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Getc])(this, &ch)) { c++; -result = 0x0; +result = 0; break; } } @@ -1057,14 +1057,14 @@ int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek; unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_CopyTo(struct __ecereNameSpace__ecere__com__Instance * this, const char * outputFileName) { struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ecere__sys__File = (struct __ecereNameSpace__ecere__sys__File *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__File->offset) : 0); -unsigned int result = 0x0; +unsigned int result = 0; struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__sys__FileOpen(outputFileName, 2); if(f) { unsigned char buffer[65536]; -result = 0x1; +result = 1; ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; @@ -1088,7 +1088,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write])(f, buffer, 1, count)) { -result = 0x0; +result = 0; break; } } @@ -1128,7 +1128,7 @@ unsigned int __ecereConstructor___ecereNameSpace__ecere__sys__ConsoleFile(struct { __ecereProp___ecereNameSpace__ecere__sys__File_Set_input(this, eC_stdin()); __ecereProp___ecereNameSpace__ecere__sys__File_Set_output(this, eC_stdout()); -return 0x1; +return 1; } void __ecereDestructor___ecereNameSpace__ecere__sys__ConsoleFile(struct __ecereNameSpace__ecere__com__Instance * this) @@ -1216,7 +1216,7 @@ FILE_FileFixCase(file); unsigned int __ecereNameSpace__ecere__sys__FileGetSize(const char * fileName, unsigned int * size) { -unsigned int result = 0x0; +unsigned int result = 0; if(size) { @@ -1231,7 +1231,7 @@ return result; unsigned int __ecereNameSpace__ecere__sys__FileGetStats(const char * fileName, struct __ecereNameSpace__ecere__sys__FileStats * stats) { -unsigned int result = 0x0; +unsigned int result = 0; if(stats && fileName) { @@ -1372,7 +1372,7 @@ extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__co extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_AddVirtualMethod(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, void * function, int declMode); -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); extern struct __ecereNameSpace__ecere__com__Property * __ecereNameSpace__ecere__com__eClass_AddProperty(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * dataType, void * setStmt, void * getStmt, int declMode); diff --git a/compiler/bootstrap/ecere/bootstrap/LinkList.c b/compiler/bootstrap/ecere/bootstrap/LinkList.c index edecdff..43a60d8 100644 --- a/compiler/bootstrap/ecere/bootstrap/LinkList.c +++ b/compiler/bootstrap/ecere/bootstrap/LinkList.c @@ -367,7 +367,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__com__LinkList_SetData(struct { struct __ecereNameSpace__ecere__com__LinkList * __ecerePointer___ecereNameSpace__ecere__com__LinkList = (struct __ecereNameSpace__ecere__com__LinkList *)(this ? (((char *)this) + structSize_Instance) : 0); -return 0x0; +return 0; } struct __ecereNameSpace__ecere__com__IteratorPointer * __ecereMethod___ecereNameSpace__ecere__com__LinkList_Add(struct __ecereNameSpace__ecere__com__Instance * this, uint64 item) @@ -620,7 +620,7 @@ struct __ecereNameSpace__ecere__com__ClassTemplateArgument __simpleStruct1 = .__anon1 = { .dataTypeString = 0 -}, .expression = (__simpleStruct2.__anon1.ui64 = 0LL, __simpleStruct2) +}, .expression = (__simpleStruct2.__anon1.ui64 = 0, __simpleStruct2) } }; struct __ecereNameSpace__ecere__com__ClassTemplateArgument __simpleStruct0 = diff --git a/compiler/bootstrap/ecere/bootstrap/List.c b/compiler/bootstrap/ecere/bootstrap/List.c index 1165b99..09d6152 100644 --- a/compiler/bootstrap/ecere/bootstrap/List.c +++ b/compiler/bootstrap/ecere/bootstrap/List.c @@ -327,7 +327,7 @@ if(((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->temp memcpy((void *)&link->data, (void *)value, ((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[6].__anon1.__anon1.dataTypeClass->structSize); else link->data = ((uint64)(value)); -return 0x1; +return 1; } extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__ListItem; diff --git a/compiler/bootstrap/ecere/bootstrap/Map.c b/compiler/bootstrap/ecere/bootstrap/Map.c index 7456899..1e2e855 100644 --- a/compiler/bootstrap/ecere/bootstrap/Map.c +++ b/compiler/bootstrap/ecere/bootstrap/Map.c @@ -478,7 +478,7 @@ if(((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->temp memcpy((void *)&node->value, (void *)value, ((struct __ecereNameSpace__ecere__com__Instance *)(char *)this)->_class->templateArgs[6].__anon1.__anon1.dataTypeClass->structSize); else __ecereProp___ecereNameSpace__ecere__com__MapNode_Set_value(node, value); -return 0x1; +return 1; } int __ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition; @@ -505,7 +505,7 @@ struct __ecereNameSpace__ecere__com__MapNode * realNode = (struct __ecereNameSpa struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl; -})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this, __ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(newNode), 0x1); +})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this, __ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(newNode), 1); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, struct __ecereNameSpace__ecere__com__IteratorPointer * pointer, uint64 data))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; @@ -676,7 +676,7 @@ struct __ecereNameSpace__ecere__com__MapNode * destNode = (struct __ecereNameSpa struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl; -})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this, __ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(srcNode), 0x1); +})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this, __ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(srcNode), 1); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, struct __ecereNameSpace__ecere__com__IteratorPointer * pointer, uint64 data))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; @@ -719,7 +719,7 @@ struct __ecereNameSpace__ecere__com__MapNode * destNode = (struct __ecereNameSpa struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl; -})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this, __ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(srcNode), 0x1); +})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(this, __ecereProp___ecereNameSpace__ecere__com__MapNode_Get_key(srcNode), 1); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, struct __ecereNameSpace__ecere__com__IteratorPointer * pointer, uint64 data))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = this; @@ -810,7 +810,7 @@ destNode = (struct __ecereNameSpace__ecere__com__MapNode *)((struct __ecereNameS struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = container; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__Map->_vTbl; -})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(container, key, 0x1); +})[__ecereVMethodID___ecereNameSpace__ecere__com__Container_GetAtPosition])(container, key, 1); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, struct __ecereNameSpace__ecere__com__IteratorPointer * pointer, uint64 data))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = container; diff --git a/compiler/bootstrap/ecere/bootstrap/String.c b/compiler/bootstrap/ecere/bootstrap/String.c index fb85de0..a008fe4 100644 --- a/compiler/bootstrap/ecere/bootstrap/String.c +++ b/compiler/bootstrap/ecere/bootstrap/String.c @@ -460,16 +460,16 @@ if(c > 0) strncpy(archiveName, fileName + 1, c - 1); archiveName[c - 1] = '\0'; *archiveFile = fileName + c + 1; -return 0x1; +return 1; } } else if(fileName[0] == ':') { strcpy(archiveName, ":"); *archiveFile = fileName + 1; -return 0x1; +return 1; } -return 0x0; +return 0; } extern char * strstr(const char * , const char * ); @@ -484,14 +484,14 @@ extern int sprintf(char * , const char * , ...); char * __ecereNameSpace__ecere__sys__PathCatSlash(char * string, const char * addedPath) { -unsigned int modified = 0x0; +unsigned int modified = 0; if(addedPath) { char fileName[797] = "", archiveName[797] = ""; const char * file = (((void *)0)); int c = 0; -unsigned int isURL = 0x0; +unsigned int isURL = 0; unsigned int isArchive = __ecereNameSpace__ecere__sys__SplitArchivePath(string, archiveName, &file); char * urlFileName; char * protocolSymbol; @@ -504,7 +504,7 @@ if(protocolSymbol) { char * slash = strstr(protocolSymbol + 3, "/"); -isURL = 0x1; +isURL = 1; if(slash) urlFileName = slash; else @@ -518,7 +518,7 @@ int len = protocolSymbol - addedPath + 3; memcpy(fileName, addedPath, len); fileName[len] = (char)0; -isURL = 0x1; +isURL = 1; c = len; } else if(__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) @@ -529,14 +529,14 @@ fileName[0] = (char)toupper(addedPath[0]); fileName[1] = ':'; fileName[2] = '\0'; c = 2; -modified = 0x1; +modified = 1; } else if(addedPath[0] == '\\' && addedPath[1] == '\\') { fileName[0] = fileName[1] = '\\'; fileName[2] = '\0'; c = 2; -modified = 0x1; +modified = 1; } } if(!modified && isURL && (addedPath[0] == '\\' || addedPath[0] == '/')) @@ -552,25 +552,25 @@ if(addedPath[0] == '/' && !addedPath[1]) { fileName[0] = addedPath[0]; fileName[1] = '\0'; -modified = 0x1; +modified = 1; } else if(fileName[0] && fileName[1] == ':') { fileName[2] = '\0'; -modified = 0x1; +modified = 1; } else { fileName[0] = '\\'; fileName[1] = '\0'; -modified = 0x1; +modified = 1; } } else { fileName[0] = '/'; fileName[1] = '\0'; -modified = 0x1; +modified = 1; } c = 1; } @@ -600,7 +600,7 @@ len--; } if(len > 0) { -modified = 0x1; +modified = 1; if(strstr(directory, "..") == directory && (!directory[2] || directory[2] == ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? '\\' : '/') || directory[2] == '/')) { int strLen = strlen(fileName) - 1; @@ -692,14 +692,14 @@ return modified ? string : (((void *)0)); char * __ecereNameSpace__ecere__sys__PathCat(char * string, const char * addedPath) { -unsigned int modified = 0x0; +unsigned int modified = 0; if(addedPath) { char fileName[797] = "", archiveName[797] = ""; const char * file = (((void *)0)); int c = 0; -unsigned int isURL = 0x0; +unsigned int isURL = 0; unsigned int isArchive = __ecereNameSpace__ecere__sys__SplitArchivePath(string, archiveName, &file); char * urlFileName; char * protocolSymbol; @@ -712,7 +712,7 @@ if(protocolSymbol) { char * slash = strstr(protocolSymbol + 3, "/"); -isURL = 0x1; +isURL = 1; if(slash) urlFileName = slash; else @@ -726,7 +726,7 @@ int len = protocolSymbol - addedPath + 3; memcpy(fileName, addedPath, len); fileName[len] = (char)0; -isURL = 0x1; +isURL = 1; c = len; } else if(runtimePlatform == 1) @@ -737,14 +737,14 @@ fileName[0] = (char)toupper(addedPath[0]); fileName[1] = ':'; fileName[2] = '\0'; c = 2; -modified = 0x1; +modified = 1; } else if(addedPath[0] == '\\' && addedPath[1] == '\\') { fileName[0] = fileName[1] = '\\'; fileName[2] = '\0'; c = 2; -modified = 0x1; +modified = 1; } else if(fileName[0] == '/' && !archiveName[0] && strcmp(addedPath, "/")) return (((void *)0)); @@ -762,25 +762,25 @@ if(addedPath[0] == '/' && !addedPath[1]) { fileName[0] = addedPath[0]; fileName[1] = '\0'; -modified = 0x1; +modified = 1; } else if(fileName[0] && fileName[1] == ':') { fileName[2] = '\0'; -modified = 0x1; +modified = 1; } else { fileName[0] = '\\'; fileName[1] = '\0'; -modified = 0x1; +modified = 1; } } else { fileName[0] = '/'; fileName[1] = '\0'; -modified = 0x1; +modified = 1; } c = 1; } @@ -810,21 +810,21 @@ len--; } if(len > 0) { -modified = 0x1; +modified = 1; if(strstr(directory, "..") == directory && (!directory[2] || directory[2] == ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? '\\' : '/'))) { int strLen = strlen(fileName) - 1; if(strLen > -1) { -unsigned int separator = 0x0; +unsigned int separator = 0; for(; strLen > -1 && (ch = fileName[strLen]) && (ch == '/' || ch == '\\'); strLen--) ; for(; strLen > -1 && (ch = fileName[strLen]) && (ch != '/' && ch != '\\' && ch != ':'); strLen--) ; for(; strLen > -1 && (ch = fileName[strLen]) && (ch == '/' || ch == '\\'); strLen--) -separator = 0x1; +separator = 1; if(isURL) { int __simpleStruct0; @@ -919,7 +919,7 @@ else { char pathPart[4384], pathRest[797]; char toPart[4384], toRest[797]; -unsigned int different = 0x0; +unsigned int different = 0; strcpy(pathRest, path); strcpy(toRest, to); @@ -931,7 +931,7 @@ if(!different) __ecereNameSpace__ecere__sys__SplitDirectory(pathRest, pathPart, pathRest); if(different || ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? (strcasecmp) : strcmp)(toPart, pathPart)) { -different = 0x1; +different = 1; strcat(destination, ".."); strcat(destination, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "\\" : "/")); } @@ -958,11 +958,11 @@ for(c = strlen(string); c >= 0; c--) if(string[c] == '.') { string[c] = '\0'; -return 0x1; +return 1; } else if(string[c] == '\\' || string[c] == '/') break; -return 0x0; +return 0; } char * __ecereNameSpace__ecere__sys__ChangeExtension(const char * string, const char * ext, char * output) @@ -1117,7 +1117,7 @@ const char * escChars = " !\"$&'()*:;<=>?[\\`{|"; const char * escCharsQuoted = "\"()$"; #endif int count = 0; -unsigned int quoted = 0x0, escaped = 0x0; +unsigned int quoted = 0, escaped = 0; char * start = (((void *)0)), * output = string; char ch; @@ -1131,13 +1131,13 @@ if(start) { if(escaped) { -escaped = 0x0; +escaped = 0; output--; *output = ch; } else if(ch == '\"') { -quoted ^= 0x1; +quoted ^= 1; output--; } else if(ch == ' ' && !quoted) @@ -1151,14 +1151,14 @@ else if(ch != ' ') { if(ch == '\"') { -quoted = 0x1; +quoted = 1; start = output + 1; } else start = output; } -if(!wasEscaped && ch == '\\' && (esc == 0x1 || (esc == 0x2 && strchr(quoted ? escCharsQuoted : escChars, *(string + 1))))) -escaped = 0x1; +if(!wasEscaped && ch == '\\' && (esc == 1 || (esc == 2 && strchr(quoted ? escCharsQuoted : escChars, *(string + 1))))) +escaped = 1; } if(start && count < maxTokens) { @@ -1171,11 +1171,11 @@ return count; int __ecereNameSpace__ecere__sys__TokenizeWith(char * string, int maxTokens, char * tokens[], const char * tokenizers, unsigned int escapeBackSlashes) { int count = 0; -unsigned int quoted = 0x0; +unsigned int quoted = 0; char * start = (((void *)0)); -unsigned int escaped = 0x0; +unsigned int escaped = 0; char * output = string; -unsigned int quotedFromStart = 0x0; +unsigned int quotedFromStart = 0; for(; *string && count < maxTokens; string++, output++) { @@ -1185,24 +1185,24 @@ if(start) { if(escaped) { -escaped = 0x0; +escaped = 0; output--; if(output != string) *output = *string; } else if(escapeBackSlashes && *string == '\\') -escaped = 0x1; +escaped = 1; else if(*string == '\"') { if(quoted) { if(quotedFromStart) *output = '\0'; -quotedFromStart = 0x0; -quoted = 0x0; +quotedFromStart = 0; +quoted = 0; } else -quoted = 0x1; +quoted = 1; } else if(strchr(tokenizers, *string) && !quoted) { @@ -1215,15 +1215,15 @@ else if(!strchr(tokenizers, *string)) { if(*string == '\"') { -quotedFromStart = 0x1; -quoted = 0x1; +quotedFromStart = 1; +quoted = 1; start = output + 1; } else { start = output; if(*string == '\\' && escapeBackSlashes) -escaped = 0x1; +escaped = 1; } } } @@ -1298,18 +1298,18 @@ unsigned int __ecereNameSpace__ecere__sys__GetString(char ** buffer, char * stri { int c; char ch; -unsigned int quoted = 0x0; -unsigned int result = 0x1; +unsigned int quoted = 0; +unsigned int result = 1; if(!* *buffer) { string[0] = (char)0; -return 0x0; +return 0; } for(; ; ) { if(!(ch = *((*buffer)++))) -result = 0x0; +result = 0; if((ch != '\n') && (ch != '\r') && (ch != ' ') && (ch != ',') && (ch != '\t')) break; if(!*(*buffer)) @@ -1321,7 +1321,7 @@ for(c = 0; c < max - 1; c++) { if(!quoted && ((ch == '\n') || (ch == '\r') || (ch == ' ') || (ch == ',') || (ch == '\t'))) { -result = 0x1; +result = 1; break; } if(ch == '\"') @@ -1417,7 +1417,7 @@ return (float)neg * res; unsigned int __ecereNameSpace__ecere__sys__IsPathInsideOf(const char * path, const char * of) { if(!path[0] || !of[0]) -return 0x0; +return 0; else { char ofPart[274], ofRest[797]; @@ -1430,13 +1430,13 @@ for(; ofRest[0] && pathRest[0]; ) __ecereNameSpace__ecere__sys__SplitDirectory(ofRest, ofPart, ofRest); __ecereNameSpace__ecere__sys__SplitDirectory(pathRest, pathPart, pathRest); if(((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? (strcasecmp) : strcmp)(pathPart, ofPart)) -return 0x0; +return 0; } if(!ofRest[0] && !pathRest[0]) -return 0x0; +return 0; else if(!pathRest[0]) -return 0x0; -return 0x1; +return 0; +return 1; } } @@ -1492,7 +1492,7 @@ struct __ecereNameSpace__ecere__com__NameSpace publicNameSpace; extern struct __ecereNameSpace__ecere__com__Instance * __thisModule; -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); void __ecereRegisterModule_String(struct __ecereNameSpace__ecere__com__Instance * module) { diff --git a/compiler/bootstrap/ecere/bootstrap/System.c b/compiler/bootstrap/ecere/bootstrap/System.c index eb4a87c..40ca4b8 100644 --- a/compiler/bootstrap/ecere/bootstrap/System.c +++ b/compiler/bootstrap/ecere/bootstrap/System.c @@ -473,7 +473,7 @@ unsigned int result; va_list args; __builtin_va_start(args, command); -result = System_Execute((((void *)0)), command, args, 0x0); +result = System_Execute((((void *)0)), command, args, 0); __builtin_va_end(args); return result; } @@ -484,7 +484,7 @@ unsigned int result; va_list args; __builtin_va_start(args, command); -result = System_Execute((((void *)0)), command, args, 0x1); +result = System_Execute((((void *)0)), command, args, 1); __builtin_va_end(args); return result; } @@ -495,7 +495,7 @@ unsigned int result; va_list args; __builtin_va_start(args, command); -result = System_Execute(env, command, args, 0x0); +result = System_Execute(env, command, args, 0); __builtin_va_end(args); return result; } @@ -675,7 +675,7 @@ else if(mode == 3) } if(mode == (int)0) { -__ecereNameSpace__ecere__sys__DumpErrors(0x1); +__ecereNameSpace__ecere__sys__DumpErrors(1); if(__ecereNameSpace__ecere__sys__globalSystem.errorBuffer) { (__ecereNameSpace__ecere__com__eSystem_Delete(__ecereNameSpace__ecere__sys__globalSystem.errorBuffer), __ecereNameSpace__ecere__sys__globalSystem.errorBuffer = 0); @@ -725,7 +725,7 @@ struct __ecereNameSpace__ecere__com__NameSpace publicNameSpace; extern struct __ecereNameSpace__ecere__com__Instance * __thisModule; -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__DefinedExpression; diff --git a/compiler/bootstrap/ecere/bootstrap/TempFile.c b/compiler/bootstrap/ecere/bootstrap/TempFile.c index da6190e..f4194cb 100644 --- a/compiler/bootstrap/ecere/bootstrap/TempFile.c +++ b/compiler/bootstrap/ecere/bootstrap/TempFile.c @@ -308,7 +308,7 @@ unsigned int __ecereConstructor___ecereNameSpace__ecere__sys__TempFile(struct __ struct __ecereNameSpace__ecere__sys__TempFile * __ecerePointer___ecereNameSpace__ecere__sys__TempFile = (struct __ecereNameSpace__ecere__sys__TempFile *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__TempFile->offset) : 0); __ecerePointer___ecereNameSpace__ecere__sys__TempFile->openMode = 5; -return 0x1; +return 1; } void __ecereDestructor___ecereNameSpace__ecere__sys__TempFile(struct __ecereNameSpace__ecere__com__Instance * this) @@ -330,7 +330,7 @@ int readSize = size * count; int read = (__simpleStruct0 = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size - __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position, (readSize < __simpleStruct0) ? readSize : __simpleStruct0); if(__ecerePointer___ecereNameSpace__ecere__sys__TempFile->position >= __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size) -__ecerePointer___ecereNameSpace__ecere__sys__TempFile->eof = 0x1; +__ecerePointer___ecereNameSpace__ecere__sys__TempFile->eof = 1; if(buffer) memcpy(buffer, __ecerePointer___ecereNameSpace__ecere__sys__TempFile->buffer + __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position, read); __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position += read; @@ -405,7 +405,7 @@ return written == len; unsigned int __ecereMethod___ecereNameSpace__ecere__sys__TempFile_Seek(struct __ecereNameSpace__ecere__com__Instance * this, int pos, int mode) { struct __ecereNameSpace__ecere__sys__TempFile * __ecerePointer___ecereNameSpace__ecere__sys__TempFile = (struct __ecereNameSpace__ecere__sys__TempFile *)(this ? (((char *)this) + __ecereClass___ecereNameSpace__ecere__sys__TempFile->offset) : 0); -unsigned int result = 0x1; +unsigned int result = 1; unsigned int increase = 0; switch(mode) @@ -422,13 +422,13 @@ increase = pos - __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size; else { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size; -result = 0x0; +result = 0; } } else if(pos < 0) { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = 0; -result = 0x0; +result = 0; } else __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = pos; @@ -446,13 +446,13 @@ increase = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position - __e else { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size; -result = 0x0; +result = 0; } } else if(__ecerePointer___ecereNameSpace__ecere__sys__TempFile->position + pos < 0) { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = 0; -result = 0x0; +result = 0; } else __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position += pos; @@ -470,13 +470,13 @@ increase = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position - __e else { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size; -result = 0x0; +result = 0; } } else if((int)__ecerePointer___ecereNameSpace__ecere__sys__TempFile->size + pos < 0) { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = 0; -result = 0x0; +result = 0; } else __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size + pos; @@ -484,7 +484,7 @@ break; } } if(result) -__ecerePointer___ecereNameSpace__ecere__sys__TempFile->eof = 0x0; +__ecerePointer___ecereNameSpace__ecere__sys__TempFile->eof = 0; if(increase) { __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size += increase; @@ -523,7 +523,7 @@ __ecerePointer___ecereNameSpace__ecere__sys__TempFile->size = (unsigned int)size __ecerePointer___ecereNameSpace__ecere__sys__TempFile->allocated = (unsigned int)size; if(__ecerePointer___ecereNameSpace__ecere__sys__TempFile->position > size) __ecerePointer___ecereNameSpace__ecere__sys__TempFile->position = (unsigned int)size; -return 0x1; +return 1; } int __ecereProp___ecereNameSpace__ecere__sys__TempFile_Get_openMode(struct __ecereNameSpace__ecere__com__Instance * this) diff --git a/compiler/bootstrap/ecere/bootstrap/dataTypes.c b/compiler/bootstrap/ecere/bootstrap/dataTypes.c index ce1c3da..61a368b 100644 --- a/compiler/bootstrap/ecere/bootstrap/dataTypes.c +++ b/compiler/bootstrap/ecere/bootstrap/dataTypes.c @@ -558,39 +558,57 @@ __ecerePointer___ecereNameSpace__ecere__com__SerialBuffer->count = value; __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(this, __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_size), __ecereNameSpace__ecere__com__eInstance_FireSelfWatchers(this, __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size); } +extern int strcmp(const char * , const char * ); + extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__EnumClassData; struct __ecereNameSpace__ecere__com__EnumClassData { struct __ecereNameSpace__ecere__sys__OldList values; -int largest; +long long largest; } __attribute__ ((gcc_struct)); -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 char * strcpy(char * , const char * ); extern int toupper(int); -const char * __ecereNameSpace__ecere__com__Enum_OnGetString(struct __ecereNameSpace__ecere__com__Class * _class, int * data, char * tempString, void * fieldData, unsigned int * needClass) +const char * __ecereNameSpace__ecere__com__Enum_OnGetString(struct __ecereNameSpace__ecere__com__Class * _class, void * data, char * tempString, void * fieldData, unsigned int * needClass) { -struct __ecereNameSpace__ecere__sys__NamedLink * item = (((void *)0)); +struct __ecereNameSpace__ecere__sys__NamedLink64 * item = (((void *)0)); struct __ecereNameSpace__ecere__com__Class * b; +long long i64Data; +switch(_class->typeSize) +{ +case 1: +i64Data = !strcmp(_class->dataTypeString, "byte") ? *(unsigned char *)data : *(char *)data; +break; +case 2: +i64Data = !strcmp(_class->dataTypeString, "uint16") ? *(unsigned short *)data : *(short *)data; +break; +case 4: +i64Data = !strcmp(_class->dataTypeString, "uint") ? *(unsigned int *)data : *(int *)data; +break; +case 8: +i64Data = !strcmp(_class->dataTypeString, "uint64") ? *(long long *)data : *(long long *)data; +break; +} for(b = _class; !item && b && b->type == 4; b = b->base) { struct __ecereNameSpace__ecere__com__EnumClassData * enumeration = (struct __ecereNameSpace__ecere__com__EnumClassData *)b->data; for(item = enumeration->values.first; item; item = item->next) -if((int)item->data == *data) +if(item->data == i64Data) break; } if(item) @@ -606,11 +624,11 @@ return (((void *)0)); extern int strcasecmp(const char * , const char * ); -static unsigned int __ecereNameSpace__ecere__com__Integer_OnGetDataFromString(struct __ecereNameSpace__ecere__com__Class * _class, int * data, const char * string); +static unsigned int __ecereNameSpace__ecere__com__Int64_OnGetDataFromString(struct __ecereNameSpace__ecere__com__Class * _class, long long * data, const char * string); -static unsigned int __ecereNameSpace__ecere__com__Enum_OnGetDataFromString(struct __ecereNameSpace__ecere__com__Class * _class, int * data, const char * string) +static unsigned int __ecereNameSpace__ecere__com__Enum_OnGetDataFromString(struct __ecereNameSpace__ecere__com__Class * _class, void * data, const char * string) { -struct __ecereNameSpace__ecere__sys__NamedLink * item = (((void *)0)); +struct __ecereNameSpace__ecere__sys__NamedLink64 * item = (((void *)0)); struct __ecereNameSpace__ecere__com__Class * b; for(b = _class; !item && b && b->type == 4; b = b->base) @@ -625,12 +643,38 @@ break; } if(item) { -*data = (int)item->data; -return 0x1; +switch(_class->typeSize) +{ +case 1: +if(!strcmp(_class->dataTypeString, "byte")) +*(unsigned char *)data = (unsigned char)item->data; +else +*(char *)data = (char)item->data; +break; +case 2: +if(!strcmp(_class->dataTypeString, "uint16")) +*(unsigned short *)data = (unsigned short)item->data; +else +*(short *)data = (short)item->data; +break; +case 4: +if(!strcmp(_class->dataTypeString, "uint")) +*(unsigned int *)data = (unsigned int)item->data; +else +*(int *)data = (int)item->data; +break; +case 8: +if(!strcmp(_class->dataTypeString, "uint64")) +*(uint64 *)data = *(uint64 *)&item->data; +else +*(long long *)data = item->data; +break; +} +return 1; } else -return __ecereNameSpace__ecere__com__Integer_OnGetDataFromString(_class, data, string); -return 0x0; +return __ecereNameSpace__ecere__com__Int64_OnGetDataFromString(_class, data, string); +return 0; } extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpace__ecere__com__Instance * instance); @@ -701,8 +745,6 @@ return memberResult; return 0; } -extern int strcmp(const char * , const char * ); - static int __ecereNameSpace__ecere__com__OnCompare(struct __ecereNameSpace__ecere__com__Class * _class, void * data1, void * data2) { struct __ecereNameSpace__ecere__com__Instance * module = _class->module; @@ -915,11 +957,11 @@ struct __ecereNameSpace__ecere__com__Property * prop; for(prop = _class->conversions.first; prop; prop = prop->next) { -unsigned int refProp = 0x0; +unsigned int refProp = 0; struct __ecereNameSpace__ecere__com__Class * c; if(!strcmp(prop->name, _class->base->fullName)) -refProp = 0x1; +refProp = 1; else if((c = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, prop->name))) { struct __ecereNameSpace__ecere__com__Property * p; @@ -928,7 +970,7 @@ for(p = c->conversions.first; p; p = p->next) { if(!strcmp(p->name, _class->base->fullName) && !p->Set && !p->Get) { -refProp = 0x1; +refProp = 1; break; } } @@ -973,8 +1015,8 @@ return ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void } else { -unsigned int atMember = 0x1; -unsigned int prev = 0x0; +unsigned int atMember = 1; +unsigned int prev = 0; struct __ecereNameSpace__ecere__com__Class * mainClass = _class; _class = (((void *)0)); @@ -1022,7 +1064,7 @@ if(!strcmp(prop->dataTypeString, "float")) value.__anon1.f = ((float (*)(void *))(void *)prop->Get)(data); if(value.__anon1.f) { -unsigned int needClass = 0x1; +unsigned int needClass = 1; const char * result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, memberString, (((void *)0)), &needClass); if(result && result != memberString) @@ -1036,7 +1078,7 @@ else if(memberType->type == 0 || memberType->type == 5) value.__anon1.p = ((void * (*)(void *))(void *)prop->Get)(data); if(value.__anon1.p || prop->IsSet) { -unsigned int needClass = 0x1; +unsigned int needClass = 1; const char * result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetString])(memberType, (memberType->type == 0) ? value.__anon1.p : &value, memberString, (((void *)0)), &needClass); if(result && result != memberString) @@ -1048,7 +1090,7 @@ else value.__anon1.i = ((int (*)(void *))(void *)prop->Get)(data); if(value.__anon1.i || prop->IsSet) { -unsigned int needClass = 0x1; +unsigned int needClass = 1; const char * result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, memberString, (((void *)0)), &needClass); if(result && result != memberString) @@ -1074,7 +1116,7 @@ if(memberData[c]) break; if(c < typeSize) { -unsigned int needClass = 0x1; +unsigned int needClass = 1; const char * result; if(memberType->type == 0) @@ -1109,7 +1151,7 @@ struct __ecereNameSpace__ecere__com__BitMember * bitMember = (struct __ecereName value.__anon1.ui64 = ((*(unsigned int *)data & bitMember->mask) >> bitMember->pos); if(value.__anon1.ui64) { -unsigned int needClass = 0x1; +unsigned int needClass = 1; char internalMemberString[1024]; const char * result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, internalMemberString, (((void *)0)), &needClass); @@ -1131,7 +1173,7 @@ if(memberType->typeSize <= 4) value.__anon1.i = *(int *)((unsigned char *)data + (((member->_class->type == 0) ? member->_class->offset : 0) + member->offset)); if(value.__anon1.i) { -unsigned int needClass = 0x1; +unsigned int needClass = 1; const char * result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetString])(memberType, &value, memberString, (((void *)0)), &needClass); if(result && memberString != result) @@ -1140,7 +1182,7 @@ strcpy(memberString, result); } else { -unsigned int needClass = 0x1; +unsigned int needClass = 1; const char * result = ((const char * (*)(void *, void *, char *, void *, unsigned int *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetString])(memberType, ((unsigned char *)data + (((member->_class->type == 0) ? member->_class->offset : 0) + member->offset)), memberString, (((void *)0)), &needClass); if(result && memberString != result) @@ -1188,11 +1230,11 @@ strcat(tempString, "\""); } else strcat(tempString, memberString); -atMember = 0x1; -prev = 0x1; +atMember = 1; +prev = 1; } else if(member && (!member->isProperty || !((struct __ecereNameSpace__ecere__com__Property *)member)->conversion)) -atMember = 0x0; +atMember = 0; } } } @@ -1217,7 +1259,7 @@ unsigned int result; struct __ecereNameSpace__ecere__com__Instance * module = _class->module; if(_class->type == 4) -result = __ecereNameSpace__ecere__com__Enum_OnGetDataFromString(_class, (int *)data, string); +result = __ecereNameSpace__ecere__com__Enum_OnGetDataFromString(_class, (long long *)data, string); else if(_class->type == 3) { struct __ecereNameSpace__ecere__com__Class * dataType; @@ -1225,11 +1267,11 @@ struct __ecereNameSpace__ecere__com__Property * prop; for(prop = _class->conversions.first; prop; prop = prop->next) { -unsigned int refProp = 0x0; +unsigned int refProp = 0; struct __ecereNameSpace__ecere__com__Class * c; if(!strcmp(prop->name, _class->base->fullName)) -refProp = 0x1; +refProp = 1; else if((c = __ecereNameSpace__ecere__com__eSystem_FindClass(_class->module, prop->name))) { struct __ecereNameSpace__ecere__com__Property * p; @@ -1238,7 +1280,7 @@ for(p = c->conversions.first; p; p = p->next) { if(!strcmp(p->name, _class->base->fullName) && !p->Set && !p->Get) { -refProp = 0x1; +refProp = 1; break; } } @@ -1292,7 +1334,7 @@ return ((unsigned int (*)(void *, void *, const char *))(void *)dataType->_vTbl[ else if(!string[0] && _class->type == 0) { *data = (((void *)0)); -return 0x1; +return 1; } else { @@ -1300,10 +1342,10 @@ int c; char memberName[1024]; char memberString[10240]; int count = 0; -unsigned int quoted = 0x0; +unsigned int quoted = 0; int brackets = 0; char ch; -unsigned int escape = 0x0; +unsigned int escape = 0; unsigned int gotChar; unsigned int memberOffset; struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0)); @@ -1311,7 +1353,7 @@ struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0)); struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256]; int subMemberStackPos = 0; -result = 0x1; +result = 1; if(_class->type == 5 || _class->type == 0) { data = *data = __ecereNameSpace__ecere__com__eInstance_New(_class); @@ -1323,27 +1365,27 @@ memset(data, 0, _class->structSize); memberName[0] = '\0'; for(c = 0; string[c] && count < sizeof (memberString); ) { -unsigned int found = 0x0; +unsigned int found = 0; struct __ecereNameSpace__ecere__com__DataMember * thisMember = (((void *)0)); brackets = 0; -gotChar = 0x0; +gotChar = 0; for(; (ch = string[c]) && count < sizeof (memberString); c++) { if(ch == '\"' && !escape) { -quoted ^= 0x1; +quoted ^= 1; } else if(quoted) { if(!escape && ch == '\\') { -escape = 0x1; +escape = 1; } else { memberString[count++] = ch; -escape = 0x0; +escape = 0; } } else if(ch == ' ') @@ -1368,12 +1410,12 @@ else if(ch == '{') if(gotChar && !brackets) { count = 0; -gotChar = 0x0; +gotChar = 0; } if(brackets) { memberString[count++] = ch; -gotChar = 0x1; +gotChar = 1; } brackets++; } @@ -1382,7 +1424,7 @@ else if(ch == '}') brackets--; if(brackets) { -gotChar = 0x1; +gotChar = 1; memberString[count++] = ch; } } @@ -1397,13 +1439,13 @@ else memberString[count] = '\0'; __ecereNameSpace__ecere__sys__TrimRSpaces(memberString, memberName); count = 0; -gotChar = 0x0; +gotChar = 0; } } else { memberString[count++] = ch; -gotChar = 0x1; +gotChar = 1; } } memberString[count] = '\0'; @@ -1425,7 +1467,7 @@ curClass = thisMember->_class; memcpy(subMemberStack, _subMemberStack, sizeof(int) * _subMemberStackPos); subMemberStackPos = _subMemberStackPos; } -found = 0x1; +found = 1; } } else @@ -1434,7 +1476,7 @@ __ecereNameSpace__ecere__com__eClass_FindNextMember(_class, &curClass, &curMembe thisMember = curMember; if(thisMember) { -found = 0x1; +found = 1; __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, thisMember->name, &memberOffset, _class->module, (((void *)0)), (((void *)0))); } } @@ -1451,7 +1493,7 @@ if(memberType->type == 1) if(thisMember) { if(!((unsigned int (*)(void *, void *, const char *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetDataFromString])(memberType, (unsigned char *)data + (((thisMember->_class->type == 0) ? thisMember->_class->offset : 0) + memberOffset), memberString)) -result = 0x0; +result = 0; } } else @@ -1467,10 +1509,10 @@ struct __ecereNameSpace__ecere__com__DataValue value = if(memberType->_vTbl[__ecereVMethodID_class_OnGetDataFromString] == _class->_vTbl[__ecereVMethodID_class_OnGetDataFromString]) { if(!__ecereNameSpace__ecere__com__OnGetDataFromString(memberType, &value, memberString)) -result = 0x0; +result = 0; } else if(!((unsigned int (*)(void *, void *, const char *))(void *)memberType->_vTbl[__ecereVMethodID_class_OnGetDataFromString])(memberType, &value, memberString)) -result = 0x0; +result = 0; if(thisMember && !thisMember->isProperty) { if(_class->type == 2) @@ -1492,7 +1534,7 @@ else } } else -result = 0x0; +result = 0; count = 0; memberName[0] = '\0'; } @@ -1750,9 +1792,9 @@ int result = strtol(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static const char * __ecereNameSpace__ecere__com__Int16_OnGetString(struct __ecereNameSpace__ecere__com__Class * _class, short * data, char * string, void * fieldData, unsigned int * needClass) @@ -1769,9 +1811,9 @@ short result = (short)strtol(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static int __ecereNameSpace__ecere__com__Int16_OnCompare(struct __ecereNameSpace__ecere__com__Class * _class, short * data1, short * data2) @@ -1853,9 +1895,9 @@ unsigned int result = strtoul(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static unsigned int __ecereNameSpace__ecere__com__UInt16_OnGetDataFromString(struct __ecereNameSpace__ecere__com__Class * _class, unsigned short * data, const char * string) @@ -1866,9 +1908,9 @@ unsigned short result = (unsigned short)strtoul(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static int __ecereNameSpace__ecere__com__Byte_OnCompare(struct __ecereNameSpace__ecere__com__Class * _class, unsigned char * data1, unsigned char * data2) @@ -1928,9 +1970,9 @@ unsigned char result = (unsigned char)strtoul(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static int __ecereNameSpace__ecere__com__Int64_OnCompare(struct __ecereNameSpace__ecere__com__Class * _class, long long * data1, long long * data2) @@ -2061,9 +2103,9 @@ uint64 result = __ecereNameSpace__ecere__com___strtoi64(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } extern uint64 __ecereNameSpace__ecere__com___strtoui64(const char * string, const char * * endString, int base); @@ -2076,9 +2118,9 @@ uint64 result = __ecereNameSpace__ecere__com___strtoui64(string, &end, 0); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } int __ecereVMethodID___ecereNameSpace__ecere__com__IOChannel_WriteData; @@ -2416,7 +2458,7 @@ integerClass->type = 1000; integerClass->dataTypeString = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"); integerClass->structSize = 0; integerClass->typeSize = sizeof(uintptr_t); -integerClass->byValueSystemClass = 0x1; +integerClass->byValueSystemClass = 1; if(sizeof(uintptr_t) == 8) { __ecereNameSpace__ecere__com__eClass_AddMethod(integerClass, "OnGetString", (((void *)0)), __ecereNameSpace__ecere__com__UIntPtr64_OnGetString, 1); @@ -2439,7 +2481,7 @@ integerClass->type = 1000; integerClass->dataTypeString = __ecereNameSpace__ecere__sys__CopyString("intptr_t"); integerClass->structSize = 0; integerClass->typeSize = sizeof(intptr_t); -integerClass->byValueSystemClass = 0x1; +integerClass->byValueSystemClass = 1; if(sizeof(intptr_t) == 8) { __ecereNameSpace__ecere__com__eClass_AddMethod(integerClass, "OnGetString", (((void *)0)), __ecereNameSpace__ecere__com__IntPtr64_OnGetString, 1); @@ -2544,9 +2586,9 @@ float result = (float)strtod(string, &end); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static void __ecereNameSpace__ecere__com__Float_OnSerialize(struct __ecereNameSpace__ecere__com__Class * _class, float * data, struct __ecereNameSpace__ecere__com__Instance * channel) @@ -2685,9 +2727,9 @@ result = strtod(string, &end); if(end > string) { *data = result; -return 0x1; +return 1; } -return 0x0; +return 0; } static void __ecereNameSpace__ecere__com__Double_OnSerialize(struct __ecereNameSpace__ecere__com__Class * _class, double * data, struct __ecereNameSpace__ecere__com__Instance * channel) @@ -2833,7 +2875,7 @@ memcpy(*data, newData, len + 1); else *data = (((void *)0)); } -return 0x1; +return 1; } int __ecereNameSpace__ecere__com__String_OnCompare(struct __ecereNameSpace__ecere__com__Class * _class, const char * string1, const char * string2) @@ -2918,7 +2960,7 @@ struct __ecereNameSpace__ecere__com__Class * stringClass = __ecereNameSpace__ece (__ecereNameSpace__ecere__com__eSystem_Delete((void *)stringClass->dataTypeString), stringClass->dataTypeString = 0); stringClass->dataTypeString = __ecereNameSpace__ecere__sys__CopyString("char *"); stringClass->structSize = 0; -stringClass->computeSize = 0x0; +stringClass->computeSize = 0; __ecereNameSpace__ecere__com__eClass_AddMethod(stringClass, "OnCompare", (((void *)0)), __ecereNameSpace__ecere__com__String_OnCompare, 1); __ecereNameSpace__ecere__com__eClass_AddMethod(stringClass, "OnCopy", (((void *)0)), __ecereNameSpace__ecere__com__String_OnCopy, 1); __ecereNameSpace__ecere__com__eClass_AddMethod(stringClass, "OnFree", (((void *)0)), __ecereNameSpace__ecere__com__String_OnFree, 1); @@ -2928,7 +2970,7 @@ __ecereNameSpace__ecere__com__eClass_AddMethod(stringClass, "OnSerialize", (((vo __ecereNameSpace__ecere__com__eClass_AddMethod(stringClass, "OnUnserialize", (((void *)0)), __ecereNameSpace__ecere__com__String_OnUnserialize, 1); stringClass = __ecereNameSpace__ecere__com__eSystem_RegisterClass(0, "String", "char *", 0, 0, (((void *)0)), (((void *)0)), module, 4, 1); stringClass->structSize = 0; -stringClass->computeSize = 0x0; +stringClass->computeSize = 0; __ecereNameSpace__ecere__com__eClass_AddProperty(stringClass, (((void *)0)), "char *", (((void *)0)), (((void *)0)), 1); } @@ -2975,7 +3017,7 @@ len = maxLen - 1; if(result != buffer) memcpy(buffer, result, len); } -while(0x1) +while(1) { struct __ecereNameSpace__ecere__com__Class * _class = (((void *)0)); void * data = (((void *)0)); @@ -3183,7 +3225,7 @@ __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_buffer = __ecerePropM___e __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size = __ecereNameSpace__ecere__com__eClass_AddProperty(class, "size", "uint", __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_Set_size, __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_Get_size, 1); if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application) __ecereProp___ecereNameSpace__ecere__com__SerialBuffer_size = __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size, __ecerePropM___ecereNameSpace__ecere__com__SerialBuffer_size = (void *)0; -__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Enum_OnGetString", "const char * ecere::com::Enum_OnGetString(ecere::com::Class _class, int * data, char * tempString, void * fieldData, bool * needClass)", __ecereNameSpace__ecere__com__Enum_OnGetString, module, 4); +__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Enum_OnGetString", "const char * ecere::com::Enum_OnGetString(ecere::com::Class _class, int64 * data, char * tempString, void * fieldData, bool * needClass)", __ecereNameSpace__ecere__com__Enum_OnGetString, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Integer_OnGetString", "const char * ecere::com::Integer_OnGetString(ecere::com::Class _class, int * data, char * string, void * fieldData, bool * needClass)", __ecereNameSpace__ecere__com__Integer_OnGetString, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Byte_OnSerialize", "void ecere::com::Byte_OnSerialize(ecere::com::Class _class, byte * data, ecere::com::IOChannel channel)", __ecereNameSpace__ecere__com__Byte_OnSerialize, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::Byte_OnUnserialize", "void ecere::com::Byte_OnUnserialize(ecere::com::Class _class, byte * data, ecere::com::IOChannel channel)", __ecereNameSpace__ecere__com__Byte_OnUnserialize, module, 4); diff --git a/compiler/bootstrap/ecere/bootstrap/ecere.main.c b/compiler/bootstrap/ecere/bootstrap/ecere.main.c index cfc6e0a..1d84ad2 100644 --- a/compiler/bootstrap/ecere/bootstrap/ecere.main.c +++ b/compiler/bootstrap/ecere/bootstrap/ecere.main.c @@ -589,8 +589,6 @@ int __ecereVMethodID___ecereNameSpace__ecere__sys__FileSystem_QuerySize; int __ecereVMethodID___ecereNameSpace__ecere__sys__FileSystem_Stats; -struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink; - struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64; struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldLink; @@ -1104,7 +1102,6 @@ __ecereVMethodID___ecereNameSpace__ecere__sys__FileSystem_QuerySize = method->vi method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, "Stats", module); if(method) __ecereVMethodID___ecereNameSpace__ecere__sys__FileSystem_Stats = method->vid; -__ecereClass___ecereNameSpace__ecere__sys__NamedLink = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedLink"); __ecereClass___ecereNameSpace__ecere__sys__NamedLink64 = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedLink64"); __ecereClass___ecereNameSpace__ecere__sys__OldLink = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::OldLink"); __ecereClass___ecereNameSpace__ecere__sys__OldList = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::OldList"); @@ -1128,7 +1125,7 @@ if(__currentModule == module) { __ecereCreateModuleInstances_System(); } -return 0x1; +return 1; } extern void __ecereNameSpace__ecere__UnloadTranslatedStrings(const char * name); @@ -1164,7 +1161,7 @@ __ecereUnregisterModule_String(module); __ecereUnregisterModule_OldList(module); if(__currentModule == module) __currentModule = (void *)0; -return 0x1; +return 1; } void __ecereRegisterModule_ecere_main(struct __ecereNameSpace__ecere__com__Instance * module) diff --git a/compiler/bootstrap/ecere/bootstrap/i18n.c b/compiler/bootstrap/ecere/bootstrap/i18n.c index cc7d4f4..1f5a89e 100644 --- a/compiler/bootstrap/ecere/bootstrap/i18n.c +++ b/compiler/bootstrap/ecere/bootstrap/i18n.c @@ -518,7 +518,7 @@ __ecereNameSpace__ecere__moduleMaps = __ecereNameSpace__ecere__com__eInstance_Ne { struct __ecereNameSpace__ecere__com__MapIterator it = (it.container = (void *)0, it.pointer = (void *)0, __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(&it, __ecereNameSpace__ecere__moduleMaps), it); -if(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(name), 0x0)) +if(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(name), 0)) (__ecereNameSpace__ecere__com__eInstance_DecRef(((void * )(__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data((void *)&it)))), __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data((void *)&it, 0)); } __extension__ ({ @@ -527,7 +527,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = __ecereNameSpace__ecere__moduleMaps, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(name)), 0x1); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(name)), 1); __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)(textMap = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__Map_TPL_String__const_String_)))); }); for(c = 0; c < numStrings; c++) @@ -599,7 +599,7 @@ if(len) { struct __ecereNameSpace__ecere__com__MapIterator it = (it.container = (void *)0, it.pointer = (void *)0, __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(&it, textMap), it); -if(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(original), 0x0)) +if(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(original), 0)) (__ecereNameSpace__ecere__com__eSystem_Delete(translated), translated = 0); else __extension__ ({ @@ -608,7 +608,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = textMap, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(original)), 0x1); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(original)), 1); __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)(translated))); }); } @@ -635,7 +635,7 @@ void __ecereNameSpace__ecere__UnloadTranslatedStrings(const char * name) { struct __ecereNameSpace__ecere__com__MapIterator it = (it.container = (void *)0, it.pointer = (void *)0, __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(&it, __ecereNameSpace__ecere__moduleMaps), it); -if(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(name), 0x0)) +if(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(name), 0)) { ((void (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = ((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data((void *)&it)); @@ -658,7 +658,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = __ecereNameSpace__ecere__moduleMaps, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(name)), 0x0); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(name)), 0); ((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&__internalIterator)); })))) : (((void *)0)); const char * result = textMap ? (((const char *)(__extension__ ({ @@ -667,7 +667,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = textMap, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(stringAndContext ? stringAndContext : string)), 0x0); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(stringAndContext ? stringAndContext : string)), 0); ((char *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&__internalIterator)); })))) : string; diff --git a/compiler/bootstrap/ecere/bootstrap/instance.c b/compiler/bootstrap/ecere/bootstrap/instance.c index 506d7d3..a5363c5 100644 --- a/compiler/bootstrap/ecere/bootstrap/instance.c +++ b/compiler/bootstrap/ecere/bootstrap/instance.c @@ -58,7 +58,6 @@ typedef unsigned __int64 uint64; #define structSize_GlobalFunction (_64BIT ? 72 : 36) #define structSize_DefinedExpression (_64BIT ? 40 : 20) #define structSize_BitMember (_64BIT ? 96 : 64) -#define structSize_NamedLink (_64BIT ? 32 : 16) #define structSize_DataMember (_64BIT ? 160 : 96) #define structSize_ClassProperty (_64BIT ? 80 : 40) #define structSize_Method (_64BIT ? 96 : 52) @@ -379,7 +378,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__com__unichar_OnGetDataFromSt int nb; (*this) = __ecereNameSpace__ecere__sys__UTF8GetChar(string, &nb); -return 0x1; +return 1; } void __ecereNameSpace__ecere__com__eInstance_FireWatchers(struct __ecereNameSpace__ecere__com__Instance * instance, struct __ecereNameSpace__ecere__com__Property * _property); @@ -610,7 +609,7 @@ static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpac struct __ecereNameSpace__ecere__com__EnumClassData { struct __ecereNameSpace__ecere__sys__OldList values; -int largest; +long long largest; } __attribute__ ((gcc_struct)); static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__EnumClassData; @@ -690,9 +689,9 @@ block->prev = (((void *)0)); block->next = (((void *)0)); this->totalSize += numBlocks; this->numParts++; -return 0x1; +return 1; } -return 0x0; +return 0; } struct __ecereNameSpace__ecere__com__MemBlock * __ecereMethod___ecereNameSpace__ecere__com__BlockPool_Add(struct __ecereNameSpace__ecere__com__BlockPool * this) @@ -827,13 +826,13 @@ unsigned int __ecereNameSpace__ecere__com__pow2i(unsigned int number) return 1 << __ecereNameSpace__ecere__com__log2i(number); } -static unsigned int __ecereNameSpace__ecere__com__memoryInitialized = 0x0; +static unsigned int __ecereNameSpace__ecere__com__memoryInitialized = 0; static void __ecereNameSpace__ecere__com__InitMemory() { int c; -__ecereNameSpace__ecere__com__memoryInitialized = 0x1; +__ecereNameSpace__ecere__com__memoryInitialized = 1; __ecereNameSpace__ecere__com__pools = calloc(1, sizeof(struct __ecereNameSpace__ecere__com__BlockPool) * 31); for(c = 0; c < 31; c++) { @@ -1295,7 +1294,7 @@ for(watcher = _class->selfWatchers.first; watcher; watcher = watcher->next) if(watcher->_property == prop) watcher->_property = _property; } -_property->selfWatchable = 0x1; +_property->selfWatchable = 1; __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Delete(&_class->prop, (struct __ecereNameSpace__ecere__sys__BTNode *)link); (__ecereNameSpace__ecere__com__eSystem_Delete((void *)prop->name), prop->name = 0); (__ecereNameSpace__ecere__com__eSystem_Delete((void *)prop->dataTypeString), prop->dataTypeString = 0); @@ -1419,20 +1418,20 @@ struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSyst { int start = 0, c; struct __ecereNameSpace__ecere__com__NameSpace * nameSpace = (((void *)0)); -unsigned int force64Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 2) ? 0x1 : 0x0; -unsigned int force32Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 4) ? 0x1 : 0x0; -unsigned int inCompiler = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 8) ? 0x1 : 0x0; +unsigned int force64Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 2) ? 1 : 0; +unsigned int force32Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 4) ? 1 : 0; +unsigned int inCompiler = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 8) ? 1 : 0; unsigned int crossBits = force32Bits || force64Bits; -unsigned int fixed = 0x0; +unsigned int fixed = 0; if(inCompiler && crossBits) { struct __ecereNameSpace__ecere__com__Class * c = __ecereNameSpace__ecere__com__eSystem_FindClass(((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application, name); if(c && c->fixed) -fixed = 0x1; +fixed = 1; else if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->name && !strcmp(((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->name, "ecereCOM")) -fixed = 0x1; +fixed = 1; } { nameSpace = (declMode == 1) ? &((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->publicNameSpace : &((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->privateNameSpace; @@ -1504,7 +1503,7 @@ dataTypeString = (baseName && baseName[0]) ? baseName : "int"; else { base = __ecereNameSpace__ecere__com__eSystem_RegisterClass((int)0, baseName, (((void *)0)), 0, 0, (((void *)0)), (((void *)0)), module, declMode, 1); -base->internalDecl = 0x1; +base->internalDecl = 1; enumBase = base; base = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "enum"); } @@ -1558,7 +1557,7 @@ totalSizeClass = offsetClass + sizeClass; _class = __ecereNameSpace__ecere__com__eSystem_FindClass(module, name); if(!_class) { -const char * colons = __ecereNameSpace__ecere__sys__RSearchString(name, "::", strlen(name), 0x1, 0x0); +const char * colons = __ecereNameSpace__ecere__sys__RSearchString(name, "::", strlen(name), 1, 0); if(colons && colons) { @@ -1583,7 +1582,7 @@ if(declMode != 4) printf("error: Redefinition of class %s\n", name); else { -_class->comRedefinition = 0x1; +_class->comRedefinition = 1; return _class; } return (((void *)0)); @@ -1692,18 +1691,18 @@ templateBase = __ecereNameSpace__ecere__com__eSystem_FindClass(module, templateC if(!templateBase) { templateBase = __ecereNameSpace__ecere__com__eSystem_RegisterClass((int)0, templateClassName, (((void *)0)), 0, 0, (((void *)0)), (((void *)0)), module, declMode, 1); -templateBase->internalDecl = 0x1; +templateBase->internalDecl = 1; } base = __ecereNameSpace__ecere__com__eSystem_FindClass(module, baseName); } else { base = __ecereNameSpace__ecere__com__eSystem_RegisterClass((int)0, baseName, (((void *)0)), 0, 0, (((void *)0)), (((void *)0)), module, declMode, 1); -base->internalDecl = 0x1; +base->internalDecl = 1; } } else -_class->internalDecl = 0x0; +_class->internalDecl = 0; if(totalSizeClass) { _class->data = __ecereNameSpace__ecere__com__eSystem_Renew(_class->data, sizeof(unsigned char) * (totalSizeClass)); @@ -1827,6 +1826,8 @@ else if(!strcmp(name, "ecere::sys::Item")) size = 0; else if(!strcmp(name, "ecere::sys::NamedLink")) size = 0; +else if(!strcmp(name, "ecere::sys::NamedLink64")) +size = 0; else if(!strcmp(name, "ecere::sys::OldLink")) size = 0; else if(!strcmp(name, "ecere::sys::NamedItem")) @@ -1867,9 +1868,9 @@ _class->Destructor = Destructor; if(_class->type != 1000) _class->type = type; if(!size) -_class->computeSize = 0x1; +_class->computeSize = 1; else -_class->computeSize = 0x0; +_class->computeSize = 0; _class->inheritanceAccess = inheritanceAccess; if(type == 4) { @@ -1938,17 +1939,17 @@ __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Delete(&parentMember->mem } } -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)); -static void __ecereNameSpace__ecere__com__FreeEnumValue(struct __ecereNameSpace__ecere__sys__NamedLink * value) +static void __ecereNameSpace__ecere__com__FreeEnumValue(struct __ecereNameSpace__ecere__sys__NamedLink64 * value) { (__ecereNameSpace__ecere__com__eSystem_Delete(value->name), value->name = 0); } @@ -2236,7 +2237,7 @@ for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module { if(searchPrivate || subModule->importMode == 1) { -link = __ecereNameSpace__ecere__com__SearchModule(subModule->module, name, listOffset, 0x0); +link = __ecereNameSpace__ecere__com__SearchModule(subModule->module, name, listOffset, 0); if(link) return link; } @@ -2383,7 +2384,7 @@ name += 6; link = __ecereNameSpace__ecere__com__SearchNameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes); if(link) return link->data; -link = __ecereNameSpace__ecere__com__SearchModule(module, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes, 0x1); +link = __ecereNameSpace__ecere__com__SearchModule(module, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes, 1); if(link) return link->data; { @@ -2399,7 +2400,7 @@ else strcpy(noTemplateName, name); link = __ecereNameSpace__ecere__com__SearchNameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, noTemplateName, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes); if(!link) -link = __ecereNameSpace__ecere__com__SearchModule(module, noTemplateName, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes, 0x1); +link = __ecereNameSpace__ecere__com__SearchModule(module, noTemplateName, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes, 1); if(link) { struct __ecereNameSpace__ecere__com__Class * _class = link->data; @@ -2411,7 +2412,7 @@ strcat(className, templateParams); link = __ecereNameSpace__ecere__com__SearchNameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, className, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes); if(link) return link->data; -link = __ecereNameSpace__ecere__com__SearchModule(module, className, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes, 0x1); +link = __ecereNameSpace__ecere__com__SearchModule(module, className, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).classes, 1); if(link) return link->data; if(_class && templateParams) @@ -3081,21 +3082,21 @@ c--; unsigned int __ecereNameSpace__ecere__com__DefaultFunction() { -return 0x1; +return 1; } unsigned int __ecereNameSpace__ecere__com__eClass_IsDerived(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class * from) { if(!_class && !from) -return 0x1; +return 1; if(_class && from && (_class->templateClass || from->templateClass)) { if(__ecereNameSpace__ecere__com__eClass_IsDerived(_class->templateClass ? _class->templateClass : _class, from->templateClass ? from->templateClass : from)) { if(!from->templateClass) -return 0x1; +return 1; else if(!_class->templateClass && _class == from->templateClass) -return 0x0; +return 0; else { struct __ecereNameSpace__ecere__com__Class * sClass; @@ -3132,10 +3133,10 @@ break; } } if(param) -return 0x0; +return 0; } } -return 0x1; +return 1; } } } @@ -3144,10 +3145,10 @@ else for(; _class && from; _class = _class->base) { if(_class == from || _class->templateClass == from || ((_class->type == 1000 || (_class->type == 0 && _class->isInstanceClass)) && from->name && !strcmp(_class->name, from->name))) -return 0x1; +return 1; } } -return 0x0; +return 0; } static void __ecereNameSpace__ecere__com__FixDerivativeVirtualMethod(struct __ecereNameSpace__ecere__com__Class * base, const char * name, int vid, void * origFunction, const char * type) @@ -3347,7 +3348,7 @@ for(watcher = _class->selfWatchers.first; watcher; watcher = watcher->next) if(watcher->_property == prop) watcher->_property = _property; } -_property->selfWatchable = 0x1; +_property->selfWatchable = 1; (__ecereNameSpace__ecere__com__eSystem_Delete((void *)prop->name), prop->name = 0); (__ecereNameSpace__ecere__com__eSystem_Delete((void *)prop->dataTypeString), prop->dataTypeString = 0); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Delete(&_class->membersAndProperties, prop); @@ -3369,12 +3370,12 @@ struct __ecereNameSpace__ecere__com__Property * _property = (((void *)0)); if(_class) { struct __ecereNameSpace__ecere__com__BTNamedLink * link = (struct __ecereNameSpace__ecere__com__BTNamedLink *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_FindString(&_class->prop, name ? name : dataType); -unsigned int isConversion = name ? 0x0 : 0x1; +unsigned int isConversion = name ? 0 : 1; if(!name && dataType && !strncmp(dataType, "const ", 6)) { name = dataType + 6; -isConversion = 0x1; +isConversion = 1; } if(link) _property = link->data; @@ -3383,7 +3384,7 @@ if(!_property) _property = __extension__ ({ struct __ecereNameSpace__ecere__com__Property * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_Property); -__ecereInstance1->isProperty = 0x1, __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(name ? name : dataType), __ecereInstance1->id = (name && (setStmt || getStmt || dataType)) ? _class->memberID++ : 0, __ecereInstance1->Set = setStmt, __ecereInstance1->Get = getStmt, __ecereInstance1->dataTypeString = __ecereNameSpace__ecere__sys__CopyString(dataType), __ecereInstance1->_class = _class, __ecereInstance1->compiled = 0x1, __ecereInstance1->conversion = isConversion, __ecereInstance1->memberAccess = declMode, __ecereInstance1; +__ecereInstance1->isProperty = 1, __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(name ? name : dataType), __ecereInstance1->id = (name && (setStmt || getStmt || dataType)) ? _class->memberID++ : 0, __ecereInstance1->Set = setStmt, __ecereInstance1->Get = getStmt, __ecereInstance1->dataTypeString = __ecereNameSpace__ecere__sys__CopyString(dataType), __ecereInstance1->_class = _class, __ecereInstance1->compiled = 1, __ecereInstance1->conversion = isConversion, __ecereInstance1->memberAccess = declMode, __ecereInstance1; }); if(!isConversion) __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&_class->membersAndProperties, _property); @@ -3403,16 +3404,6 @@ __ecereNameSpace__ecere__com__FixDerivativeProperty(_class, _property); return _property; } -extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64; - -struct __ecereNameSpace__ecere__sys__NamedLink64 -{ -struct __ecereNameSpace__ecere__sys__NamedLink64 * prev; -struct __ecereNameSpace__ecere__sys__NamedLink64 * next; -char * name; -long long data; -} __attribute__ ((gcc_struct)); - static void __ecereNameSpace__ecere__com__SetDelayedCPValues(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__ClassProperty * _property) { struct __ecereNameSpace__ecere__sys__OldLink * deriv; @@ -3546,7 +3537,7 @@ _class = _class->templateClass; if(_class->base && from != _class->base) { if(!__ecereNameSpace__ecere__com__ConstructInstance(instance, _class->base, from)) -return 0x0; +return 0; } if(_class->Initialize) { @@ -3566,11 +3557,11 @@ _class = _class->templateClass; if(_class->Destructor) _class->Destructor(instance); } -return 0x0; +return 0; } } (_class->templateClass ? _class->templateClass : _class)->count++; -return 0x1; +return 1; } void * __ecereNameSpace__ecere__com__eInstance_New(struct __ecereNameSpace__ecere__com__Class * _class) @@ -3582,8 +3573,8 @@ if(_class) { int size = _class->structSize; int flags = ((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)_class->module + structSize_Instance)))->application + structSize_Module)))->isGUIApp; -unsigned int inCompiler = (flags & 8) ? 0x1 : 0x0; -unsigned int force32Bits = (flags & 4) ? 0x1 : 0x0; +unsigned int inCompiler = (flags & 8) ? 1 : 0; +unsigned int force32Bits = (flags & 4) ? 1 : 0; if(force32Bits && inCompiler) { @@ -3614,7 +3605,7 @@ void __ecereNameSpace__ecere__com__eInstance_Evolve(struct __ecereNameSpace__ece { if(_class && instancePtr && *instancePtr) { -unsigned int wasApp = 0x0, wasGuiApp = 0x0; +unsigned int wasApp = 0, wasGuiApp = 0; struct __ecereNameSpace__ecere__com__Instance * instance = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com__eSystem_Renew(*instancePtr, sizeof(unsigned char) * (_class->structSize)); struct __ecereNameSpace__ecere__com__Class * fromClass = ((struct __ecereNameSpace__ecere__com__Instance *)(char *)instance)->_class; @@ -4123,10 +4114,10 @@ struct __ecereNameSpace__ecere__com__Class * _class = ((struct __ecereNameSpace_ for(; _class; _class = _class->base) { if(_class == from) -return 0x1; +return 1; } } -return 0x0; +return 0; } void __ecereNameSpace__ecere__com__eInstance_IncRef(struct __ecereNameSpace__ecere__com__Instance * instance) @@ -4263,7 +4254,7 @@ if(dataMember->name && __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Fi { __ecereNameSpace__ecere__com__DataMember_Free(dataMember); ((dataMember ? (__ecereClass___ecereNameSpace__ecere__com__DataMember->Destructor ? __ecereClass___ecereNameSpace__ecere__com__DataMember->Destructor((void *)dataMember) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(dataMember)) : 0), dataMember = 0); -return 0x0; +return 0; } __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&addTo->members, dataMember); if(dataMember->name) @@ -4295,7 +4286,7 @@ addTo->memberOffset = dataMember->memberOffset; } else addTo->memberOffset += dataMember->memberOffset; -return 0x1; +return 1; } unsigned int __ecereNameSpace__ecere__com__eClass_AddMember(struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__DataMember * dataMember) @@ -4306,7 +4297,7 @@ if(!_class || _class->comRedefinition || (dataMember->name && __ecereMethod___ec { __ecereNameSpace__ecere__com__DataMember_Free(dataMember); ((dataMember ? (__ecereClass___ecereNameSpace__ecere__com__DataMember->Destructor ? __ecereClass___ecereNameSpace__ecere__com__DataMember->Destructor((void *)dataMember) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(dataMember)) : 0), dataMember = 0); -return 0x0; +return 0; } __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&_class->membersAndProperties, dataMember); if(dataMember->name) @@ -4332,7 +4323,7 @@ _class->memberOffset += dataMember->structAlignment - (_class->memberOffset % da } dataMember->offset = _class->memberOffset; _class->memberOffset += dataMember->memberOffset; -return 0x1; +return 1; } struct __ecereNameSpace__ecere__com__BitMember * __ecereNameSpace__ecere__com__eClass_AddBitMember(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, int bitSize, int bitPos, int declMode) @@ -4499,12 +4490,12 @@ return module; struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__com__eModule_Load(struct __ecereNameSpace__ecere__com__Instance * fromModule, const char * name, int importAccess) { -return __ecereNameSpace__ecere__com__Module_Load(fromModule, name, importAccess, 0x1); +return __ecereNameSpace__ecere__com__Module_Load(fromModule, name, importAccess, 1); } struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__com__eModule_LoadStrict(struct __ecereNameSpace__ecere__com__Instance * fromModule, const char * name, int importAccess) { -return __ecereNameSpace__ecere__com__Module_Load(fromModule, name, importAccess, 0x0); +return __ecereNameSpace__ecere__com__Module_Load(fromModule, name, importAccess, 0); } struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__com__eModule_LoadStatic(struct __ecereNameSpace__ecere__com__Instance * fromModule, const char * name, int importAccess, unsigned int (* Load)(struct __ecereNameSpace__ecere__com__Instance * module), unsigned int (* Unload)(struct __ecereNameSpace__ecere__com__Instance * module)) @@ -4564,12 +4555,12 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Delete(&((struct __ecereName } } -void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value) +void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value) { if(_class && _class->type == 4) { struct __ecereNameSpace__ecere__com__EnumClassData * data = (struct __ecereNameSpace__ecere__com__EnumClassData *)_class->data; -struct __ecereNameSpace__ecere__sys__NamedLink * item; +struct __ecereNameSpace__ecere__sys__NamedLink64 * item; for(item = data->values.first; item; item = item->next) if(!strcmp(item->name, string)) @@ -4577,9 +4568,9 @@ break; if(!item) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&data->values, __extension__ ({ -struct __ecereNameSpace__ecere__sys__NamedLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink); +struct __ecereNameSpace__ecere__sys__NamedLink64 * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64); -__ecereInstance1->data = (void *)value, __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1; +__ecereInstance1->data = value, __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1; })); if(value > data->largest) data->largest = value; @@ -4587,13 +4578,13 @@ data->largest = value; } } -int __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string) +long long __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string) { if(_class && _class->type == 4) { struct __ecereNameSpace__ecere__com__EnumClassData * data = (struct __ecereNameSpace__ecere__com__EnumClassData *)_class->data; -int value = data->largest + 1; -struct __ecereNameSpace__ecere__sys__NamedLink * item; +long long value = data->largest + 1; +struct __ecereNameSpace__ecere__sys__NamedLink64 * item; for(item = data->values.first; item; item = item->next) if(!strcmp(item->name, string)) @@ -4601,9 +4592,9 @@ break; if(!item) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&data->values, __extension__ ({ -struct __ecereNameSpace__ecere__sys__NamedLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink); +struct __ecereNameSpace__ecere__sys__NamedLink64 * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64); -__ecereInstance1->data = (void *)value, __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1; +__ecereInstance1->data = value, __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1; })); if(value > data->largest) data->largest = value; @@ -4629,7 +4620,7 @@ static void __ecereNameSpace__ecere__com__Application_Destructor(struct __ecereN { if(((struct __ecereNameSpace__ecere__com__Application *)(((char *)app + structSize_Module)))->parsedCommand) { -(__ecereNameSpace__ecere__com__eSystem_Delete(((struct __ecereNameSpace__ecere__com__Application *)(((char *)app + structSize_Module)))->argv), ((struct __ecereNameSpace__ecere__com__Application * )(((char * )app + structSize_Module)))->argv = 0); +(__ecereNameSpace__ecere__com__eSystem_Delete((void *)((struct __ecereNameSpace__ecere__com__Application *)(((char *)app + structSize_Module)))->argv), ((struct __ecereNameSpace__ecere__com__Application * )(((char * )app + structSize_Module)))->argv = 0); (__ecereNameSpace__ecere__com__eSystem_Delete(((struct __ecereNameSpace__ecere__com__Application *)(((char *)app + structSize_Module)))->parsedCommand), ((struct __ecereNameSpace__ecere__com__Application * )(((char * )app + structSize_Module)))->parsedCommand = 0); } } @@ -4927,7 +4918,7 @@ struct __ecereNameSpace__ecere__com__BTNamedLink * link; link = __ecereNameSpace__ecere__com__SearchNameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).defines); if(link) return link->data; -link = __ecereNameSpace__ecere__com__SearchModule(module, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).defines, 0x1); +link = __ecereNameSpace__ecere__com__SearchModule(module, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).defines, 1); if(link) return link->data; } @@ -4943,7 +4934,7 @@ struct __ecereNameSpace__ecere__com__BTNamedLink * link; link = __ecereNameSpace__ecere__com__SearchNameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).functions); if(link) return link->data; -link = __ecereNameSpace__ecere__com__SearchModule(module, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).functions, 0x1); +link = __ecereNameSpace__ecere__com__SearchModule(module, name, &(*((struct __ecereNameSpace__ecere__com__NameSpace *)0)).functions, 1); if(link) return link->data; } @@ -5003,8 +4994,8 @@ if(instance && _property && _property->isWatchable) struct __ecereNameSpace__ecere__com__Instance * module = ((struct __ecereNameSpace__ecere__com__Instance *)(char *)instance)->_class ? ((struct __ecereNameSpace__ecere__com__Instance *)(char *)instance)->_class->module : (((void *)0)); struct __ecereNameSpace__ecere__com__Instance * application = module ? ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application : (((void *)0)); int flags = application ? ((struct __ecereNameSpace__ecere__com__Application *)(((char *)application + structSize_Module)))->isGUIApp : 0; -unsigned int inCompiler = (flags & 8) ? 0x1 : 0x0; -unsigned int force32Bits = (flags & 4) ? 0x1 : 0x0; +unsigned int inCompiler = (flags & 8) ? 1 : 0; +unsigned int force32Bits = (flags & 4) ? 1 : 0; if(!force32Bits || !inCompiler) { @@ -5032,7 +5023,7 @@ _property->watcherOffset = _class->structSize; _class->structSize += sizeof(struct __ecereNameSpace__ecere__sys__OldList); __ecereNameSpace__ecere__com__FixDerivativesBase(_class, _class); } -_property->isWatchable = 0x1; +_property->isWatchable = 1; } } @@ -5059,7 +5050,7 @@ struct __ecereNameSpace__ecere__com__SelfWatcher * __ecereInstance1 = __ecereNam __ecereInstance1->_property = _property, __ecereInstance1->callback = callback, __ecereInstance1; })); -_property->selfWatchable = 0x1; +_property->selfWatchable = 1; } } @@ -5262,9 +5253,9 @@ extern int isprint(int c); static void __ecereNameSpace__ecere__com__LoadCOM(struct __ecereNameSpace__ecere__com__Instance * module) { -unsigned int force64Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 2) ? 0x1 : 0x0; -unsigned int force32Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 4) ? 0x1 : 0x0; -unsigned int inCompiler = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 8) ? 0x1 : 0x0; +unsigned int force64Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 2) ? 1 : 0; +unsigned int force32Bits = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 4) ? 1 : 0; +unsigned int inCompiler = (((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application + structSize_Module)))->isGUIApp & 8) ? 1 : 0; int pointerSize = force64Bits ? 8 : force32Bits ? 4 : sizeof(void *); struct __ecereNameSpace__ecere__com__Class * applicationClass; struct __ecereNameSpace__ecere__com__Class * enumClass, * structClass, * boolClass; @@ -5280,8 +5271,8 @@ baseClass->typeSize = 0; struct __ecereNameSpace__ecere__com__Class * instanceClass = __ecereNameSpace__ecere__com__eSystem_RegisterClass(0, "ecere::com::Instance", (((void *)0)), 0, 0, (((void *)0)), (((void *)0)), module, 4, 1); instanceClass->type = 0; -instanceClass->isInstanceClass = 0x1; -instanceClass->fixed = 0x1; +instanceClass->isInstanceClass = 1; +instanceClass->fixed = 1; instanceClass->memberOffset = 0; instanceClass->offset = 0; instanceClass->memberID = -3; @@ -5292,7 +5283,7 @@ __ecereNameSpace__ecere__com__eClass_AddDataMember(instanceClass, "_refCount", " } __ecereNameSpace__ecere__com__InitializeDataTypes1(module); enumClass = __ecereNameSpace__ecere__com__eSystem_RegisterClass(0, "enum", (((void *)0)), 0, force64Bits ? 40 : sizeof(struct __ecereNameSpace__ecere__com__EnumClassData), (((void *)0)), (((void *)0)), module, 4, 1); -__ecereNameSpace__ecere__com__eClass_AddClassProperty(enumClass, "enumSize", "int", (((void *)0)), __ecereNameSpace__ecere__com__GetEnumSize)->constant = 0x1; +__ecereNameSpace__ecere__com__eClass_AddClassProperty(enumClass, "enumSize", "int", (((void *)0)), __ecereNameSpace__ecere__com__GetEnumSize)->constant = 1; enumClass->type = 1000; (__ecereNameSpace__ecere__com__eSystem_Delete((void *)enumClass->dataTypeString), enumClass->dataTypeString = 0); enumClass->dataTypeString = __ecereNameSpace__ecere__sys__CopyString("int"); @@ -5325,7 +5316,7 @@ __ecereNameSpace__ecere__com__eClass_AddDataMember(moduleClass, "importType", "I __ecereNameSpace__ecere__com__eClass_AddDataMember(moduleClass, "origImportType", "ImportType", sizeof(int), 4, 1); __ecereNameSpace__ecere__com__eClass_AddDataMember(moduleClass, "privateNameSpace", "NameSpace", force64Bits ? (32 + 8 + 8 + 4 * 32) : force32Bits ? (16 + 4 + 4 + 4 * 16) : sizeof(struct __ecereNameSpace__ecere__com__NameSpace), pointerSize, 1); __ecereNameSpace__ecere__com__eClass_AddDataMember(moduleClass, "publicNameSpace", "NameSpace", force64Bits ? (32 + 8 + 8 + 4 * 32) : force32Bits ? (16 + 4 + 4 + 4 * 16) : sizeof(struct __ecereNameSpace__ecere__com__NameSpace), pointerSize, 1); -moduleClass->fixed = 0x1; +moduleClass->fixed = 1; moduleClass->count++; if(inCompiler && force32Bits) moduleClass->structSize = 12 + 4 + 20 + 20 + 20 + 20 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + (16 + 4 + 4 + 4 * 16) + (16 + 4 + 4 + 4 * 16); @@ -5343,7 +5334,7 @@ __ecereNameSpace__ecere__com__eClass_AddDataMember(applicationClass, "isGUIApp", __ecereNameSpace__ecere__com__eClass_AddDataMember(applicationClass, "allModules", "OldList", force64Bits ? 32 : force32Bits ? 20 : sizeof(struct __ecereNameSpace__ecere__sys__OldList), pointerSize, 1); __ecereNameSpace__ecere__com__eClass_AddDataMember(applicationClass, "parsedCommand", "char *", pointerSize, pointerSize, 1); __ecereNameSpace__ecere__com__eClass_AddDataMember(applicationClass, "systemNameSpace", "NameSpace", force64Bits ? (32 + 8 + 8 + 4 * 32) : force32Bits ? (16 + 4 + 4 + 4 * 16) : sizeof(struct __ecereNameSpace__ecere__com__NameSpace), pointerSize, 1); -applicationClass->fixed = 0x1; +applicationClass->fixed = 1; applicationClass->count++; __ecereNameSpace__ecere__com__eSystem_RegisterFunction("sin", "double sin(Angle number)", sin, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("sinh", "double sinh(Angle number)", sinh, module, 4); @@ -5370,6 +5361,9 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("exp", "double exp(double __ecereNameSpace__ecere__com__eSystem_RegisterFunction("qsort", "void qsort(void *, uintsize, uintsize, int (*)(void *, void *))", qsort, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtod", "double strtod(const char*, char**)", strtod, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtol", "int strtol(const char*, char**, int base)", strtol, module, 4); +__ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtoul", "unsigned long strtoul(const char * nptr, char ** endptr, int base)", strtoul, module, 4); +__ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtoll", "int64 strtoll(const char * nptr, char ** endptr, int base)", strtoll, module, 4); +__ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtoull", "uint64 strtoull(const char * nptr, char ** endptr, int base)", strtoull, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("system", "int system(const char*)", system, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("atoi", "int atoi(const char*)", atoi, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("atof", "double atof(const char*)", atof, module, 4); @@ -5414,9 +5408,6 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("isalpha", "int isalpha(i __ecereNameSpace__ecere__com__eSystem_RegisterFunction("islower", "int islower(int c)", islower, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("isupper", "int isupper(int c)", isupper, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("isprint", "int isprint(int c)", isprint, module, 4); -__ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtoul", "unsigned long strtoul(const char * nptr, char ** endptr, int base)", strtoul, module, 4); -__ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtoll", "int64 strtoll(const char * nptr, char ** endptr, int base)", strtoul, module, 4); -__ecereNameSpace__ecere__com__eSystem_RegisterFunction("strtoull", "uint64 strtoull(const char * nptr, char ** endptr, int base)", strtoul, module, 4); } struct __ecereNameSpace__ecere__com__Instance * __ecereNameSpace__ecere__com____ecere_COM_Initialize(unsigned int guiApp, int argc, char * argv[]) @@ -5755,14 +5746,14 @@ mask >>= 1; if(ch & (unsigned char)0x10) { if(ch & (unsigned char)0x08) -return 0x0; +return 0; numBytes++; mask >>= 1; } } } else -return 0x0; +return 0; } for(i = 0; i < numBytes && (ch = source[c]); i++, c++) { @@ -5772,16 +5763,16 @@ mask = (unsigned char)0x3F; if(i > 1) { if(!(ch & (unsigned char)0x80) || (ch & (unsigned char)0x40)) -return 0x0; +return 0; } } if(i < numBytes) -return 0x0; +return 0; if(codePoint > 0x10FFFF || (codePoint >= 0xD800 && codePoint <= 0xDFFF) || (codePoint < 0x80 && numBytes > 1) || (codePoint < 0x800 && numBytes > 2) || (codePoint < 0x10000 && numBytes > 3)) -return 0x0; +return 0; } } -return 0x1; +return 1; } int __ecereNameSpace__ecere__sys__ISO8859_1toUTF8(const char * source, char * dest, int max) @@ -5841,7 +5832,7 @@ int d = 0; int len; char * dest; unsigned short u16; -unsigned int invert = 0x0; +unsigned int invert = 0; for(len = 0; source[len]; len++) ; @@ -5853,7 +5844,7 @@ unsigned int ch; if(!c && (u16 == (unsigned short)0xFFFE || u16 == (unsigned short)0xFEFF)) { if(u16 == (unsigned short)0xFFFE) -invert = 0x1; +invert = 1; continue; } if(invert) @@ -6566,7 +6557,7 @@ class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "ecere::com::Enum if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class) __ecereClass___ecereNameSpace__ecere__com__EnumClassData = class; __ecereNameSpace__ecere__com__eClass_AddDataMember(class, "values", "ecere::sys::OldList", structSize_OldList, arch_PointerSize, 1); -__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "largest", "int", 4, 4, 1); +__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "largest", "int64", 8, 8, 1); if(class) class->fixed = (unsigned int)1; class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "ecere::com::Watcher", 0, sizeof(struct __ecereNameSpace__ecere__com__Watcher), 0, 0, 0, module, 2, 1); @@ -6637,8 +6628,8 @@ __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eModule_Load __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eModule_LoadStrict", "ecere::com::Module ecere::com::eModule_LoadStrict(ecere::com::Module fromModule, const char * name, ecere::com::AccessMode importAccess)", __ecereNameSpace__ecere__com__eModule_LoadStrict, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eModule_LoadStatic", "ecere::com::Module ecere::com::eModule_LoadStatic(ecere::com::Module fromModule, const char * name, ecere::com::AccessMode importAccess, bool (* Load)(ecere::com::Module module), bool (* Unload)(ecere::com::Module module))", __ecereNameSpace__ecere__com__eModule_LoadStatic, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eModule_Unload", "void ecere::com::eModule_Unload(ecere::com::Module fromModule, ecere::com::Module module)", __ecereNameSpace__ecere__com__eModule_Unload, module, 4); -__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eEnum_AddFixedValue", "void ecere::com::eEnum_AddFixedValue(ecere::com::Class _class, const char * string, int value)", __ecereNameSpace__ecere__com__eEnum_AddFixedValue, module, 4); -__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eEnum_AddValue", "int ecere::com::eEnum_AddValue(ecere::com::Class _class, const char * string)", __ecereNameSpace__ecere__com__eEnum_AddValue, module, 4); +__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eEnum_AddFixedValue", "void ecere::com::eEnum_AddFixedValue(ecere::com::Class _class, const char * string, int64 value)", __ecereNameSpace__ecere__com__eEnum_AddFixedValue, module, 4); +__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eEnum_AddValue", "int64 ecere::com::eEnum_AddValue(ecere::com::Class _class, const char * string)", __ecereNameSpace__ecere__com__eEnum_AddValue, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eSystem_RegisterDefine", "ecere::com::DefinedExpression ecere::com::eSystem_RegisterDefine(const char * name, const char * value, ecere::com::Module module, ecere::com::AccessMode declMode)", __ecereNameSpace__ecere__com__eSystem_RegisterDefine, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eSystem_RegisterFunction", "ecere::com::GlobalFunction ecere::com::eSystem_RegisterFunction(const char * name, const char * type, void * func, ecere::com::Module module, ecere::com::AccessMode declMode)", __ecereNameSpace__ecere__com__eSystem_RegisterFunction, module, 4); __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::com::eSystem_FindDefine", "ecere::com::DefinedExpression ecere::com::eSystem_FindDefine(ecere::com::Module module, const char * name)", __ecereNameSpace__ecere__com__eSystem_FindDefine, module, 4); diff --git a/compiler/bootstrap/ecp/bootstrap/ecp.c b/compiler/bootstrap/ecp/bootstrap/ecp.c index 8203dcb..80d4630 100644 --- a/compiler/bootstrap/ecp/bootstrap/ecp.c +++ b/compiler/bootstrap/ecp/bootstrap/ecp.c @@ -1150,7 +1150,7 @@ break; } } -static unsigned int globalInstance = 0x0; +static unsigned int globalInstance = 0; static struct Context * globalContext; @@ -1322,7 +1322,7 @@ FreeExpression(posExp); d->__anon1.structDecl.exp = (((void *)0)); d->__anon1.structDecl.posExp = (((void *)0)); dataType = ProcessType(decl->__anon1.__anon1.specifiers, d); -PrintType(dataType, dataTypeString, 0x0, 0x1); +PrintType(dataType, dataTypeString, 0, 1); { struct __ecereNameSpace__ecere__com__BitMember * member = __ecereNameSpace__ecere__com__eClass_AddBitMember(regClass, declId->string, dataTypeString, 0, 0, def->memberAccess); @@ -1343,7 +1343,7 @@ char typeString[1024]; typeString[0] = '\0'; dataType = ProcessType(decl->__anon1.__anon1.specifiers, d); -PrintType(dataType, typeString, 0x0, 0x1); +PrintType(dataType, typeString, 0, 1); if(member) dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, declId->string, typeString, 0, 0, def->memberAccess); else @@ -1391,7 +1391,7 @@ typeString[0] = '\0'; spec->__anon1.__anon2.id = (((void *)0)); decl->__anon1.__anon1.declarators = MkListOne(MkDeclaratorIdentifier(id)); dataType = ProcessType(decl->__anon1.__anon1.specifiers, (((void *)0))); -PrintType(dataType, typeString, 0x0, 0x1); +PrintType(dataType, typeString, 0, 1); if(member) dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, id->string, typeString, 0, 0, def->memberAccess); else @@ -1449,7 +1449,7 @@ prop = __ecereNameSpace__ecere__com__eClass_AddProperty(regClass, propertyDef->_ if(prop) { prop->IsSet = (void *)propertyDef->issetStmt; -prop->compiled = 0x0; +prop->compiled = 0; } (__ecereNameSpace__ecere__com__eSystem_Delete(dataTypeString), dataTypeString = 0); } @@ -1465,7 +1465,7 @@ propertyDef->symbol->type->refCount++; propDefine = __extension__ ({ struct PropertyDefine * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyDefine); -__ecereInstance1->isProperty = 1, __ecereInstance1->name = prop->conversion ? (((void *)0)) : __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->type = __ecereNameSpace__ecere__sys__CopyString(prop->dataTypeString), __ecereInstance1->isVirtual = 0x0, __ecereInstance1->memberAccess = def->memberAccess, __ecereInstance1->hasSet = propertyDef->setStmt ? 0x1 : 0x0, __ecereInstance1->hasGet = propertyDef->getStmt ? 0x1 : 0x0, __ecereInstance1->isWatchable = propertyDef->__anon1.isWatchable, __ecereInstance1; +__ecereInstance1->isProperty = 1, __ecereInstance1->name = prop->conversion ? (((void *)0)) : __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->type = __ecereNameSpace__ecere__sys__CopyString(prop->dataTypeString), __ecereInstance1->isVirtual = 0, __ecereInstance1->memberAccess = def->memberAccess, __ecereInstance1->hasSet = propertyDef->setStmt ? 1 : 0, __ecereInstance1->hasGet = propertyDef->getStmt ? 1 : 0, __ecereInstance1->isWatchable = propertyDef->__anon1.isWatchable, __ecereInstance1; }); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classDefine->propertiesAndMembers, propDefine); } @@ -1490,7 +1490,7 @@ if(prop) propDefine = __extension__ ({ struct PropertyDefine * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyDefine); -__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->type = __ecereNameSpace__ecere__sys__CopyString(prop->dataTypeString), __ecereInstance1->hasSet = propertyDef->setStmt ? 0x1 : 0x0, __ecereInstance1->hasGet = propertyDef->getStmt ? 0x1 : 0x0, __ecereInstance1; +__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->type = __ecereNameSpace__ecere__sys__CopyString(prop->dataTypeString), __ecereInstance1->hasSet = propertyDef->setStmt ? 1 : 0, __ecereInstance1->hasGet = propertyDef->getStmt ? 1 : 0, __ecereInstance1; }); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classDefine->classProperties, propDefine); } @@ -1499,12 +1499,12 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classDefine->classPrope else if(def->type == 7) { if(classDefine) -classDefine->fixed = 0x1; +classDefine->fixed = 1; } else if(def->type == 6) { if(classDefine) -classDefine->noExpansion = 0x1; +classDefine->noExpansion = 1; } else if(def->type == 13) { @@ -1648,8 +1648,8 @@ struct __ecereNameSpace__ecere__com__Class * regClass; struct ClassDef * def; struct ClassDefine * classDefine; char baseName[1024]; -unsigned int unitType = 0x0; -unsigned int wouldBeEnum = 0x0; +unsigned int unitType = 0; +unsigned int wouldBeEnum = 0; int inheritanceAccess = 1; baseName[0] = '\0'; @@ -1657,7 +1657,7 @@ if(baseSpecs != (((void *)0))) { struct Type * baseType = ProcessType(baseSpecs, (((void *)0))); -PrintType(baseType, baseName, 0x0, 0x1); +PrintType(baseType, baseName, 0, 1); if(baseType->kind == 8) { if(baseType->__anon1._class->__anon1.registered && classType == 0) @@ -1670,7 +1670,7 @@ else if(baseType->__anon1._class->__anon1.registered->type == 5) classType = 5; else if(baseType->__anon1._class->__anon1.registered->type == 4) { -wouldBeEnum = 0x1; +wouldBeEnum = 1; } } } @@ -1680,7 +1680,7 @@ classType = 5; baseName[0] = '\0'; } else -unitType = 0x1; +unitType = 1; FreeType(baseType); if(((struct Specifier *)baseSpecs->first)->type == 0 && ((struct Specifier *)baseSpecs->first)->__anon1.specifier == PRIVATE) inheritanceAccess = 2; @@ -1888,25 +1888,25 @@ __ecereNameSpace__ecere__com__eClass_AddTemplateParameter(regClass, param->ident extern void SetParsingType(unsigned int b); -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 int strcmp(const char * , const char * ); extern void FreeExpContents(struct Expression * exp); -extern char * PrintUInt(uint64 result); +extern char * PrintInt64(long long result); extern struct Type * ProcessTypeString(const char * string, unsigned int staticMethod); -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); extern void PrintExpression(struct Expression * exp, char * string); @@ -1916,7 +1916,7 @@ extern const char * __ecereNameSpace__ecere__GetTranslatedString(const char * n extern struct __ecereNameSpace__ecere__com__Instance * __thisModule; -extern int __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string); +extern long long __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string); extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Application; @@ -1943,12 +1943,12 @@ for(e = enumValues->first; e; e = e->next) { if(e->exp) { -struct Type * destType = (destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), destType->kind = 3, destType->refCount = 1, destType); +struct Type * destType = (destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), destType->kind = 4, destType->refCount = 1, destType); e->exp->destType = destType; -SetParsingType(0x1); +SetParsingType(1); ProcessExpressionType(e->exp); -SetParsingType(0x0); +SetParsingType(0); if(!e->exp->expType) { destType->kind = 8; @@ -1959,7 +1959,7 @@ if(e->exp->isConstant) { if(e->exp->type == 0 && e->exp->expType && e->exp->__anon1.__anon1.identifier && e->exp->__anon1.__anon1.identifier->string && e->exp->expType->kind == 15) { -struct __ecereNameSpace__ecere__sys__NamedLink * l; +struct __ecereNameSpace__ecere__sys__NamedLink64 * l; char * string = e->exp->__anon1.__anon1.identifier->string; for(l = e->exp->expType->__anon1.__anon1.members.first; l; l = l->next) @@ -1970,9 +1970,9 @@ if(l->data) { FreeExpContents(e->exp); e->exp->type = 2; -e->exp->__anon1.__anon1.constant = PrintUInt((unsigned int)l->data); +e->exp->__anon1.__anon1.constant = PrintInt64(l->data); FreeType(e->exp->expType); -e->exp->expType = ProcessTypeString("uint", 0x0); +e->exp->expType = ProcessTypeString("int64", 0); } break; } @@ -1984,18 +1984,22 @@ ComputeExpression(e->exp); if(e->exp->isConstant && e->exp->type == 2) { struct Operand op = GetOperand(e->exp); -int value; +long long value; switch(op.kind) { case 1: -value = op.type->isSigned ? (int)op.__anon1.c : (int)op.__anon1.uc; +value = op.type->isSigned ? (long long)op.__anon1.c : (long long)op.__anon1.uc; break; case 2: -value = op.type->isSigned ? (int)op.__anon1.s : (int)op.__anon1.us; +value = op.type->isSigned ? (long long)op.__anon1.s : (long long)op.__anon1.us; +break; +case 4: +value = op.type->isSigned ? op.__anon1.i64 : (long long)op.__anon1.ui64; break; +case 3: default: -value = op.__anon1.i; +value = op.type->isSigned ? (long long)op.__anon1.i : (int)op.__anon1.ui; } __ecereNameSpace__ecere__com__eEnum_AddFixedValue(regClass, e->id->string, value); } @@ -2072,7 +2076,7 @@ else if(specifier->type == 4) classType = 6; else classType = 1; -ProcessClass(classType, specifier->__anon1.__anon2.definitions, symbol, specifier->__anon1.__anon2.baseSpecs, specifier->__anon1.__anon2.list, 0x0, external->__anon1.declaration->declMode); +ProcessClass(classType, specifier->__anon1.__anon2.definitions, symbol, specifier->__anon1.__anon2.baseSpecs, specifier->__anon1.__anon2.list, 0, external->__anon1.declaration->declMode); } } } @@ -2095,7 +2099,7 @@ struct DataDefine * dataDefine; char typeString[1024]; typeString[0] = '\0'; -PrintType(symbol->type, typeString, 0x0, 0x1); +PrintType(symbol->type, typeString, 0, 1); dataDefine = __extension__ ({ struct DataDefine * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DataDefine); @@ -2121,7 +2125,7 @@ struct DataDefine * dataDefine; char typeString[1024]; typeString[0] = '\0'; -PrintType(symbol->type, typeString, 0x0, 0x1); +PrintType(symbol->type, typeString, 0, 1); dataDefine = __extension__ ({ struct DataDefine * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_DataDefine); @@ -2130,7 +2134,7 @@ __ecereInstance1->type = 4, __ecereInstance1->name = __ecereNameSpace__ecere__sy __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&precompDefines, dataDefine); } } -globalInstance = 0x1; +globalInstance = 1; } else if(declaration->type == 3) { @@ -2149,7 +2153,7 @@ struct FunctionDefine * functionDefine; char typeString[1024]; typeString[0] = '\0'; -PrintType(function->declarator->symbol->type, typeString, 0x1, 0x1); +PrintType(function->declarator->symbol->type, typeString, 1, 1); functionDefine = __extension__ ({ struct FunctionDefine * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionDefine); @@ -2324,9 +2328,11 @@ extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpac struct __ecereNameSpace__ecere__com__EnumClassData { struct __ecereNameSpace__ecere__sys__OldList values; -int largest; +long long largest; } __attribute__ ((gcc_struct)); +extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void); + extern void OutputExpression(struct Expression * exp, struct __ecereNameSpace__ecere__com__Instance * f); int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts; @@ -2500,14 +2506,19 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " .\n"); OutputDataMembers(classDefine, _class, f); if(_class->type == 4) { -struct __ecereNameSpace__ecere__sys__NamedLink * value; +struct __ecereNameSpace__ecere__sys__NamedLink64 * value; struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum"); struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0))); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " [Enum Values]\n"); for(value = e->values.first; value; value = value->next) { -__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " %s = %d\n", value->name, value->data); +__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " %s = ", value->name); +if(!strcmp(_class->dataTypeString, "uint64") && *(uint64 *)&value->data > (((long long)0x7fffffffffffffffLL))) +__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), *(uint64 *)&value->data); +else +__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), value->data); +__ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "\n"); } __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " .\n"); } @@ -2547,8 +2558,6 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " .\n"); static struct __ecereNameSpace__ecere__com__Class * __ecereClass_PrecompApp; -extern int __ecereNameSpace__ecere__com__GetRuntimePlatform(void); - extern int GetHostBits(void); extern size_t strlen(const char * ); @@ -2666,7 +2675,7 @@ int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek; void __ecereMethod_PrecompApp_Main(struct __ecereNameSpace__ecere__com__Instance * this) { int c; -unsigned int valid = 0x1; +unsigned int valid = 1; char defaultSymFile[797]; char * cppCommand = (((void *)0)); char * cppOptions = (((void *)0)); @@ -2710,14 +2719,14 @@ else if(!strcmp(arg + 1, "t")) if(++c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc) targetPlatform = __ecereProp___ecereNameSpace__ecere__com__Platform_Set_char__PTR_(((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argv[c]); else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "cpp")) { if(++c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc) cppCommand = __ecereNameSpace__ecere__sys__CopyString(((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argv[c]); else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "o")) { @@ -2727,7 +2736,7 @@ SetOutputFile(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "c")) { @@ -2737,7 +2746,7 @@ SetSourceFile(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "isystem") || !strcmp(arg + 1, "isysroot")) { @@ -2756,7 +2765,7 @@ buf = PassArg(buf, arg1); cppOptionsLen = buf - cppOptions; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "fno-diagnostics-show-caret")) { @@ -2777,7 +2786,7 @@ SetSymbolsDir(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "defaultns")) { @@ -2787,11 +2796,11 @@ SetDefaultNameSpace(((struct __ecereNameSpace__ecere__com__Application *)(((char c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg + 1, "strictns")) { -SetStrictNameSpaces(0x1); +SetStrictNameSpaces(1); } else if(!strcmp(arg + 1, "module")) { @@ -2801,18 +2810,18 @@ SetI18nModuleName(((struct __ecereNameSpace__ecere__com__Application *)(((char * c++; } else -valid = 0x0; +valid = 0; } } else -valid = 0x0; +valid = 0; } if(valid) { if(!cppCommand) cppCommand = __ecereNameSpace__ecere__sys__CopyString("gcc"); if(!GetSourceFile()) -valid = 0x0; +valid = 0; else if(!GetOutputFile()) { strcpy(defaultSymFile, GetSymbolsDir()); @@ -2837,57 +2846,57 @@ SetCurrentContext(globalContext); SetTopContext(globalContext); SetDefines(&defines); SetImports(&imports); -SetInPreCompiler(0x1); +SetInPreCompiler(1); SetPrecompDefines(&precompDefines); SetTargetPlatform(targetPlatform); SetTargetBits(targetBits); -SetEchoOn(0x0); -privateModule = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com____ecere_COM_Initialize((unsigned int)(0x1 | (targetBits == sizeof(uintptr_t) * 8 ? (unsigned int)0 : targetBits == 64 ? 2 : targetBits == 32 ? 4 : (unsigned int)0) | 8), 1, (((void *)0))); +SetEchoOn(0); +privateModule = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com____ecere_COM_Initialize((unsigned int)(1 | (targetBits == sizeof(uintptr_t) * 8 ? (unsigned int)0 : targetBits == 64 ? 2 : targetBits == 32 ? 4 : (unsigned int)0) | 8), 1, (((void *)0))); SetPrivateModule(privateModule); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint64"), __ecereInstance1->type = ProcessTypeString("unsigned int64", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint64"), __ecereInstance1->type = ProcessTypeString("unsigned int64", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint32"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint32"), __ecereInstance1->type = ProcessTypeString("unsigned int", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint16"), __ecereInstance1->type = ProcessTypeString("unsigned short", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uint16"), __ecereInstance1->type = ProcessTypeString("unsigned short", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("byte"), __ecereInstance1->type = ProcessTypeString("unsigned char", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("byte"), __ecereInstance1->type = ProcessTypeString("unsigned char", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("intptr_t"), __ecereInstance1->type = ProcessTypeString("intptr", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("intptr_t"), __ecereInstance1->type = ProcessTypeString("intptr", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"), __ecereInstance1->type = ProcessTypeString("uintptr", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("uintptr_t"), __ecereInstance1->type = ProcessTypeString("uintptr", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("ssize_t"), __ecereInstance1->type = ProcessTypeString("intsize", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("ssize_t"), __ecereInstance1->type = ProcessTypeString("intsize", 0), __ecereInstance1; })); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->types, (struct __ecereNameSpace__ecere__sys__BTNode *)__extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("size_t"), __ecereInstance1->type = ProcessTypeString("uintsize", 0x0), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString("size_t"), __ecereInstance1->type = ProcessTypeString("uintsize", 0), __ecereInstance1; })); { const char * outputFilePath = GetOutputFile(); @@ -2897,7 +2906,7 @@ __ecereNameSpace__ecere__sys__DeleteFile(outputFilePath); } snprintf(command, sizeof (command), "%s%s -x c -E \"%s\"", cppCommand, cppOptions ? cppOptions : "", GetSourceFile()); command[sizeof (command) - 1] = (char)0; -if((cppOutput = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(0x1))), command))) +if((cppOutput = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(1))), command))) { int exitCode; struct __ecereNameSpace__ecere__sys__OldList * ast; @@ -2936,7 +2945,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(fileInput, 0, 0); ParseEc(); SetCurrentNameSpace((((void *)0))); -SetYydebug(0x0); +SetYydebug(0); (__ecereNameSpace__ecere__com__eInstance_DecRef(fileInput), fileInput = 0); SetFileInput((((void *)0))); ast = GetAST(); diff --git a/compiler/bootstrap/ecp/bootstrap/ecp.main.c b/compiler/bootstrap/ecp/bootstrap/ecp.main.c index eb6c625..183a249 100644 --- a/compiler/bootstrap/ecp/bootstrap/ecp.main.c +++ b/compiler/bootstrap/ecp/bootstrap/ecp.main.c @@ -538,7 +538,7 @@ int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek; int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Write; -struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink; +struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64; struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldList; @@ -706,7 +706,7 @@ __ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek = method->vid; method = __ecereNameSpace__ecere__com__eClass_FindMethod(__ecereClass___ecereNameSpace__ecere__sys__File, "Write", module); if(method) __ecereVMethodID___ecereNameSpace__ecere__sys__File_Write = method->vid; -__ecereClass___ecereNameSpace__ecere__sys__NamedLink = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedLink"); +__ecereClass___ecereNameSpace__ecere__sys__NamedLink64 = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedLink64"); __ecereClass___ecereNameSpace__ecere__sys__OldList = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::OldList"); __ecereClass___ecereNameSpace__ecere__sys__TempFile = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::TempFile"); __ecereNameSpace__ecere__LoadTranslatedStrings((((void *)0)), "ecp"); diff --git a/compiler/bootstrap/ecs/bootstrap/ecs.c b/compiler/bootstrap/ecs/bootstrap/ecs.c index c89da6b..e66cb44 100644 --- a/compiler/bootstrap/ecs/bootstrap/ecs.c +++ b/compiler/bootstrap/ecs/bootstrap/ecs.c @@ -729,7 +729,7 @@ if(line[0] == '[') { if(!strcmp(line, "[Instantiated]")) { -_class->itself = 0x1; +_class->itself = 1; } else if(!strcmp(line, "[Remote]")) { @@ -748,7 +748,7 @@ if(!strcmp(line, ".")) break; if(line[0] != '[') { -if(!(method = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_class->methods, line, 0x0))) +if(!(method = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_class->methods, line, 0))) { method = __extension__ ({ struct MethodImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_MethodImport); @@ -759,7 +759,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName(&_class->methods, me } } else if(!strcmp(line, "[Virtual]")) -method->isVirtual = 0x1; +method->isVirtual = 1; } } else if(!strcmp(line, "[Imported Properties]")) @@ -775,7 +775,7 @@ if(!strcmp(line, ".")) break; if(line[0] != '[') { -if(!(prop = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_class->properties, line, 0x0))) +if(!(prop = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_class->properties, line, 0))) { prop = __extension__ ({ struct PropertyImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyImport); @@ -786,17 +786,17 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName(&_class->properties, } } else if(!strcmp(line, "[Set]")) -prop->hasSet = 0x1; +prop->hasSet = 1; else if(!strcmp(line, "[Get]")) -prop->hasGet = 0x1; +prop->hasGet = 1; else if(!strcmp(line, "[Virtual]")) -prop->isVirtual = 0x1; +prop->isVirtual = 1; } } } else { -if(!(_class = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&module->classes, line, 0x0))) +if(!(_class = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&module->classes, line, 0))) { _class = __extension__ ({ struct ClassImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ClassImport); @@ -822,7 +822,7 @@ if(line[0] == '[') } else { -if(!(function = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&module->functions, line, 0x0))) +if(!(function = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&module->functions, line, 0))) { function = __extension__ ({ struct FunctionImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_FunctionImport); @@ -837,15 +837,15 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName(&module->functions, } else { -if(!(module = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_imports, line, 0x0))) +if(!(module = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_imports, line, 0))) { if(!strcmp(line, "ecereCOM")) { -module = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_imports, "ecere", 0x0); +module = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_imports, "ecere", 0); } else if(!strcmp(line, "ecere")) { -module = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_imports, "ecereCOM", 0x0); +module = __ecereMethod___ecereNameSpace__ecere__sys__OldList_FindName(&_imports, "ecereCOM", 0); if(module) { (__ecereNameSpace__ecere__com__eSystem_Delete(module->name), module->name = 0); @@ -963,7 +963,7 @@ if(f) { struct ModuleImport * module; struct ModuleInfo * defModule; -unsigned int anyMethod = 0x0, anyProp = 0x0, anyFunction = 0x0; +unsigned int anyMethod = 0, anyProp = 0, anyFunction = 0; struct ImportedModule * importedModule; __ecereNameSpace__ecere__sys__GetLastDirectory(fileName, mainModuleName); @@ -1036,7 +1036,7 @@ struct PropertyImport * prop; char className[1024] = ""; struct __ecereNameSpace__ecere__com__Class * regClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, _class->name); -FullClassNameCat(className, _class->name, 0x1); +FullClassNameCat(className, _class->name, 1); if(_class->itself) __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "Class __ecereClass_%s;\n", className); { @@ -1049,7 +1049,7 @@ if(meth && !meth->dataType) { struct Context * context = SetupTemplatesContext(regClass); -meth->dataType = ProcessTypeString(meth->dataTypeString, 0x0); +meth->dataType = ProcessTypeString(meth->dataTypeString, 0); FinishTemplatesContext(context); } if(method->isVirtual) @@ -1058,7 +1058,7 @@ else if((!strcmp(_class->name, "float") || !strcmp(_class->name, "double") || mo { __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "int (*__ecereMethod_%s_%s)();\n", className, method->name); } -anyMethod = 0x1; +anyMethod = 1; } } for(prop = _class->properties.first; prop; prop = prop->next) @@ -1066,7 +1066,7 @@ for(prop = _class->properties.first; prop; prop = prop->next) char propName[1024]; propName[0] = (char)0; -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); if((!strcmp(_class->name, "float") || !strcmp(_class->name, "double") || module->name) && module->importType != 1) { if(prop->hasSet) @@ -1075,7 +1075,7 @@ if(prop->hasGet) __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "void * __ecereProp_%s_Get_%s;\n", className, propName); } __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "Property __ecereProp_%s_%s;\n", className, propName); -anyProp = 0x1; +anyProp = 1; } } } @@ -1084,15 +1084,15 @@ for(function = module->functions.first; function; function = function->next) struct __ecereNameSpace__ecere__com__GlobalFunction * func = __ecereNameSpace__ecere__com__eSystem_FindFunction(privateModule, function->name); if(func && !func->dataType) -func->dataType = ProcessTypeString(func->dataTypeString, 0x0); +func->dataType = ProcessTypeString(func->dataTypeString, 0); if(module->name && module->importType != 1 && (!func || !func->dataType || !func->dataType->dllExport)) { char functionName[1024]; functionName[0] = (char)0; -FullClassNameCat(functionName, function->name, 0x0); +FullClassNameCat(functionName, function->name, 0); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "void * __ecereFunction_%s;\n", functionName); -anyFunction = 0x1; +anyFunction = 1; } } } @@ -1332,7 +1332,7 @@ struct PropertyImport * prop; char classID[1024]; char className[1024] = ""; -FullClassNameCat(className, _class->name, 0x1); +FullClassNameCat(className, _class->name, 1); if(_class->itself) sprintf(classID, "__ecereClass_%s", className); else @@ -1362,7 +1362,7 @@ for(prop = _class->properties.first; prop; prop = prop->next) char propName[1024]; propName[0] = (char)0; -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " __ecereProp_%s_%s = _property = eClass_FindProperty(%s, \"%s\", module);\n", className, propName, classID, prop->name); if((!strcmp(_class->name, "float") || !strcmp(_class->name, "double") || module->name) && module->importType != 1) { @@ -1387,7 +1387,7 @@ if(module->name && module->importType != 1 && (!func || !func->dataType || !func char functionName[1024]; functionName[0] = (char)0; -FullClassNameCat(functionName, function->name, 0x0); +FullClassNameCat(functionName, function->name, 0); if(isDynamicLibrary && !isStaticLibrary) __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " function = eSystem_FindFunction(__currentModule, \"%s\");\n", function->name); else @@ -1512,7 +1512,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " {\n"); } { -unsigned int destroyI18n = 0x0; +unsigned int destroyI18n = 0; if(modules.count) { @@ -1523,7 +1523,7 @@ char moduleName[1024]; if(!strcmp(defModule->name, "i18n")) { -destroyI18n = 0x1; +destroyI18n = 1; continue; } strcpy(moduleName, defModule->name); @@ -1783,7 +1783,7 @@ if(method) { struct Type * param; -method->dataType = ProcessTypeString(method->dataTypeString, 0x0); +method->dataType = ProcessTypeString(method->dataTypeString, 0); if(method->dataType && method->dataType->name) { __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " case %d:\n", vid - _class->base->vTblSize); @@ -1802,18 +1802,18 @@ if(method->dataType->__anon1.__anon2.returnType->kind == 8) classSym = method->dataType->__anon1.__anon2.returnType->__anon1._class; else { -PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0x0, 0x1); +PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); -PrintType(method->dataType->__anon1.__anon2.returnType, type, 0x1, 0x1); +PrintType(method->dataType->__anon1.__anon2.returnType, type, 1, 1); decl = SpecDeclFromString(type, specs, MkDeclaratorIdentifier(MkIdentifier("__ecereResult"))); resultType = MkTypeName(specs, decl); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); -OutputTypeName(resultType, f, 0x0); +OutputTypeName(resultType, f, 0); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ";\n"); } for(param = method->dataType->__anon1.__anon2.params.first; param; param = param->next) @@ -1837,18 +1837,18 @@ if(param->kind == 8) classSym = param->__anon1._class; else { -PrintTypeNoConst(param, type, 0x0, 0x1); +PrintTypeNoConst(param, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); -PrintType(param, type, 0x1, 0x1); +PrintType(param, type, 1, 1); decl = SpecDeclFromString(type, specs, MkDeclaratorIdentifier(MkIdentifier(param->name))); paramTypeName = MkTypeName(specs, decl); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); -OutputTypeName(paramTypeName, f, 0x0); +OutputTypeName(paramTypeName, f, 0); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ";\n"); } } @@ -1917,7 +1917,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " }\n"); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " }\n"); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "\n"); } -doVirtual = 0x1; +doVirtual = 1; id = 0; vid = _class->base->vTblSize; next = (struct __ecereNameSpace__ecere__com__Method *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&_class->methods); @@ -1928,7 +1928,7 @@ next = (struct __ecereNameSpace__ecere__com__Method *)__ecereProp___ecereNameSpa if(!next && doVirtual) { if(vid == _class->vTblSize) -doVirtual = 0x0; +doVirtual = 0; else vid++; id = 0; @@ -1940,7 +1940,7 @@ for(method = next; method; method = next) struct Type * param; if(!method->dataType) -method->dataType = ProcessTypeString(method->dataTypeString, 0x0); +method->dataType = ProcessTypeString(method->dataTypeString, 0); if(method->dataType->name) { __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); @@ -1949,7 +1949,7 @@ if(doVirtual) char name[1024]; strcpy(name, "__ecereVMethodID_"); -FullClassNameCat(name, method->_class->fullName, 0x1); +FullClassNameCat(name, method->_class->fullName, 1); strcat(name, "_"); strcat(name, method->name); DeclareMethod(method, name); @@ -1972,18 +1972,18 @@ if(method->dataType->__anon1.__anon2.returnType->kind == 8) classSym = method->dataType->__anon1.__anon2.returnType->__anon1._class; else { -PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0x0, 0x1); +PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); -PrintType(method->dataType->__anon1.__anon2.returnType, type, 0x1, 0x1); +PrintType(method->dataType->__anon1.__anon2.returnType, type, 1, 1); decl = SpecDeclFromString(type, specs, MkDeclaratorIdentifier(MkIdentifier("__ecereResult"))); resultType = MkTypeName(specs, decl); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); -OutputTypeName(resultType, f, 0x0); +OutputTypeName(resultType, f, 0); if(method->dataType->__anon1.__anon2.returnType->kind == 9) __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " = { 0 }"); else if(method->dataType->__anon1.__anon2.returnType->kind == 8 && method->dataType->__anon1.__anon2.returnType->__anon1._class->__anon1.registered && method->dataType->__anon1.__anon2.returnType->__anon1._class->__anon1.registered->type == 1) @@ -2003,12 +2003,12 @@ if(param->kind == 8) classSym = param->__anon1._class; else { -PrintTypeNoConst(param, type, 0x0, 0x1); +PrintTypeNoConst(param, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); if(param->kind == 8 && !strcmp(param->__anon1._class->string, "String")) { @@ -2062,7 +2062,7 @@ next = (struct __ecereNameSpace__ecere__com__Method *)__ecereProp___ecereNameSpa if(!next && doVirtual) { if(vid == _class->vTblSize) -doVirtual = 0x0; +doVirtual = 0; else vid++; id = 0; @@ -2081,7 +2081,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "\n"); static void BindDCOMServer() { -unsigned int mutexDeclared = 0x0; +unsigned int mutexDeclared = 0; struct __ecereNameSpace__ecere__com__Class * _class; for(_class = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)privateModule + 24)))->classes.first; _class; _class = _class->next) @@ -2117,7 +2117,7 @@ for(method = (struct __ecereNameSpace__ecere__com__Method *)__ecereProp___ecereN { struct Type * param; -method->dataType = ProcessTypeString(method->dataTypeString, 0x0); +method->dataType = ProcessTypeString(method->dataTypeString, 0); if(method->dataType && method->dataType->name) { __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " case %d:\n", id++); @@ -2136,18 +2136,18 @@ if(method->dataType->__anon1.__anon2.returnType->kind == 8) classSym = method->dataType->__anon1.__anon2.returnType->__anon1._class; else { -PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0x0, 0x1); +PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); -PrintType(method->dataType->__anon1.__anon2.returnType, type, 0x1, 0x1); +PrintType(method->dataType->__anon1.__anon2.returnType, type, 1, 1); decl = SpecDeclFromString(type, specs, MkDeclaratorIdentifier(MkIdentifier("__ecereResult"))); resultType = MkTypeName(specs, decl); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); -OutputTypeName(resultType, f, 0x0); +OutputTypeName(resultType, f, 0); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ";\n"); } for(param = method->dataType->__anon1.__anon2.params.first; param; param = param->next) @@ -2171,18 +2171,18 @@ if(param->kind == 8) classSym = param->__anon1._class; else { -PrintTypeNoConst(param, type, 0x0, 0x1); +PrintTypeNoConst(param, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); -PrintType(param, type, 0x1, 0x1); +PrintType(param, type, 1, 1); decl = SpecDeclFromString(type, specs, MkDeclaratorIdentifier(MkIdentifier(param->name))); paramTypeName = MkTypeName(specs, decl); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); -OutputTypeName(paramTypeName, f, 0x0); +OutputTypeName(paramTypeName, f, 0); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ";\n"); } } @@ -2264,11 +2264,11 @@ if(!mutexDeclared) DeclareClass(FindClass("ecere::sys::Mutex"), "__ecereClass___ecereNameSpace__ecere__sys__Mutex"); DeclareMethod(__ecereNameSpace__ecere__com__eClass_FindMethod(__ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::sys::Mutex"), "Wait", privateModule), "__ecereMethod___ecereNameSpace__ecere__sys__Mutex_Wait"); DeclareMethod(__ecereNameSpace__ecere__com__eClass_FindMethod(__ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "ecere::sys::Mutex"), "Release", privateModule), "__ecereMethod___ecereNameSpace__ecere__sys__Mutex_Release"); -mutexDeclared = 0x1; +mutexDeclared = 1; } __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, "\n"); if(!method->dataType) -method->dataType = ProcessTypeString(method->dataTypeString, 0x0); +method->dataType = ProcessTypeString(method->dataTypeString, 0); if(method->dataType->name) { __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " virtual %s\n", method->dataTypeString); @@ -2289,18 +2289,18 @@ if(method->dataType->__anon1.__anon2.returnType->kind == 8) classSym = method->dataType->__anon1.__anon2.returnType->__anon1._class; else { -PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0x0, 0x1); +PrintTypeNoConst(method->dataType->__anon1.__anon2.returnType, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); -PrintType(method->dataType->__anon1.__anon2.returnType, type, 0x1, 0x1); +PrintType(method->dataType->__anon1.__anon2.returnType, type, 1, 1); decl = SpecDeclFromString(type, specs, MkDeclaratorIdentifier(MkIdentifier("__ecereResult"))); resultType = MkTypeName(specs, decl); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " "); -OutputTypeName(resultType, f, 0x0); +OutputTypeName(resultType, f, 0); if(method->dataType->__anon1.__anon2.returnType->kind == 9) __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, " = { 0 }"); else if(method->dataType->__anon1.__anon2.returnType->kind == 8 && method->dataType->__anon1.__anon2.returnType->__anon1._class->__anon1.registered && method->dataType->__anon1.__anon2.returnType->__anon1._class->__anon1.registered->type == 1) @@ -2321,12 +2321,12 @@ if(param->kind == 8) classSym = param->__anon1._class; else { -PrintTypeNoConst(param, type, 0x0, 0x1); +PrintTypeNoConst(param, type, 0, 1); classSym = FindClass(type); type[0] = (char)0; } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); if(param->kind == 8 && !strcmp(param->__anon1._class->string, "String")) { @@ -2346,7 +2346,7 @@ for(param = method->dataType->__anon1.__anon2.params.first; param; param = param { if(param->kind == 8 && ((param->__anon1._class && param->__anon1._class->__anon1.registered && param->__anon1._class->__anon1.registered->type == 1) || !strcmp(param->__anon1._class->string, "String")) && !param->constant) { -hasReturnValue = 0x1; +hasReturnValue = 1; break; } } @@ -2575,11 +2575,11 @@ void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(struct __ecereName void __ecereMethod_SymbolgenApp_Main(struct __ecereNameSpace__ecere__com__Instance * this) { int c; -unsigned int valid = 0x1; +unsigned int valid = 1; const char * output = (((void *)0)); -outputPot = 0x0; -disabledPooling = 0x0; +outputPot = 0; +disabledPooling = 0; targetPlatform = __ecereNameSpace__ecere__com__GetRuntimePlatform(); targetBits = GetHostBits(); for(c = 1; c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc; c++) @@ -2604,7 +2604,7 @@ output = ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + s c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg, "-name")) { @@ -2614,27 +2614,27 @@ strcpy(projectName, ((struct __ecereNameSpace__ecere__com__Application *)(((char c++; } else -valid = 0x0; +valid = 0; } else if(!strcmp(arg, "-t")) { if(++c < ((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argc) targetPlatform = __ecereProp___ecereNameSpace__ecere__com__Platform_Set_char__PTR_(((struct __ecereNameSpace__ecere__com__Application *)(((char *)this + structSize_Module)))->argv[c]); else -valid = 0x0; +valid = 0; } else if(!strcmp(arg, "-outputpot")) -outputPot = 0x1; +outputPot = 1; else if(!strcmp(arg, "-disabled-pooling")) -disabledPooling = 0x1; +disabledPooling = 1; else if(!strcmp(arg, "-console")) -isConsole = 0x1; +isConsole = 1; else if(!strcmp(arg, "-dynamiclib")) -isDynamicLibrary = 0x1; +isDynamicLibrary = 1; else if(!strcmp(arg, "-staticlib")) { -isDynamicLibrary = 0x1; -isStaticLibrary = 0x1; +isDynamicLibrary = 1; +isStaticLibrary = 1; } else if(!strcmp(arg, "-symbols")) { @@ -2644,12 +2644,12 @@ SetSymbolsDir(((struct __ecereNameSpace__ecere__com__Application *)(((char *)thi c++; } else -valid = 0x0; +valid = 0; } } } if(!output) -valid = 0x0; +valid = 0; if(!valid) { printf(__ecereNameSpace__ecere__GetTranslatedString("ecs", "Syntax:\n ecs [-t ] [, ]* -o \n", (((void *)0)))); @@ -2671,8 +2671,8 @@ SetTopContext(theGlobalContext); SetCurrentContext(theGlobalContext); SetTargetPlatform(targetPlatform); SetTargetBits(targetBits); -SetInSymbolGen(0x1); -privateModule = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com____ecere_COM_Initialize((unsigned int)(0x1 | (targetBits == sizeof(uintptr_t) * 8 ? (unsigned int)0 : targetBits == 64 ? 2 : targetBits == 32 ? 4 : (unsigned int)0) | 8), 1, (((void *)0))); +SetInSymbolGen(1); +privateModule = (struct __ecereNameSpace__ecere__com__Instance *)__ecereNameSpace__ecere__com____ecere_COM_Initialize((unsigned int)(1 | (targetBits == sizeof(uintptr_t) * 8 ? (unsigned int)0 : targetBits == 64 ? 2 : targetBits == 32 ? 4 : (unsigned int)0) | 8), 1, (((void *)0))); SetPrivateModule(privateModule); mainModule = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_ModuleImport); SetMainModule(mainModule); @@ -2708,7 +2708,7 @@ int c; if(f) { while(!count && __ecereMethod___ecereNameSpace__ecere__sys__File_GetLine(f, line, sizeof (line))) -count = __ecereNameSpace__ecere__sys__Tokenize(line, sizeof (tokens) / sizeof (tokens[0]), tokens, 0x2); +count = __ecereNameSpace__ecere__sys__Tokenize(line, sizeof (tokens) / sizeof (tokens[0]), tokens, 2); if(!count) (__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0); } @@ -2761,7 +2761,7 @@ int c; if(f) { while(!count && __ecereMethod___ecereNameSpace__ecere__sys__File_GetLine(f, line, sizeof (line))) -count = __ecereNameSpace__ecere__sys__Tokenize(line, sizeof (tokens) / sizeof (tokens[0]), tokens, 0x2); +count = __ecereNameSpace__ecere__sys__Tokenize(line, sizeof (tokens) / sizeof (tokens[0]), tokens, 2); if(!count) (__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0); } @@ -2800,7 +2800,7 @@ struct ImportedModule * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstan __ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(module->name), __ecereInstance1->type = 0, __ecereInstance1->importType = 0, __ecereInstance1; }); __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName(&_defines, importedModule); -module->globalInstance = LoadSymbols(file, 0, 0x0); +module->globalInstance = LoadSymbols(file, 0, 0); CheckDataRedefinitions(); } { @@ -2864,8 +2864,8 @@ struct ContextStringPair pair = msgid, msgctxt }; -i18n = 0x1; -if(!__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(&pair), 0x0)) +i18n = 1; +if(!__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(&pair), 0)) { msgid = (((void *)0)); msgctxt = (((void *)0)); @@ -2875,7 +2875,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = intlStrings, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&pair)), 0x1); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&pair)), 1); __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)(comments))); }); comments = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__com__List_TPL_String_); diff --git a/compiler/bootstrap/libec/bootstrap/ast.c b/compiler/bootstrap/libec/bootstrap/ast.c index 89a9c6b..e258e7d 100644 --- a/compiler/bootstrap/libec/bootstrap/ast.c +++ b/compiler/bootstrap/libec/bootstrap/ast.c @@ -40,7 +40,7 @@ typedef unsigned __int64 uint64; #define arch_PointerSize sizeof(void *) #define structSize_Instance (_64BIT ? 24 : 12) #define structSize_OldLink (_64BIT ? 24 : 12) -#define structSize_NamedLink (_64BIT ? 32 : 16) +#define structSize_NamedLink64 (_64BIT ? 32 : 24) struct __ecereNameSpace__ecere__com__Instance; @@ -1339,12 +1339,12 @@ id->_class = (((void *)0)); if(string) { const char * namePart; -unsigned int gotColon = 0x0; +unsigned int gotColon = 0; for(c = strlen(string) - 1; c >= 0; c--) if(string[c] == ':') { -gotColon = 0x1; +gotColon = 1; break; } namePart = string + c + 1; @@ -1635,7 +1635,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = intlStrings, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&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) @@ -1647,7 +1647,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = intlStrings, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&pair)), 0x1); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(&pair)), 1); __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)(list))); }); } @@ -1687,7 +1687,7 @@ else { struct Expression * e = MkExpString(string); -e->__anon1.__anon2.intlString = 0x1; +e->__anon1.__anon2.intlString = 1; return e; } } @@ -1912,11 +1912,11 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec); 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); } @@ -1926,7 +1926,7 @@ struct Symbol * symbol = (symbol = __ecereNameSpace__ecere__com__eInstance_New(_ 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); } @@ -1956,7 +1956,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec); symbol = __extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 0x1, __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 1, __ecereInstance1; }); if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol)) FreeSymbol(symbol); @@ -1979,7 +1979,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specs, spec); 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 = 0x1, __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(spec->__anon1.__anon2.id->string), __ecereInstance1->type = ProcessType(&specs, (((void *)0))), __ecereInstance1->isStruct = 1, __ecereInstance1; }); if(!__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&curContext->parent->structSymbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol)) FreeSymbol(symbol); @@ -2201,8 +2201,8 @@ struct TypeName * MkTypeNameGuessDecl(struct __ecereNameSpace__ecere__sys__OldLi { if(qualifiers != (((void *)0))) { -unsigned int gotType = 0x0; -unsigned int gotFullType = 0x0; +unsigned int gotType = 0; +unsigned int gotFullType = 0; struct Specifier * spec, * next; for(spec = qualifiers->first; spec; spec = next) @@ -2214,7 +2214,7 @@ const char * s = (((void *)0)); if(spec->type == 1) { -char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 1, 0); s = colon ? colon + 2 : spec->__anon1.__anon1.name; } @@ -2238,13 +2238,13 @@ 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 = 0x1; -gotType = 0x1; +gotFullType = 1; +gotType = 1; } else { -gotFullType = 0x1; -gotType = 0x1; +gotFullType = 1; +gotType = 1; } } } @@ -2316,7 +2316,7 @@ __ecereInstance1->string = (inst->exp->type == 0) ? __ecereNameSpace__ecere__sys }); 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; @@ -2388,11 +2388,11 @@ struct __ecereNameSpace__ecere__sys__BTNode * __ecereMethod___ecereNameSpace__ec struct Declaration * MkDeclaration(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct __ecereNameSpace__ecere__sys__OldList * initDeclarators) { 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 = 0x1; +unsigned int variable = 1; if(specifiers != (((void *)0))) { -unsigned int gotType = 0x0; +unsigned int gotType = 0; struct Specifier * spec, * next; for(spec = specifiers->first; spec; spec = next) @@ -2427,7 +2427,7 @@ 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), 0x1, 0x0); +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; } @@ -2451,11 +2451,11 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), typ } } } -variable = 0x0; +variable = 0; break; } else if(spec->type == 0 && (spec->__anon1.specifier == STRUCT || spec->__anon1.specifier == UNION)) -variable = 0x0; +variable = 0; else { if(gotType && initDeclarators == (((void *)0)) && !spec->next && ((spec->type == 1 && spec->__anon1.__anon1.name) || spec->type == 0)) @@ -2464,7 +2464,7 @@ const char * s = (((void *)0)); if(spec->type == 1) { -char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(spec->__anon1.__anon1.name, "::", strlen(spec->__anon1.__anon1.name), 1, 0); s = colon ? colon + 2 : spec->__anon1.__anon1.name; } @@ -2483,7 +2483,7 @@ spec = (((void *)0)); } } if(spec && spec->type != 5) -gotType = 0x1; +gotType = 1; } } if(variable && initDeclarators) @@ -2535,7 +2535,7 @@ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(_ __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->__anon1.__anon4.arraySizeExp && d->initializer) @@ -2546,29 +2546,29 @@ char string[256]; sprintf(string, "%d", (*d->initializer->__anon1.list).count); symbol->type->__anon1.__anon4.arraySizeExp = MkExpConstant(string); -symbol->type->__anon1.__anon4.freeExp = 0x1; +symbol->type->__anon1.__anon4.freeExp = 1; } else if(d->initializer->type == 0 && d->initializer->__anon1.exp->type == 3 && d->initializer->__anon1.exp->__anon1.__anon2.string) { char string[256]; int c, count = 0; char ch; -unsigned int escaped = 0x0; +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->__anon1.__anon4.arraySizeExp = MkExpConstant(string); -symbol->type->__anon1.__anon4.freeExp = 0x1; +symbol->type->__anon1.__anon4.freeExp = 1; } } symbol->id = symbol->idCode = curContext->nextID++; @@ -2593,7 +2593,7 @@ struct Declaration * decl = (decl = __ecereNameSpace__ecere__com__eInstance_New( if(specifiers != (((void *)0))) { -unsigned int gotType = 0x0; +unsigned int gotType = 0; struct Specifier * spec, * next; for(spec = specifiers->first; spec; spec = next) @@ -2605,7 +2605,7 @@ 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), 0x1, 0x0); +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; } @@ -2623,7 +2623,7 @@ spec = (((void *)0)); } } if(spec && spec->type != 5) -gotType = 0x1; +gotType = 1; } } return decl; @@ -2686,7 +2686,7 @@ __ecereInstance1->type = 4, __ecereInstance1->__anon1.ifStmt.exp = exp, __ecereI struct Statement * MkSwitchStmt(struct __ecereNameSpace__ecere__sys__OldList * exp, struct Statement * statement) { if(statement) -statement->__anon1.compound.isSwitch = 0x1; +statement->__anon1.compound.isSwitch = 1; return __extension__ ({ struct Statement * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Statement); @@ -2770,7 +2770,7 @@ struct FunctionDefinition * _MkFunction(struct __ecereNameSpace__ecere__sys__Old struct FunctionDefinition * MkFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Declarator * declarator, struct __ecereNameSpace__ecere__sys__OldList * declarationList) { -return _MkFunction(specifiers, declarator, declarationList, 0x1); +return _MkFunction(specifiers, declarator, declarationList, 1); } extern struct Declarator * GetFuncDecl(struct Declarator * decl); @@ -2852,7 +2852,7 @@ if(!symbol && id) symbol = __extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 0x1, __ecereInstance1; +__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); @@ -2900,7 +2900,7 @@ __ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), }); 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; @@ -2912,7 +2912,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*excludedSymbols), (__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) @@ -2966,8 +2966,8 @@ strncpy(external->__anon1.importString, name + 1, len); external->__anon1.importString[len] = '\0'; (__ecereNameSpace__ecere__com__eSystem_Delete(name), name = 0); { -ImportModule(external->__anon1.importString, importType, importAccess, 0x1); -ImportModule(external->__anon1.importString, importType, importAccess, 0x0); +ImportModule(external->__anon1.importString, importType, importAccess, 1); +ImportModule(external->__anon1.importString, importType, importAccess, 0); } return external; } @@ -3215,7 +3215,7 @@ if(!symbol && id) symbol = __extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(id->string), __ecereInstance1->type = ProcessType(param->qualifiers, param->declarator), __ecereInstance1->isParam = 0x1, __ecereInstance1; +__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)) @@ -3689,9 +3689,9 @@ if(!id) char typeString[1024]; typeString[0] = '\0'; -PrintTypeNoConst(type, typeString, 0x0, 0x1); +PrintTypeNoConst(type, typeString, 0, 1); id = MkIdentifier(typeString); -prop->__anon1.conversion = 0x1; +prop->__anon1.conversion = 1; } prop->id = id; symbol = __extension__ ({ @@ -3846,16 +3846,16 @@ unsigned int ModuleAccess(struct __ecereNameSpace__ecere__com__Instance * search struct __ecereNameSpace__ecere__com__SubModule * subModule; if(searchFor == searchIn) -return 0x1; +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; @@ -3889,12 +3889,12 @@ struct Symbol * FindClass(const char * name) { 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) @@ -3947,7 +3947,7 @@ if(!cl) 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 = 0x1, __ecereInstance1; +__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) @@ -3964,14 +3964,14 @@ cl->shortName = __ecereNameSpace__ecere__sys__CopyString(_class->name); 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); @@ -3985,13 +3985,13 @@ type->name = __ecereNameSpace__ecere__sys__CopyString(src->name); 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->__anon1.__anon1.members); for(member = src->__anon1.__anon1.members.first; member; member = member->next) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&type->__anon1.__anon1.members, __extension__ ({ -struct __ecereNameSpace__ecere__sys__NamedLink * __ecereInstance1 = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink); +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; })); @@ -4029,19 +4029,19 @@ extern int targetBits; extern int targetPlatform; -extern int strtol(const char * , char * * , int base); +extern long long strtoll(const char * nptr, char * * endptr, int base); extern struct Symbol * FindSymbol(const char * name, struct Context * startContext, struct Context * endContext, unsigned int isStruct, unsigned int globalNameSpace); static struct Type * ProcessTypeSpecs(struct __ecereNameSpace__ecere__sys__OldList * specs, unsigned int assumeEllipsis, unsigned int keepTypeName) { -struct Type * specType = (specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), specType->refCount = 1, specType->kind = 3, specType->isSigned = 0x1, specType); +struct Type * specType = (specType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), specType->refCount = 1, specType->kind = 3, specType->isSigned = 1, specType); if(specs != (((void *)0))) { -unsigned int isTypedef = 0x0; +unsigned int isTypedef = 0; struct Specifier * spec; -unsigned int isLong = 0x0; +unsigned int isLong = 0; for(spec = specs->first; spec; spec = spec->next) { @@ -4052,9 +4052,9 @@ struct ExtDecl * extDecl = spec->__anon1.__anon1.extDecl; if(extDecl->type == 0) { if(!strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "__declspec(dllexport)") || !strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "dllexport")) -specType->dllExport = 0x1; +specType->dllExport = 1; else if(!strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "__declspec(stdcall)") || !strcmp(spec->__anon1.__anon1.extDecl->__anon1.s, "stdcall")) -specType->attrStdcall = 0x1; +specType->attrStdcall = 1; } else if(extDecl->type == 1) { @@ -4071,13 +4071,13 @@ char * s = attr->attr; if(s) { if(!strcmp(s, "dllexport")) -specType->dllExport = 0x1; +specType->dllExport = 1; else if(!strcmp(s, "stdcall")) -specType->attrStdcall = 0x1; +specType->attrStdcall = 1; } } } -specType->keepCast = 0x1; +specType->keepCast = 1; } } if(spec->__anon1.specifier != CONST && (specType->kind == 9 || specType->kind == 10)) @@ -4086,7 +4086,7 @@ FreeType(specType); specType = __extension__ ({ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); -__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0x1, __ecereInstance1->refCount = 1, __ecereInstance1; +__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 1, __ecereInstance1->refCount = 1, __ecereInstance1; }); } if(isTypedef && keepTypeName) @@ -4097,7 +4097,7 @@ return specType; else if(spec->type == 0) { if(spec->__anon1.specifier == TYPEDEF) -isTypedef = 0x1; +isTypedef = 1; else if(spec->__anon1.specifier == VOID) specType->kind = 0; else if(spec->__anon1.specifier == CHAR) @@ -4113,7 +4113,7 @@ 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->__anon1.specifier == INT64) specType->kind = 4; @@ -4127,18 +4127,18 @@ if(isLong || (targetBits == 64 && targetPlatform != 1)) specType->kind = 4; else specType->kind = 3; -isLong = 0x1; +isLong = 1; } else if(spec->__anon1.specifier == FLOAT) specType->kind = 6; else if(spec->__anon1.specifier == DOUBLE) specType->kind = 7; else if(spec->__anon1.specifier == SIGNED) -specType->isSigned = 0x1; +specType->isSigned = 1; else if(spec->__anon1.specifier == UNSIGNED) -specType->isSigned = 0x0; +specType->isSigned = 0; else if(spec->__anon1.specifier == CONST) -specType->constant = 0x1; +specType->constant = 1; else if(spec->__anon1.specifier == TYPED_OBJECT || spec->__anon1.specifier == ANY_OBJECT || spec->__anon1.specifier == CLASS) { switch(spec->__anon1.specifier) @@ -4165,13 +4165,13 @@ if(spec->__anon1.__anon1.name && (!strcmp(spec->__anon1.__anon1.name, "intptr") { specType->kind = 22; if(!strcmp(spec->__anon1.__anon1.name, "uintptr")) -specType->isSigned = 0x0; +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 = 0x0; +specType->isSigned = 0; } else { @@ -4207,10 +4207,10 @@ struct Enumerator * e; for(e = (*spec->__anon1.__anon2.list).first; e; e = e->next) { -struct __ecereNameSpace__ecere__sys__NamedLink * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i); +struct __ecereNameSpace__ecere__sys__NamedLink64 * i = (i = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64), i->name = __ecereNameSpace__ecere__sys__CopyString(e->id->string), i); if(e->exp && e->exp->type == 2 && e->exp->__anon1.__anon1.constant) -i->data = (void *)strtol(e->exp->__anon1.__anon1.constant, (((void *)0)), 0); +i->data = strtoll(e->exp->__anon1.__anon1.constant, (((void *)0)), 0); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&specType->__anon1.__anon1.members, i); } } @@ -4226,9 +4226,9 @@ struct Symbol * _class = spec->__anon1.__anon2.id ? FindClass(spec->__anon1.__an if(_class) { -specType->declaredWithStruct = 0x1; +specType->declaredWithStruct = 1; if(!_class->__anon1.registered || _class->__anon1.registered->type != 1) -specType->directClassAccess = 0x1; +specType->directClassAccess = 1; specType->__anon1._class = _class; specType->kind = 8; break; @@ -4242,7 +4242,7 @@ if(spec->__anon1.__anon2.id) { if(!spec->__anon1.__anon2.definitions && !isTypedef) { -struct Symbol * symbol = spec->__anon1.__anon2.id->string ? FindSymbol(spec->__anon1.__anon2.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) { @@ -4253,12 +4253,12 @@ specType->__anon1.__anon1.enumName = __ecereNameSpace__ecere__sys__CopyString(sy 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->__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(structSize_NamedLink), 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->__anon1.__anon1.members, item); } @@ -4356,7 +4356,7 @@ struct Type * type = parentType; struct Declarator * subDecl = decl ? decl->declarator : (((void *)0)); if(!parentType) -type = ProcessTypeSpecs(specs, decl == (((void *)0)), (decl && decl->type == 7) ? 0x1 : 0x0); +type = ProcessTypeSpecs(specs, decl == (((void *)0)), (decl && decl->type == 7) ? 1 : 0); if(decl) { switch(decl->type) @@ -4379,9 +4379,9 @@ char * s = extDecl->__anon1.s; if(s) { if(!strcmp(s, "__declspec(dllexport)") || !strcmp(s, "dllexport")) -type->dllExport = 0x1; +type->dllExport = 1; else if(!strcmp(s, "__declspec(stdcall)") || !strcmp(s, "stdcall")) -type->attrStdcall = 0x1; +type->attrStdcall = 1; } break; } @@ -4400,13 +4400,13 @@ char * s = attr->attr; if(s) { if(!strcmp(s, "dllexport")) -type->dllExport = 0x1; +type->dllExport = 1; else if(!strcmp(s, "stdcall")) -type->attrStdcall = 0x1; +type->attrStdcall = 1; } } } -type->keepCast = 0x1; +type->keepCast = 1; break; } } @@ -4447,7 +4447,7 @@ case 3: 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 = 0x1, __ecereInstance1->__anon1.type = type, __ecereInstance1->dllExport = type->dllExport, __ecereInstance1->attrStdcall = type->attrStdcall, __ecereInstance1; +__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; @@ -4462,7 +4462,7 @@ while(pointer) struct __ecereNameSpace__ecere__sys__OldList * qualifiers = pointer->qualifiers; if(type->classObjectType) -type->byReference = 0x1; +type->byReference = 1; else type = __extension__ ({ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); @@ -4476,7 +4476,7 @@ struct Specifier * spec; for(spec = (*qualifiers).first; spec; spec = spec->next) { if(spec->type == 0 && spec->__anon1.specifier == CONST) -type->constant = 0x1; +type->constant = 1; } } pointer = pointer->pointer; @@ -4495,14 +4495,14 @@ if(_class) if(_class->type == 8) { type->__anon1.__anon2.thisClassTemplate = _class->__anon1.templateParameter; -type->extraParam = 0x1; +type->extraParam = 1; } else { char * name = _class->__anon1.__anon1.name; if(!name) -type->__anon1.__anon2.staticMethod = 0x1; +type->__anon1.__anon2.staticMethod = 1; else { if(!id->classSym) @@ -4510,15 +4510,15 @@ id->classSym = _class->__anon1.__anon1.symbol; if(name[strlen(name) - 1] == '&') { type->__anon1.__anon2.thisClass = FindClass("class"); -type->byReference = 0x1; +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 = 0x1; +type->extraParam = 1; else if(!strcmp(name, "any_object")) { -type->extraParam = 0x1; +type->extraParam = 1; type->__anon1.__anon2.thisClass = FindClass("class"); } else if(!strcmp(name, "class")) @@ -4572,7 +4572,7 @@ struct Declarator * decl = SpecDeclFromString(string, specs, (((void *)0))); struct Type * type = ProcessType(specs, decl); if(type && !type->__anon1.__anon2.thisClass && staticMethod) -type->__anon1.__anon2.staticMethod = 0x1; +type->__anon1.__anon2.staticMethod = 1; FreeList(specs, FreeSpecifier); if(decl) FreeDeclarator(decl); @@ -4670,7 +4670,7 @@ struct PropertyWatch * MkDeleteWatch(struct Statement * compound) return __extension__ ({ struct PropertyWatch * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyWatch); -__ecereInstance1->compound = compound, __ecereInstance1->deleteWatch = 0x1, __ecereInstance1; +__ecereInstance1->compound = compound, __ecereInstance1->deleteWatch = 1, __ecereInstance1; }); } @@ -4833,7 +4833,7 @@ char className[1024]; sprintf(idString, "%d", id); strcpy(className, "__ecereClass_"); -FullClassNameCat(className, _class->fullName, 0x1); +FullClassNameCat(className, _class->fullName, 1); DeclareClass(FindClass(_class->fullName), className); argExp = MkExpIndex((MkExpMember)(MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class")), MkIdentifier("templateArgs")), MkListOne(MkExpConstant(idString))); } diff --git a/compiler/bootstrap/libec/bootstrap/dbpass.c b/compiler/bootstrap/libec/bootstrap/dbpass.c index 78c2f68..89692da 100644 --- a/compiler/bootstrap/libec/bootstrap/dbpass.c +++ b/compiler/bootstrap/libec/bootstrap/dbpass.c @@ -1913,7 +1913,7 @@ struct __ecereNameSpace__ecere__sys__OldList * rowClassDefs = MkList(), * idClas char tableName[1024]; char rowClassName[1024]; int len = strlen(table->name); -unsigned int indexed = 0x0; +unsigned int indexed = 0; char tableID[1024]; char nameField[1024]; struct __ecereNameSpace__ecere__sys__OldList * args; @@ -1978,7 +1978,7 @@ switch(entry->type) { case 0: { -unsigned int isIndex = 0x0; +unsigned int isIndex = 0; char fieldID[1024]; struct __ecereNameSpace__ecere__sys__OldList * args; struct Specifier * spec = entry->__anon1.__anon1.dataType->qualifiers ? (struct Specifier *)(*entry->__anon1.__anon1.dataType->qualifiers).first : (((void *)0)); @@ -1997,8 +1997,8 @@ char name[1024]; struct ClassDef * def; numIndexes = ((numIndexes > 1) ? numIndexes : 1); -isIndex = 0x1; -indexed = 0x1; +isIndex = 1; +indexed = 1; sprintf(name, "_%s", entry->id->string); curContext = rowSet->__anon1.compound.context = __extension__ ({ struct Context * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Context); @@ -2013,7 +2013,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*args), MkExpIdentifie curContext = globalContext; def = MkClassDefProperty(MkProperty(CopyList(entry->__anon1.__anon1.dataType->qualifiers, CopySpecifier), CopyDeclarator(entry->__anon1.__anon1.dataType->declarator), MkIdentifier(name), rowSet, (((void *)0)))); def->__anon1.propertyDef->symbol->id = def->__anon1.propertyDef->symbol->idCode = symbolID; -def->__anon1.propertyDef->__anon1.isDBProp = 0x1; +def->__anon1.propertyDef->__anon1.isDBProp = 1; def->memberAccess = 1; __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*rowClassDefs), def); } @@ -2063,7 +2063,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*args), MkExpIdentifie curContext = globalContext; def = MkClassDefProperty(MkProperty(CopyList(entry->__anon1.__anon1.dataType->qualifiers, CopySpecifier), entry->__anon1.__anon1.dataType->declarator, CopyIdentifier(entry->id), rowSet, rowGet)); def->__anon1.propertyDef->symbol->id = def->__anon1.propertyDef->symbol->idCode = symbolID; -def->__anon1.propertyDef->__anon1.isDBProp = 0x1; +def->__anon1.propertyDef->__anon1.isDBProp = 1; def->memberAccess = 1; __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*rowClassDefs), def); } @@ -2184,7 +2184,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*idSet->__anon1.compou curContext = globalContext; def = MkClassDefProperty(MkProperty(CopyList(entry->__anon1.__anon1.dataType->qualifiers, CopySpecifier), CopyDeclarator(entry->__anon1.__anon1.dataType->declarator), CopyIdentifier(entry->id), idSet, idGet)); def->__anon1.propertyDef->symbol->id = def->__anon1.propertyDef->symbol->idCode = symbolID; -def->__anon1.propertyDef->__anon1.isDBProp = 0x1; +def->__anon1.propertyDef->__anon1.isDBProp = 1; def->memberAccess = 1; __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*idClassDefs), def); } @@ -2197,7 +2197,7 @@ if(entry->__anon1.items && (*entry->__anon1.items).count) char indexID[1024]; struct DBIndexItem * item; int c; -unsigned int needTable = 0x0; +unsigned int needTable = 0; char num[16]; if(entry->id || indexed) @@ -2211,14 +2211,14 @@ sprintf(indexID, "__ecereDBIndex_%s_%s", tableName, id->string); external = MkExternalDeclaration(MkDeclaration(MkListOne(MkSpecifierName("Table")), MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(indexID)), (((void *)0)))))); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*ast), external); external->__anon1.declaration->declMode = table->declMode; -needTable = 0x1; +needTable = 1; } else Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Multiple field index requires a name\n", (((void *)0)))); } else { -indexed = 0x1; +indexed = 1; strcpy(indexID, tableID); } for(c = 0, item = (*entry->__anon1.items).first; item; item = item->next, c++) diff --git a/compiler/bootstrap/libec/bootstrap/ec.main.c b/compiler/bootstrap/libec/bootstrap/ec.main.c index 8a8c0e9..35ed283 100644 --- a/compiler/bootstrap/libec/bootstrap/ec.main.c +++ b/compiler/bootstrap/libec/bootstrap/ec.main.c @@ -647,7 +647,7 @@ struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecer struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedItem; -struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink; +struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__NamedLink64; struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldLink; @@ -946,7 +946,7 @@ if(method) __ecereVMethodID___ecereNameSpace__ecere__sys__File_Write = method->vid; __ecereClass___ecereNameSpace__ecere__sys__Item = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::Item"); __ecereClass___ecereNameSpace__ecere__sys__NamedItem = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedItem"); -__ecereClass___ecereNameSpace__ecere__sys__NamedLink = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedLink"); +__ecereClass___ecereNameSpace__ecere__sys__NamedLink64 = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::NamedLink64"); __ecereClass___ecereNameSpace__ecere__sys__OldLink = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::OldLink"); __ecereClass___ecereNameSpace__ecere__sys__OldList = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::OldList"); __ecereClass___ecereNameSpace__ecere__sys__TempFile = __ecereNameSpace__ecere__com__eSystem_FindClass(module, "ecere::sys::TempFile"); @@ -958,7 +958,7 @@ __ecereCreateModuleInstances_ast(); __ecereCreateModuleInstances_loadSymbols(); __ecereCreateModuleInstances_pass1(); } -return 0x1; +return 1; } extern void __ecereNameSpace__ecere__UnloadTranslatedStrings(const char * name); @@ -993,7 +993,7 @@ __ecereUnregisterModule_shortcuts(module); __ecereUnregisterModule_type(module); if(__currentModule == module) __currentModule = (void *)0; -return 0x1; +return 1; } void __ecereRegisterModule_ec_main(struct __ecereNameSpace__ecere__com__Instance * module) diff --git a/compiler/bootstrap/libec/bootstrap/ecdefs.c b/compiler/bootstrap/libec/bootstrap/ecdefs.c index 0d83f7e..a382b40 100644 --- a/compiler/bootstrap/libec/bootstrap/ecdefs.c +++ b/compiler/bootstrap/libec/bootstrap/ecdefs.c @@ -1264,7 +1264,7 @@ static struct __ecereNameSpace__ecere__com__Class * __ecereClass_Order; static struct __ecereNameSpace__ecere__com__Class * __ecereClass_DBTableEntryType; -unsigned int inCompiler = 0x0; +unsigned int inCompiler = 0; void SetInCompiler(unsigned int b) { @@ -1410,7 +1410,7 @@ void SetDefines(struct __ecereNameSpace__ecere__sys__OldList * list) defines = list; } -unsigned int outputLineNumbers = 0x1; +unsigned int outputLineNumbers = 1; void SetOutputLineNumbers(unsigned int value) { @@ -1438,7 +1438,7 @@ const char * escCharsQuoted = "\""; const char * escChars = " !\"$&'()*:;<=>?[\\`{|"; const char * escCharsQuoted = "\"()$"; #endif -unsigned int quoting = 0x0; +unsigned int quoting = 0; char * o = output; const char * i = input, * l = input; @@ -1446,7 +1446,7 @@ const char * i = input, * l = input; while(*l && !strchr(escChars, *l)) l++; if(*l) -quoting = 0x1; +quoting = 1; #else if(*i == '-') { @@ -1617,20 +1617,20 @@ struct __ecereNameSpace__ecere__com__DataValue __simpleStruct0 = } }; -this->debugValue = 0x0; +this->debugValue = 0; this->val = __simpleStruct0; this->address = 0; -this->hasAddress = 0x0; +this->hasAddress = 0; this->expType = (((void *)0)); this->destType = (((void *)0)); this->usage = 0; this->tempCount = 0; -this->byReference = 0x0; -this->isConstant = 0x0; -this->addedThis = 0x0; -this->needCast = 0x0; -this->thisPtr = 0x0; -this->opDestType = 0x0; +this->byReference = 0; +this->isConstant = 0; +this->addedThis = 0; +this->needCast = 0; +this->thisPtr = 0; +this->opDestType = 0; this->needTemplateCast = 0; } @@ -1659,7 +1659,7 @@ unsigned int __ecereConstructor_Context(struct Context * this) (this->symbols.CompareKey = (void *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_CompareString); (this->structSymbols.CompareKey = (void *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_CompareString); (this->templateTypes.CompareKey = (void *)__ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_CompareString); -return 0x1; +return 1; } struct FunctionImport @@ -1701,7 +1701,7 @@ struct Type * type = (struct Type *)this; tempString[0] = '\0'; if(type) -PrintType(type, tempString, 0x0, 0x1); +PrintType(type, tempString, 0, 1); return tempString; } @@ -1882,7 +1882,7 @@ fputs(string, (bsl_stdout())); } else { -parseTypeError = 0x1; +parseTypeError = 1; } } } @@ -1940,7 +1940,7 @@ int yyerror() { if(!skipErrors) { -parseError = 0x1; +parseError = 1; Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "syntax error\n", (((void *)0)))); } return 0; @@ -1964,7 +1964,7 @@ char host[256]; if(!hostType) { -struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(0x1))), "uname -m"); +struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__sys__DualPipeOpen((((unsigned int)(1))), "uname -m"); if(f) { @@ -2002,7 +2002,7 @@ return targetBits; 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 void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); 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); diff --git a/compiler/bootstrap/libec/bootstrap/expression.c b/compiler/bootstrap/libec/bootstrap/expression.c index 3222b0a..39713fa 100644 --- a/compiler/bootstrap/libec/bootstrap/expression.c +++ b/compiler/bootstrap/libec/bootstrap/expression.c @@ -4645,7 +4645,7 @@ break; case 401: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isConstructor = 0x1; +yyval.classFunction->isConstructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(1) - (3)].list, FreeSpecifier); @@ -4655,7 +4655,7 @@ break; case 402: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isDestructor = 0x1; +yyval.classFunction->isDestructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(2) - (4)].list, FreeSpecifier); @@ -4665,7 +4665,7 @@ break; case 403: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -4674,7 +4674,7 @@ break; case 404: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; diff --git a/compiler/bootstrap/libec/bootstrap/firstPass.c b/compiler/bootstrap/libec/bootstrap/firstPass.c index 18a377c..7751084 100644 --- a/compiler/bootstrap/libec/bootstrap/firstPass.c +++ b/compiler/bootstrap/libec/bootstrap/firstPass.c @@ -1107,7 +1107,7 @@ d->__anon1.structDecl.posExp = (((void *)0)); d->__anon1.structDecl.exp = (((void *)0)); } dataType = ProcessType(decl->__anon1.__anon1.specifiers, d); -PrintType(dataType, dataTypeString, 0x0, 0x1); +PrintType(dataType, dataTypeString, 0, 1); { struct __ecereNameSpace__ecere__com__BitMember * member = __ecereNameSpace__ecere__com__eClass_AddBitMember(regClass, declId->string, dataTypeString, 0, 0, def->memberAccess); @@ -1133,7 +1133,7 @@ char typeString[8192]; typeString[0] = (char)0; dataType = ProcessType(decl->__anon1.__anon1.specifiers, d); -PrintType(dataType, typeString, 0x0, 0x1); +PrintType(dataType, typeString, 0, 1); if(member) { dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, declId->string, typeString, 0, 0, def->memberAccess); @@ -1187,7 +1187,7 @@ typeString[0] = (char)0; spec->__anon1.__anon2.id = (((void *)0)); decl->__anon1.__anon1.declarators = MkListOne(MkDeclaratorIdentifier(id)); dataType = ProcessType(decl->__anon1.__anon1.specifiers, (((void *)0))); -PrintType(dataType, typeString, 0x0, 0x1); +PrintType(dataType, typeString, 0, 1); if(member) { dataMember = __ecereNameSpace__ecere__com__eMember_AddDataMember(member, id->string, typeString, 0, 0, def->memberAccess); @@ -1254,7 +1254,7 @@ if(prop) { if(inCompiler) prop->IsSet = (void *)propertyDef->issetStmt; -prop->compiled = 0x0; +prop->compiled = 0; prop->symbol = __extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); @@ -1391,7 +1391,7 @@ static void ProcessClass(int classType, struct __ecereNameSpace__ecere__sys__Old { struct __ecereNameSpace__ecere__com__Class * regClass; struct ClassDef * def; -unsigned int redefinition = 0x0; +unsigned int redefinition = 0; regClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, symbol->string); if(regClass && !regClass->internalDecl) @@ -1401,7 +1401,7 @@ if(symbol->parent || (struct Symbol *)globalContext->classes.root == symbol) __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Remove(&globalContext->classes, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), symbol); } -redefinition = 0x1; +redefinition = 1; if(inCompiler) { yylloc = *loc; @@ -1412,15 +1412,15 @@ return ; else { char baseName[1024] = ""; -unsigned int unitType = 0x0; -unsigned int wouldBeEnum = 0x0; +unsigned int unitType = 0; +unsigned int wouldBeEnum = 0; int inheritanceAccess = 1; if(baseSpecs != (((void *)0))) { struct Type * baseType = ProcessType(baseSpecs, (((void *)0))); -PrintType(baseType, baseName, 0x0, 0x1); +PrintType(baseType, baseName, 0, 1); if(baseType->kind == 8) { if(baseType->__anon1._class->__anon1.registered && classType == 0) @@ -1433,7 +1433,7 @@ else if(baseType->__anon1._class->__anon1.registered->type == 5) classType = 5; else if(baseType->__anon1._class->__anon1.registered->type == 4) { -wouldBeEnum = 0x1; +wouldBeEnum = 1; } } } @@ -1443,7 +1443,7 @@ classType = 5; baseName[0] = '\0'; } else -unitType = 0x1; +unitType = 1; FreeType(baseType); if(((struct Specifier *)baseSpecs->first)->type == 0 && ((struct Specifier *)baseSpecs->first)->__anon1.specifier == PRIVATE) inheritanceAccess = 2; diff --git a/compiler/bootstrap/libec/bootstrap/freeAst.c b/compiler/bootstrap/libec/bootstrap/freeAst.c index adc6925..0af6524 100644 --- a/compiler/bootstrap/libec/bootstrap/freeAst.c +++ b/compiler/bootstrap/libec/bootstrap/freeAst.c @@ -1008,14 +1008,14 @@ FreeFunction(item); } } -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)); void FreeExpression(struct Expression * exp); @@ -1031,7 +1031,7 @@ switch(type->kind) { case 15: { -struct __ecereNameSpace__ecere__sys__NamedLink * member, * next; +struct __ecereNameSpace__ecere__sys__NamedLink64 * member, * next; if(type->__anon1.__anon1.enumName) (__ecereNameSpace__ecere__com__eSystem_Delete(type->__anon1.__anon1.enumName), type->__anon1.__anon1.enumName = 0); @@ -1040,7 +1040,7 @@ for(member = type->__anon1.__anon1.members.first; member; member = next) next = member->next; __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(&type->__anon1.__anon1.members, member); (__ecereNameSpace__ecere__com__eSystem_Delete(member->name), member->name = 0); -((member ? (__ecereClass___ecereNameSpace__ecere__sys__NamedLink->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__NamedLink->Destructor((void *)member) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(member)) : 0), member = 0); +((member ? (__ecereClass___ecereNameSpace__ecere__sys__NamedLink64->Destructor ? __ecereClass___ecereNameSpace__ecere__sys__NamedLink64->Destructor((void *)member) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(member)) : 0), member = 0); } break; } @@ -1516,12 +1516,12 @@ static void _FreeExpression(struct Expression * exp, unsigned int freePointer); void FreeExpContents(struct Expression * exp) { -_FreeExpression(exp, 0x0); +_FreeExpression(exp, 0); } void FreeExpression(struct Expression * exp) { -_FreeExpression(exp, 0x1); +_FreeExpression(exp, 1); } void FreeInstance(struct Instantiation * inst); @@ -2661,7 +2661,7 @@ struct __ecereNameSpace__ecere__com__Iterator it = { list, 0 }; -unsigned int found = 0x0; +unsigned int found = 0; while(__ecereMethod___ecereNameSpace__ecere__com__Iterator_Next(&it)) { @@ -2672,7 +2672,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = list; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__com__List->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__com__Container_Remove])(list, it.pointer); -found = 0x1; +found = 1; break; } } @@ -2686,7 +2686,7 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = list, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(0)), 0x0); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(0)), 0); ((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data(&__internalIterator)); })))); diff --git a/compiler/bootstrap/libec/bootstrap/grammar.c b/compiler/bootstrap/libec/bootstrap/grammar.c index b3e7f13..21ed783 100644 --- a/compiler/bootstrap/libec/bootstrap/grammar.c +++ b/compiler/bootstrap/libec/bootstrap/grammar.c @@ -1074,7 +1074,7 @@ int yyerror(); unsigned int guess; -unsigned int deleteWatchable = 0x0; +unsigned int deleteWatchable = 0; int memberAccessStack[256]; @@ -3296,7 +3296,7 @@ break; case 13: { yyval.classFunction = MkClassFunction(yyvsp[(1) - (3)].list, (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isConstructor = 0x1; +yyval.classFunction->isConstructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3305,7 +3305,7 @@ break; case 14: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (4)].list, (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isDestructor = 0x1; +yyval.classFunction->isDestructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3314,7 +3314,7 @@ break; case 15: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3323,7 +3323,7 @@ break; case 16: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3348,7 +3348,7 @@ break; case 19: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3357,7 +3357,7 @@ break; case 20: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -4388,7 +4388,7 @@ yyvsp[(1) - (3)].prop->issetStmt = yyvsp[(3) - (3)].stmt; break; case 132: { -yyvsp[(1) - (2)].prop->__anon1.isWatchable = 0x1; +yyvsp[(1) - (2)].prop->__anon1.isWatchable = 1; ; } break; @@ -4621,7 +4621,7 @@ break; case 168: { yyval.classDef = (((void *)0)); -deleteWatchable = 0x1; +deleteWatchable = 1; ; } break; @@ -5094,7 +5094,7 @@ yyval.symbol = DeclClassAddNameSpace(globalContext->nextID++, yyvsp[(3) - (3)].i FreeIdentifier(yyvsp[(1) - (3)].id); FreeIdentifier(yyvsp[(3) - (3)].id); yyval.symbol->nameLoc = (yylsp[(3) - (3)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; memberAccessStack[++defaultMemberAccess] = 2; ; } @@ -5105,7 +5105,7 @@ case 239: yyval.symbol = DeclClass(globalContext->nextID++, yyvsp[(3) - (3)].specifier->__anon1.__anon1.name); FreeIdentifier(yyvsp[(1) - (3)].id); yyval.symbol->nameLoc = (yylsp[(3) - (3)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; FreeSpecifier(yyvsp[(3) - (3)].specifier); memberAccessStack[++defaultMemberAccess] = 2; ; @@ -5142,7 +5142,7 @@ yyval.symbol->templateParams = yyvsp[(5) - (6)].list; FreeIdentifier(yyvsp[(1) - (6)].id); FreeIdentifier(yyvsp[(3) - (6)].id); yyval.symbol->nameLoc = (yylsp[(3) - (6)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; memberAccessStack[++defaultMemberAccess] = 2; ; } @@ -5154,7 +5154,7 @@ yyval.symbol = DeclClass(globalContext->nextID++, yyvsp[(3) - (6)].specifier->__ yyval.symbol->templateParams = yyvsp[(5) - (6)].list; FreeIdentifier(yyvsp[(1) - (6)].id); yyval.symbol->nameLoc = (yylsp[(3) - (6)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; FreeSpecifier(yyvsp[(3) - (6)].specifier); memberAccessStack[++defaultMemberAccess] = 2; ; @@ -5237,7 +5237,7 @@ case 251: { yyval._class = MkClass(yyvsp[(1) - (3)].symbol, (((void *)0)), yyvsp[(3) - (3)].list); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5254,7 +5254,7 @@ case 252: yyval._class = yyvsp[(1) - (3)]._class; yyval._class->definitions = yyvsp[(3) - (3)].list; yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5270,7 +5270,7 @@ case 253: { yyval._class = MkClass(yyvsp[(1) - (3)].symbol, (((void *)0)), yyvsp[(3) - (3)].list); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5287,7 +5287,7 @@ case 254: yyval._class = yyvsp[(1) - (3)]._class; yyval._class->definitions = yyvsp[(3) - (3)].list; yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5303,7 +5303,7 @@ case 255: { yyval._class = MkClass(yyvsp[(1) - (3)].symbol, (((void *)0)), MkList()); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5320,7 +5320,7 @@ case 256: yyval._class = yyvsp[(1) - (3)]._class; yyval._class->definitions = MkList(); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -6070,13 +6070,13 @@ break; case 371: { yyval.exp = yyvsp[(1) - (2)].exp; -skipErrors = 0x1; +skipErrors = 1; ; } break; case 373: { -skipErrors = 0x0; +skipErrors = 0; yyval.exp = MkExpOp(yyvsp[(1) - (2)].exp, '<', yyvsp[(2) - (2)].exp); yyval.exp->loc = (yyloc); ; @@ -6839,7 +6839,7 @@ _DeclClass(0, name); } else _DeclClass(0, yyvsp[(1) - (2)].exp->__anon1.__anon1.identifier->string); -skipErrors = 0x0; +skipErrors = 0; FreeExpression(yyvsp[(1) - (2)].exp); FreeExpression(yyvsp[(2) - (2)].exp); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({ @@ -6871,7 +6871,7 @@ else yyval.exp = MkExpOp(yyvsp[(1) - (2)].exp, '<', yyvsp[(2) - (2)].exp); yyval.exp->loc = (yyloc); } -skipErrors = 0x0; +skipErrors = 0; ; } break; @@ -8356,7 +8356,7 @@ break; case 720: { yyval.specifier = MkStructOrUnion(yyvsp[(1) - (2)].specifierType, yyvsp[(2) - (2)].id, (((void *)0))); -yyval.specifier->__anon1.__anon2.addNameSpace = 0x1; +yyval.specifier->__anon1.__anon2.addNameSpace = 1; yyval.specifier->__anon1.__anon2.ctx = PushContext(); ; } @@ -8373,7 +8373,7 @@ case 722: { yyval.specifier = MkStructOrUnion(yyvsp[(1) - (3)].specifierType, yyvsp[(3) - (3)].id, (((void *)0))); yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (3)].extDecl; -yyval.specifier->__anon1.__anon2.addNameSpace = 0x1; +yyval.specifier->__anon1.__anon2.addNameSpace = 1; yyval.specifier->__anon1.__anon2.ctx = PushContext(); ; } @@ -9545,7 +9545,7 @@ ListAdd(yyvsp[(1) - (3)].list, MkTypeName((((void *)0)), MkDeclaratorIdentifier( break; case 868: { -char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (1)].specifier->__anon1.__anon1.name; yyval.declarator = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9562,7 +9562,7 @@ break; case 870: { struct Declarator * decl; -char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (4)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9574,7 +9574,7 @@ break; case 871: { struct Declarator * decl; -char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (4)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9586,7 +9586,7 @@ break; case 872: { struct Declarator * decl; -char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (4)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9598,7 +9598,7 @@ break; case 873: { struct Declarator * decl; -char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (3)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -10566,7 +10566,7 @@ ListAdd(yyval.list, yyvsp[(3) - (3)].initDeclarator); break; case 1024: { -char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (3)].specifier->__anon1.__anon1.name; yyval.list = MkList(); diff --git a/compiler/bootstrap/libec/bootstrap/lexer.c b/compiler/bootstrap/libec/bootstrap/lexer.c index 7953341..9baf61c 100644 --- a/compiler/bootstrap/libec/bootstrap/lexer.c +++ b/compiler/bootstrap/libec/bootstrap/lexer.c @@ -681,7 +681,7 @@ extern YYSTYPE yylval; extern struct Location yylloc; -unsigned int echoOn = 0x1; +unsigned int echoOn = 1; void SetEchoOn(unsigned int b) { diff --git a/compiler/bootstrap/libec/bootstrap/loadSymbols.c b/compiler/bootstrap/libec/bootstrap/loadSymbols.c index bdb16d3..3221b31 100644 --- a/compiler/bootstrap/libec/bootstrap/loadSymbols.c +++ b/compiler/bootstrap/libec/bootstrap/loadSymbols.c @@ -596,7 +596,7 @@ static int numIncludes; static char ** includes; -unsigned int inIDE = 0x0; +unsigned int inIDE = 0; void SetInIDE(unsigned int b) { @@ -634,14 +634,14 @@ unsigned int GetEcereImported() return ecereImported; } -unsigned int inPreCompiler = 0x0; +unsigned int inPreCompiler = 0; void SetInPreCompiler(unsigned int b) { inPreCompiler = b; } -unsigned int inSymbolGen = 0x0; +unsigned int inSymbolGen = 0; void SetInSymbolGen(unsigned int b) { @@ -657,7 +657,7 @@ precompDefines = list; unsigned int DummyMethod() { -return 0x1; +return 1; } extern char * __ecereNameSpace__ecere__sys__TrimLSpaces(const char * string, char * output); @@ -826,11 +826,11 @@ extern void * memcpy(void * , const void * , size_t size); extern char * __ecereNameSpace__ecere__sys__TrimRSpaces(const char * string, char * output); -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); -extern int atoi(const char * ); +extern long long strtoll(const char * nptr, char * * endptr, int base); -extern int __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string); +extern long long __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string); extern struct __ecereNameSpace__ecere__com__Method * __ecereNameSpace__ecere__com__eClass_AddVirtualMethod(struct __ecereNameSpace__ecere__com__Class * _class, const char * name, const char * type, void * function, int declMode); @@ -1022,16 +1022,16 @@ extern void __ecereNameSpace__ecere__com__eInstance_DecRef(struct __ecereNameSpa unsigned int LoadSymbols(const char * fileName, int importType, unsigned int loadDllOnly) { struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__sys__FileOpenBuffered(fileName, 1); -unsigned int globalInstance = 0x0; +unsigned int globalInstance = 0; if(f) { -unsigned int ecereCOMModule = 0x0; +unsigned int ecereCOMModule = 0; char moduleName[797]; __ecereNameSpace__ecere__sys__GetLastDirectory(fileName, moduleName); if(!((strcasecmp)(moduleName, "instance.sym") && (strcasecmp)(moduleName, "BinaryTree.sym") && (strcasecmp)(moduleName, "dataTypes.sym") && (strcasecmp)(moduleName, "OldList.sym") && (strcasecmp)(moduleName, "String.sym") && (strcasecmp)(moduleName, "BTNode.sym") && (strcasecmp)(moduleName, "Array.sym") && (strcasecmp)(moduleName, "AVLTree.sym") && (strcasecmp)(moduleName, "BuiltInContainer.sym") && (strcasecmp)(moduleName, "Container.sym") && (strcasecmp)(moduleName, "CustomAVLTree.sym") && (strcasecmp)(moduleName, "LinkList.sym") && (strcasecmp)(moduleName, "List.sym") && (strcasecmp)(moduleName, "Map.sym") && (strcasecmp)(moduleName, "Mutex.sym"))) -ecereCOMModule = 0x1; +ecereCOMModule = 1; for(; ; ) { char line[1024]; @@ -1042,17 +1042,17 @@ __ecereNameSpace__ecere__sys__TrimLSpaces(line, line); if(line[0] == '[') { if(!strcmp(line, "[Global Instance]")) -globalInstance = 0x1; +globalInstance = 1; else if(!strcmp(line, "[Defined Classes]")) { struct __ecereNameSpace__ecere__com__Class * regClass = (((void *)0)); char name[1024]; -unsigned int isRemote = 0x0; -unsigned int isStatic = 0x0; -unsigned int isWatchable = 0x0; +unsigned int isRemote = 0; +unsigned int isStatic = 0; +unsigned int isWatchable = 0; int classType = 0; -unsigned int fixed = 0x0; -unsigned int noExpansion = 0x0; +unsigned int fixed = 0; +unsigned int noExpansion = 0; int inheritanceAccess = 1; for(; ; ) @@ -1065,15 +1065,15 @@ break; if(line[0] == '[') { if(!strcmp(line, "[Remote]")) -isRemote = 0x1; +isRemote = 1; else if(!strcmp(line, "[Static]")) -isStatic = 0x1; +isStatic = 1; else if(!strcmp(line, "[Fixed]")) -fixed = 0x1; +fixed = 1; else if(!strcmp(line, "[No Expansion]")) -noExpansion = 0x1; +noExpansion = 1; else if(!strcmp(line, "[Watchable]")) -isWatchable = 0x1; +isWatchable = 1; else if(!strcmp(line, "[Enum]")) classType = 4; else if(!strcmp(line, "[Bit]")) @@ -1131,9 +1131,9 @@ symbol->__anon1.registered = __ecereNameSpace__ecere__com__eSystem_FindClass(pri } } if(fixed) -regClass->fixed = 0x1; +regClass->fixed = 1; if(noExpansion) -regClass->noExpansion = 0x1; +regClass->noExpansion = 1; if(isWatchable) { __ecereNameSpace__ecere__com__eClass_DestructionWatchable(regClass); @@ -1145,7 +1145,7 @@ existingClass->__anon1.registered = regClass; regClass->symbol = existingClass; existingClass->id = (((int)0x7fffffff)); existingClass->idCode = (((int)0x7fffffff)); -existingClass->imported = 0x1; +existingClass->imported = 1; if(regClass->module) existingClass->module = FindModule(regClass->module); else @@ -1157,10 +1157,10 @@ regClass = (((void *)0)); } else regClass = (((void *)0)); -isRemote = 0x0; -isWatchable = 0x0; -fixed = 0x0; -isStatic = 0x0; +isRemote = 0; +isWatchable = 0; +fixed = 0; +isStatic = 0; } else if(!strcmp(line, "[Enum Values]")) { @@ -1184,7 +1184,7 @@ memcpy(name, line, (int)(equal - line)); name[equal - line] = '\0'; __ecereNameSpace__ecere__sys__TrimLSpaces(name, name); __ecereNameSpace__ecere__sys__TrimRSpaces(name, name); -__ecereNameSpace__ecere__com__eEnum_AddFixedValue(regClass, name, atoi(equal + 1)); +__ecereNameSpace__ecere__com__eEnum_AddFixedValue(regClass, name, strtoll(equal + 1, (((void *)0)), 0)); } else { @@ -1196,7 +1196,7 @@ __ecereNameSpace__ecere__com__eEnum_AddValue(regClass, line); else if(!strcmp(line, "[Defined Methods]")) { char name[1024]; -unsigned int isVirtual = 0x0; +unsigned int isVirtual = 0; int memberAccess = 1; for(; ; ) @@ -1221,7 +1221,7 @@ __ecereNameSpace__ecere__com__eClass_AddMethod(regClass, name, line[0] ? line : } } else if(!strcmp(line, "[Virtual]")) -isVirtual = 0x1; +isVirtual = 1; else if(!strcmp(line, "[Public]")) memberAccess = 1; else if(!strcmp(line, "[Private]")) @@ -1230,7 +1230,7 @@ memberAccess = 2; else { strcpy(name, line); -isVirtual = 0x0; +isVirtual = 0; memberAccess = 1; } } @@ -1238,8 +1238,8 @@ memberAccess = 1; else if(!strcmp(line, "[Defined Properties]")) { char name[1024]; -unsigned int setStmt = 0x0, getStmt = 0x0, isVirtual = 0x0, conversion = 0x0; -unsigned int isWatchable = 0x0; +unsigned int setStmt = 0, getStmt = 0, isVirtual = 0, conversion = 0; +unsigned int isWatchable = 0; int memberAccess = 1; for(; ; ) @@ -1261,7 +1261,7 @@ struct __ecereNameSpace__ecere__com__Property * prop = __ecereNameSpace__ecere__ if(prop) { -prop->compiled = 0x0; +prop->compiled = 0; if(isWatchable) { __ecereNameSpace__ecere__com__eProperty_Watchable(prop); @@ -1271,25 +1271,25 @@ regClass->structSize = regClass->offset; } } else if(!strcmp(line, "[Set]")) -setStmt = 0x1; +setStmt = 1; else if(!strcmp(line, "[Get]")) -getStmt = 0x1; +getStmt = 1; else if(!strcmp(line, "[Watchable]")) -isWatchable = 0x1; +isWatchable = 1; else if(!strcmp(line, "[Public]")) memberAccess = 1; else if(!strcmp(line, "[Private]")) memberAccess = 2; else if(!strcmp(line, "[Conversion]")) { -conversion = 0x1; -setStmt = getStmt = isVirtual = isWatchable = 0x0; +conversion = 1; +setStmt = getStmt = isVirtual = isWatchable = 0; } } else { strcpy(name, line); -setStmt = getStmt = isVirtual = conversion = isWatchable = 0x0; +setStmt = getStmt = isVirtual = conversion = isWatchable = 0; memberAccess = 1; } } @@ -1297,7 +1297,7 @@ memberAccess = 1; else if(!strcmp(line, "[Defined Class Properties]")) { char name[1024]; -unsigned int setStmt = 0x0, getStmt = 0x0; +unsigned int setStmt = 0, getStmt = 0; for(; ; ) { @@ -1318,14 +1318,14 @@ __ecereNameSpace__ecere__com__eClass_AddClassProperty(regClass, name, line, (voi } } else if(!strcmp(line, "[Set]")) -setStmt = 0x1; +setStmt = 1; else if(!strcmp(line, "[Get]")) -getStmt = 0x1; +getStmt = 1; } else { strcpy(name, line); -setStmt = getStmt = 0x0; +setStmt = getStmt = 0; } } } @@ -1397,19 +1397,19 @@ struct __ecereNameSpace__ecere__com__Instance * backup = pushLexer(); struct Operand op; struct Expression * exp; -skipErrors = 0x1; +skipErrors = 1; exp = ParseExpressionString(line); if(exp) { if(info) -exp->destType = ProcessTypeString(info, 0x0); +exp->destType = ProcessTypeString(info, 0); ProcessExpressionType(exp); ComputeExpression(exp); op = GetOperand(exp); defaultArg.__anon1.expression.__anon1.ui64 = op.__anon1.ui64; FreeExpression(exp); } -skipErrors = 0x0; +skipErrors = 0; popLexer(backup); } break; @@ -1445,7 +1445,7 @@ else { inheritanceAccess = 1; classType = 0; -isRemote = 0x0; +isRemote = 0; strcpy(name, line); regClass = (((void *)0)); } @@ -1605,7 +1605,7 @@ ImportModule(line, moduleImportType, importAccess, loadDllOnly); else ImportModule(line, 4, importAccess, loadDllOnly); if(!strcmp(line, "ecere")) -ecereImported = 0x1; +ecereImported = 1; moduleImportType = 0; importAccess = 1; } @@ -1780,14 +1780,14 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_AddName((&*defines), module) module->dllOnly = loadDllOnly; if(ext[0] || !__ecereNameSpace__ecere__sys__FileExists(symFile)) { -unsigned int skipLoad = 0x0; +unsigned int skipLoad = 0; struct __ecereNameSpace__ecere__com__Instance * list = (((void *)0)); if(!inCompiler && !inPreCompiler && !inSymbolGen) { struct __ecereNameSpace__ecere__com__MapIterator it = (it.container = (void *)0, it.pointer = (void *)0, __ecereProp___ecereNameSpace__ecere__com__MapIterator_Set_map(&it, loadedModules), it); -if(!__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(name), 0x0)) +if(!__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index((void *)&it, (uint64)(name), 0)) { struct __ecereNameSpace__ecere__com__Instance * firstModule = __ecereNameSpace__ecere__com__eModule_LoadStrict(((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application, name, importAccess); @@ -1805,12 +1805,12 @@ struct __ecereNameSpace__ecere__com__Iterator __internalIterator = loadedModules, 0 }; -__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(name)), 0x1); +__ecereMethod___ecereNameSpace__ecere__com__Iterator_Index(&__internalIterator, ((uint64)(name)), 1); __ecereProp___ecereNameSpace__ecere__com__Iterator_Set_data(&__internalIterator, ((uint64)(list))); }); } else -skipLoad = 0x1; +skipLoad = 1; } else list = ((struct __ecereNameSpace__ecere__com__Instance *)__ecereProp___ecereNameSpace__ecere__com__Iterator_Get_data((void *)&it)); @@ -2027,13 +2027,13 @@ struct DataRedefinition * redefinition; for(redefinition = dataRedefinitions.first; redefinition; redefinition = redefinition->next) { -struct Type * type1 = ProcessTypeString(redefinition->type1, 0x0); -struct Type * type2 = ProcessTypeString(redefinition->type2, 0x0); +struct Type * type1 = ProcessTypeString(redefinition->type1, 0); +struct Type * type2 = ProcessTypeString(redefinition->type2, 0); char type1String[1024] = ""; char type2String[1024] = ""; -PrintType(type1, type1String, 0x0, 0x1); -PrintType(type2, type2String, 0x0, 0x1); +PrintType(type1, type1String, 0, 1); +PrintType(type2, type2String, 0, 1); if(strcmp(type1String, type2String)) Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "Redefinition of %s (defining as %s, already defined as %s)\n", (((void *)0))), redefinition->name, type1String, type2String); FreeType(type1); diff --git a/compiler/bootstrap/libec/bootstrap/output.c b/compiler/bootstrap/libec/bootstrap/output.c index 0fcf3a9..788ed13 100644 --- a/compiler/bootstrap/libec/bootstrap/output.c +++ b/compiler/bootstrap/libec/bootstrap/output.c @@ -1125,7 +1125,7 @@ extern struct Location yylloc; int outputLine; -unsigned int memoryGuard = 0x0; +unsigned int memoryGuard = 0; void SetMemoryGuard(unsigned int b) { @@ -1442,7 +1442,7 @@ struct Specifier * spec; for(spec = (*exp->__anon1._classExp.specifiers).first; spec; spec = spec->next) { -OutputSpecifier(spec, f, 0x0); +OutputSpecifier(spec, f, 0); if(spec->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1498,7 +1498,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " "); -OutputTypeName(exp->__anon1._renew.typeName, f, 0x0); +OutputTypeName(exp->__anon1._renew.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1522,7 +1522,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " "); -OutputTypeName(exp->__anon1._renew.typeName, f, 0x0); +OutputTypeName(exp->__anon1._renew.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1547,7 +1547,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " "); -OutputTypeName(exp->__anon1._renew.typeName, f, 0x0); +OutputTypeName(exp->__anon1._renew.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1572,7 +1572,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " "); -OutputTypeName(exp->__anon1._renew.typeName, f, 0x0); +OutputTypeName(exp->__anon1._renew.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1753,7 +1753,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "sizeof("); -OutputTypeName(exp->__anon1.typeName, f, 0x0); +OutputTypeName(exp->__anon1.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1766,7 +1766,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "__alignof__("); -OutputTypeName(exp->__anon1.typeName, f, 0x0); +OutputTypeName(exp->__anon1.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1780,7 +1780,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "__extension__ ("); if(exp->__anon1.initializer.typeName) -OutputTypeName(exp->__anon1.initializer.typeName, f, 0x0); +OutputTypeName(exp->__anon1.initializer.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1795,7 +1795,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "("); -OutputTypeName(exp->__anon1.cast.typeName, f, 0x0); +OutputTypeName(exp->__anon1.cast.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -1845,7 +1845,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, ", "); -OutputTypeName(exp->__anon1.vaArg.typeName, f, 0x0); +OutputTypeName(exp->__anon1.vaArg.typeName, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -2392,12 +2392,12 @@ decl = MkDeclaratorIdentifier(MkIdentifier("__ecereReturnVal")); } else { -PrintType(returnType, string, returnType->kind == 18 ? 0x1 : 0x0, 0x1); +PrintType(returnType, string, returnType->kind == 18 ? 1 : 0, 1); decl = SpecDeclFromString(string, specs, MkDeclaratorIdentifier(MkIdentifier("__ecereReturnVal"))); } typeName = MkTypeName(specs, decl); -InstDeclPassTypeName(typeName, 0x0); -OutputTypeName(typeName, f, 0x0); +InstDeclPassTypeName(typeName, 0); +OutputTypeName(typeName, f, 0); __ecereMethod___ecereNameSpace__ecere__sys__File_Printf(f, ";"); FreeTypeName(typeName); } @@ -2456,7 +2456,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "__asm__ "); if(stmt->__anon1.asmStmt.spec) -OutputSpecifier(stmt->__anon1.asmStmt.spec, f, 0x0); +OutputSpecifier(stmt->__anon1.asmStmt.spec, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -2561,7 +2561,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " "); for(spec = (*ptr->qualifiers).first; spec; spec = spec->next) { -OutputSpecifier(spec, f, 0x0); +OutputSpecifier(spec, f, 0); if(spec->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -2703,7 +2703,7 @@ if(decl->__anon1.function.parameters && (*decl->__anon1.function.parameters).fir { for(param = (*decl->__anon1.function.parameters).first; param; param = param->next) { -OutputTypeName(param, f, 0x0); +OutputTypeName(param, f, 0); if(param->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -3185,7 +3185,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "subclass("); -OutputSpecifier(spec->__anon1._class, f, 0x0); +OutputSpecifier(spec->__anon1._class, f, 0); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -3335,12 +3335,12 @@ struct InitDeclarator * d; if(decl->__anon1.__anon1.specifiers) { -unsigned int inTypeDef = 0x0; +unsigned int inTypeDef = 0; for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next) { if(spec->type == 0 && spec->__anon1.specifier == TYPEDEF) -inTypeDef = 0x1; +inTypeDef = 1; OutputSpecifier(spec, f, inTypeDef && !spec->next); if(spec->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ @@ -3376,7 +3376,7 @@ if(decl->__anon1.__anon1.specifiers) { for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next) { -OutputSpecifier(spec, f, 0x0); +OutputSpecifier(spec, f, 0); if(spec->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -3412,7 +3412,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " "); -OutputSpecifier(decl->extStorage, f, 0x0); +OutputSpecifier(decl->extStorage, f, 0); } break; } @@ -3453,7 +3453,7 @@ struct Specifier * spec; for(spec = (*func->specifiers).first; spec; spec = spec->next) { -OutputSpecifier(spec, f, 0x0); +OutputSpecifier(spec, f, 0); if(spec->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -3590,7 +3590,7 @@ break; static void OutputInstance(struct Instantiation * inst, struct __ecereNameSpace__ecere__com__Instance * f) { if(inst->_class) -OutputSpecifier(inst->_class, f, 0x0); +OutputSpecifier(inst->_class, f, 0); if(inst->exp) { ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ @@ -3661,7 +3661,7 @@ struct Specifier * spec; for(spec = (*func->specifiers).first; spec; spec = spec->next) { -OutputSpecifier(spec, f, 0x0); +OutputSpecifier(spec, f, 0); if(spec->next) ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, const char * string))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; @@ -3776,7 +3776,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, "class "); -OutputSpecifier(_class->_class, f, 0x0); +OutputSpecifier(_class->_class, f, 0); if(_class->baseSpecs) { struct Specifier * spec; @@ -3788,7 +3788,7 @@ __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpa })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Puts])(f, " : "); for(spec = (*_class->baseSpecs).first; spec; spec = spec->next) { -OutputSpecifier(spec, f, 0x0); +OutputSpecifier(spec, f, 0); } } if(_class->definitions) @@ -3884,7 +3884,7 @@ unsigned int size; typeName->qualifiers = specs; typeName->declarator = decl; -OutputTypeName(typeName, f, 0x1); +OutputTypeName(typeName, f, 1); ((typeName ? (__ecereClass_TypeName->Destructor ? __ecereClass_TypeName->Destructor((void *)typeName) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(typeName)) : 0), typeName = 0); size = ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = f; diff --git a/compiler/bootstrap/libec/bootstrap/pass0.c b/compiler/bootstrap/libec/bootstrap/pass0.c index 7420dd1..cdf72ec 100644 --- a/compiler/bootstrap/libec/bootstrap/pass0.c +++ b/compiler/bootstrap/libec/bootstrap/pass0.c @@ -1178,7 +1178,7 @@ extern int AddMembers(struct __ecereNameSpace__ecere__sys__OldList * declaratio static void AddSimpleBaseMembers(struct __ecereNameSpace__ecere__sys__OldList * list, struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class * topClass) { if(_class->type != 1000) -AddMembers(list, _class, 0x0, (((void *)0)), topClass, (((void *)0))); +AddMembers(list, _class, 0, (((void *)0)), topClass, (((void *)0))); } extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__NameSpace; @@ -1200,11 +1200,11 @@ struct __ecereNameSpace__ecere__sys__BinaryTree functions; static unsigned int NameSpaceContained(struct __ecereNameSpace__ecere__com__NameSpace * ns, struct __ecereNameSpace__ecere__com__NameSpace * parent) { if(ns == parent) -return 0x1; +return 1; else if((*ns).parent) return NameSpaceContained((*ns).parent, parent); else -return 0x0; +return 0; } extern void Compiler_Error(const char * format, ...); @@ -1839,7 +1839,7 @@ exp->type = 8; exp->__anon1.member.member = exp->__anon1.__anon1.identifier; exp->__anon1.member.exp = QMkExpId("this"); exp->__anon1.member.memberType = 3; -exp->__anon1.member.thisPtr = 0x1; +exp->__anon1.member.thisPtr = 1; } else { @@ -1851,12 +1851,12 @@ classSym = inst->_class->__anon1.__anon1.symbol; if(classSym && classSym->__anon1.registered && (classSym->__anon1.registered->type == 1 || classSym->__anon1.registered->type == 2 || classSym->__anon1.registered->type == 3)) { if(inst->members && (*inst->members).count) -symbol->needConstructor = 0x1; +symbol->needConstructor = 1; } else { -symbol->needConstructor = 0x1; -symbol->needDestructor = 0x1; +symbol->needConstructor = 1; +symbol->needDestructor = 1; } } } @@ -1874,9 +1874,9 @@ def->__anon1.decl = (((void *)0)); } } else if(def->type == 1) -symbol->needConstructor = 0x1; +symbol->needConstructor = 1; else if(def->type == 4) -symbol->needConstructor = 0x1; +symbol->needConstructor = 1; else if(def->type == 0) { struct ClassFunction * func = def->__anon1.function; @@ -1890,7 +1890,7 @@ Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "redefinition } else { -symbol->needDestructor = 0x1; +symbol->needDestructor = 1; destructor = func; if(!inCompiler && func->body) { @@ -1909,7 +1909,7 @@ Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "redefinition } else { -symbol->needConstructor = 0x1; +symbol->needConstructor = 1; constructor = func; if(!inCompiler && func->body) { @@ -1942,7 +1942,7 @@ external->symbol = symbol; symbol->__anon2.__anon1.structExternal = external; external->__anon1.declaration = MkDeclaration(specs, declarators); after = external; -symbol->declaredStruct = 0x1; +symbol->declaredStruct = 1; } else { @@ -1958,13 +1958,13 @@ struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(); struct External * external; strcpy(classDataStructName, "__ecereClassData_"); -FullClassNameCat(classDataStructName, symbol->string, 0x0); +FullClassNameCat(classDataStructName, symbol->string, 0); declMode = structDeclMode = 0; ListAdd(specs, MkStructOrUnion(3, MkIdentifier(classDataStructName), classDataList)); external = MkExternalDeclaration(MkDeclaration(specs, (((void *)0)))); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(defs, after, external); after = external; -symbol->classData = 0x1; +symbol->classData = 1; } else (__ecereNameSpace__ecere__com__eSystem_Delete(classDataList), classDataList = 0); @@ -1975,7 +1975,7 @@ if(inCompiler) struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(), * declarators = MkList(); strcpy(className, "__ecereClass_"); -FullClassNameCat(className, symbol->string, 0x1); +FullClassNameCat(className, symbol->string, 1); symbol->className = __ecereNameSpace__ecere__sys__CopyString(className); if(!strstr(sourceFile, ".main.ec")) ListAdd(specs, MkSpecifier(STATIC)); @@ -1995,7 +1995,7 @@ struct Context * context; struct __ecereNameSpace__ecere__sys__OldList * declarations = (((void *)0)), * statements; strcpy(destructorName, "__ecereDestructor_"); -FullClassNameCat(destructorName, symbol->string, 0x0); +FullClassNameCat(destructorName, symbol->string, 0); symbol->destructorName = __ecereNameSpace__ecere__sys__CopyString(destructorName); ListAdd(specs, MkSpecifier(VOID)); context = PushContext(); @@ -2044,7 +2044,7 @@ function = MkClassFunction(specs, (((void *)0)), decl, (((void *)0))); ProcessClassFunctionBody(function, body); function->id = symbol->id; function->idCode = symbol->idCode; -function->dontMangle = 0x1; +function->dontMangle = 1; __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(definitions, (((void *)0)), MkClassDefFunction(function)); } if(symbol->needConstructor && inCompiler) @@ -2057,7 +2057,7 @@ struct Context * context; struct __ecereNameSpace__ecere__sys__OldList * declarations = (((void *)0)), * statements; strcpy(constructorName, "__ecereConstructor_"); -FullClassNameCat(constructorName, symbol->string, 0x0); +FullClassNameCat(constructorName, symbol->string, 0); symbol->constructorName = __ecereNameSpace__ecere__sys__CopyString(constructorName); ListAdd(specs, MkSpecifierName("bool")); context = PushContext(); @@ -2080,7 +2080,7 @@ newInst->members = (((void *)0)); newInst->exp = CopyExpression(inst->exp); newInst->_class = CopySpecifier(inst->_class); ListAdd(statements, MkExpressionStmt(MkListOne(MkExpInstance(newInst)))); -inst->built = 0x1; +inst->built = 1; } if(inst->exp && (!classSym || !classSym->__anon1.registered || classSym->__anon1.registered->type == 0)) { @@ -2154,7 +2154,7 @@ function = MkClassFunction(specs, (((void *)0)), decl, (((void *)0))); ProcessClassFunctionBody(function, body); function->id = symbol->id; function->idCode = symbol->idCode; -function->dontMangle = 0x1; +function->dontMangle = 1; if(definitions != (((void *)0))) __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(definitions, (((void *)0)), MkClassDefFunction(function)); } @@ -2187,9 +2187,9 @@ struct __ecereNameSpace__ecere__sys__OldList * params; if(propertyDef->getStmt && propertyDef->id) { strcpy(name, "__ecereProp_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_Get_"); -FullClassNameCat(name, propertyDef->id->string, 0x1); +FullClassNameCat(name, propertyDef->id->string, 1); params = MkList(); if(propertyDef->symbol->type && propertyDef->symbol->type->kind == 8 && propertyDef->symbol->type->__anon1._class && propertyDef->symbol->type->__anon1._class->__anon1.registered && propertyDef->symbol->type->__anon1._class->__anon1.registered->type == 1) { @@ -2205,7 +2205,7 @@ func = MkClassFunction(CopyList(propertyDef->specifiers, CopySpecifier), (((void ProcessClassFunctionBody(func, propertyDef->getStmt); func->declarator->symbol = propertyDef->symbol; propertyDef->symbol->__anon2.__anon2.externalGet = (struct External *)func; -func->dontMangle = 0x1; +func->dontMangle = 1; newDef = MkClassDefFunction(func); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(definitions, after, newDef); after = newDef; @@ -2219,9 +2219,9 @@ if(propertyDef->setStmt && propertyDef->id) struct __ecereNameSpace__ecere__sys__OldList * specifiers = MkList(); strcpy(name, "__ecereProp_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_Set_"); -FullClassNameCat(name, propertyDef->id->string, 0x1); +FullClassNameCat(name, propertyDef->id->string, 1); params = MkList(); ListAdd(params, MkTypeName(CopyList(propertyDef->specifiers, CopySpecifier), PlugDeclarator(propertyDef->declarator, MkDeclaratorIdentifier(MkIdentifier("value"))))); if(propertyDef->__anon1.isDBProp) @@ -2238,13 +2238,13 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specs), (((void *) decl = MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(name)), params); { unsigned int isConversion = propertyDef->symbol->__anon1._property && propertyDef->symbol->__anon1._property->conversion; -unsigned int useVoid = 0x0; +unsigned int useVoid = 0; switch(regClass->type) { case 1: case 6: -useVoid = 0x1; +useVoid = 1; break; case 5: case 0: @@ -2259,7 +2259,7 @@ ListAdd(specifiers, useVoid ? MkSpecifier(VOID) : MkSpecifierName(regClass->full } func = MkClassFunction(specifiers, (((void *)0)), decl, (((void *)0))); ProcessClassFunctionBody(func, propertyDef->setStmt); -func->dontMangle = 0x1; +func->dontMangle = 1; func->declarator->symbol = propertyDef->symbol; propertyDef->symbol->__anon2.__anon2.externalSet = (struct External *)func; if(!propertyDef->__anon1.conversion && regClass->type == 0) @@ -2277,15 +2277,15 @@ if(propertyDef->issetStmt && propertyDef->id) struct __ecereNameSpace__ecere__sys__OldList * specifiers = MkList(); strcpy(name, "__ecereProp_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_IsSet_"); -FullClassNameCat(name, propertyDef->id->string, 0x1); +FullClassNameCat(name, propertyDef->id->string, 1); params = MkList(); decl = MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(name)), params); ListAdd(specifiers, MkSpecifierName("bool")); func = MkClassFunction(specifiers, (((void *)0)), decl, (((void *)0))); ProcessClassFunctionBody(func, propertyDef->issetStmt); -func->dontMangle = 0x1; +func->dontMangle = 1; func->declarator->symbol = propertyDef->symbol; propertyDef->symbol->__anon2.__anon2.externalIsSet = (struct External *)func; newDef = MkClassDefFunction(func); @@ -2306,17 +2306,17 @@ struct __ecereNameSpace__ecere__sys__OldList * specifiers = MkList(); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC)); ListAdd(specifiers, MkSpecifierName("Property")); strcpy(name, "__ecereProp_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_"); -FullClassNameCat(name, propertyDef->id->string, 0x1); +FullClassNameCat(name, propertyDef->id->string, 1); { struct __ecereNameSpace__ecere__sys__OldList * list = MkList(); ListAdd(list, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(name)), (((void *)0)))); strcpy(name, "__ecerePropM_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_"); -FullClassNameCat(name, propertyDef->id->string, 0x1); +FullClassNameCat(name, propertyDef->id->string, 1); ListAdd(list, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(name)), (((void *)0)))); decl = MkDeclaration(specifiers, list); } @@ -2356,7 +2356,7 @@ if(propertyDef->getStmt && propertyDef->id) struct Declarator * declId; sprintf(name, "class::__ecereClassProp_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_Get_"); strcat(name, propertyDef->id->string); params = MkList(); @@ -2368,7 +2368,7 @@ func = MkClassFunction(MkListOne(MkSpecifierName("uint64")), (((void *)0)), decl ProcessClassFunctionBody(func, propertyDef->getStmt); func->declarator->symbol = propertyDef->symbol; propertyDef->symbol->__anon2.__anon2.externalGet = (struct External *)func; -func->dontMangle = 0x1; +func->dontMangle = 1; newDef = MkClassDefFunction(func); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(definitions, after, newDef); after = newDef; @@ -2376,8 +2376,8 @@ decl = PlugDeclarator(propertyDef->declarator, MkDeclaratorFunction((((void *)0) func->type = ProcessType(propertyDef->specifiers, decl); FreeDeclarator(decl); if(func->type->__anon1.__anon2.returnType->kind == 8 && func->type->__anon1.__anon2.returnType->__anon1._class && func->type->__anon1.__anon2.returnType->__anon1._class->__anon1.registered && func->type->__anon1.__anon2.returnType->__anon1._class->__anon1.registered->type == 1) -func->type->__anon1.__anon2.returnType->byReference = 0x1; -func->type->__anon1.__anon2.returnType->passAsTemplate = 0x1; +func->type->__anon1.__anon2.returnType->byReference = 1; +func->type->__anon1.__anon2.returnType->passAsTemplate = 1; if(inCompiler) propertyDef->getStmt = (((void *)0)); else @@ -2391,7 +2391,7 @@ struct Statement * body = propertyDef->setStmt; struct Declarator * ptrDecl; strcpy(name, "class::__ecereClassProp_"); -FullClassNameCat(name, symbol->string, 0x0); +FullClassNameCat(name, symbol->string, 0); strcat(name, "_Set_"); strcat(name, propertyDef->id->string); params = MkList(); @@ -2410,14 +2410,14 @@ curContext = prevCurContext; { struct Symbol * sym = ptrDecl->symbol; -sym->isParam = 0x1; +sym->isParam = 1; FreeType(sym->type); sym->type = ProcessType(propertyDef->specifiers, propertyDef->declarator); } ListAdd(specifiers, MkSpecifier(VOID)); func = MkClassFunction(specifiers, (((void *)0)), decl, (((void *)0))); ProcessClassFunctionBody(func, propertyDef->setStmt); -func->dontMangle = 0x1; +func->dontMangle = 1; func->declarator->symbol = propertyDef->symbol; propertyDef->symbol->__anon2.__anon2.externalSet = (struct External *)func; newDef = MkClassDefFunction(func); @@ -2461,7 +2461,7 @@ yylloc = def->loc; if(!NameSpaceContained(regClass->nameSpace, &((struct __ecereNameSpace__ecere__com__Module *)(((char *)regClass->module + structSize_Instance)))->privateNameSpace) && method->memberAccess == 1) CheckPublicDataType(method->dataType, 1, "class method"); strcpy(newId, "__ecereMethod_"); -FullClassNameCat(newId, symbol->string, 0x0); +FullClassNameCat(newId, symbol->string, 0); strcat(newId, "_"); strcat(newId, id->string); (__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0); diff --git a/compiler/bootstrap/libec/bootstrap/pass1.c b/compiler/bootstrap/libec/bootstrap/pass1.c index 09c9533..8bdf427 100644 --- a/compiler/bootstrap/libec/bootstrap/pass1.c +++ b/compiler/bootstrap/libec/bootstrap/pass1.c @@ -1097,7 +1097,7 @@ static struct External * unregisterModuleExternal; extern int propWatcherID; -unsigned int buildingECERECOM = 0x0; +unsigned int buildingECERECOM = 0; void SetBuildingEcereCom(unsigned int b) { @@ -1109,7 +1109,7 @@ unsigned int GetBuildingEcereCom() return buildingECERECOM; } -unsigned int buildingECERECOMModule = 0x0; +unsigned int buildingECERECOMModule = 0; void SetBuildingEcereComModule(unsigned int b) { @@ -1206,7 +1206,7 @@ func->declarator->symbol = (((void *)0)); symid += 2; } { -function = _MkFunction(func->specifiers, func->declarator, (((void *)0)), 0x0); +function = _MkFunction(func->specifiers, func->declarator, (((void *)0)), 0); function->propSet = func->propSet; function->type = func->type; if(func->type) @@ -1242,12 +1242,12 @@ if(owningClass->templateArgs) struct __ecereNameSpace__ecere__com__ClassTemplateArgument * arg = FindTemplateArg(owningClass, method->dataType->__anon1.__anon2.thisClassTemplate); type->byReference = method->dataType->byReference; -methodDataType = ProcessTypeString(method->dataTypeString, 0x0); +methodDataType = ProcessTypeString(method->dataTypeString, 0); type->__anon1.__anon2.thisClass = methodDataType->__anon1.__anon2.thisClass = arg ? FindClass((*arg).__anon1.__anon1.dataTypeString) : (((void *)0)); } } else if(method->dataType->__anon1.__anon2.staticMethod) -type->__anon1.__anon2.staticMethod = 0x1; +type->__anon1.__anon2.staticMethod = 1; else if(method->dataType->__anon1.__anon2.thisClass) { type->__anon1.__anon2.thisClass = method->dataType->__anon1.__anon2.thisClass; @@ -1258,11 +1258,11 @@ else if(!owningClass->symbol) owningClass->symbol = FindClass(owningClass->fullName); type->__anon1.__anon2.thisClass = owningClass->symbol; -type->extraParam = 0x1; +type->extraParam = 1; } } yylloc = func->loc; -if(!MatchTypes(type, methodDataType, (((void *)0)), owningClass, method->_class, 0x1, 0x1, 0x1, 0x0, 0x1)) +if(!MatchTypes(type, methodDataType, (((void *)0)), owningClass, method->_class, 1, 1, 1, 0, 1)) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Incompatible virtual function %s\n", (((void *)0))), method->name); } @@ -1438,7 +1438,7 @@ FixModuleName(moduleName); sprintf(registerName, "__ecereRegisterModule_%s", moduleName); declarator = MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(registerName)), MkListOne(moduleParam)); { -struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0x0); +struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0); ProcessFunctionBody(function, registerModuleBody); function->declMode = 0; @@ -1469,7 +1469,7 @@ FixModuleName(moduleName); sprintf(registerName, "__ecereUnregisterModule_%s", moduleName); declarator = MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(registerName)), MkListOne(moduleParam)); { -struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0x0); +struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0); ProcessFunctionBody(function, unregisterModuleBody); function->declMode = 0; @@ -1578,7 +1578,7 @@ struct Statement * stmt; char dataMemberSize[16]; unsigned int lastOffset = 0; int privateID = 0; -unsigned int privateMembers = 0x0; +unsigned int privateMembers = 0; sprintf(dataMemberSize, "%d", (int)sizeof(struct __ecereNameSpace__ecere__com__DataMember *)); if(!isMember) @@ -1599,9 +1599,9 @@ ListAdd(args, MkExpString(string)); if(prop->Set) { strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x0); +FullClassNameCat(name, regClass->fullName, 0); strcat(name, "_Set_"); -FullClassNameCat(name, prop->name, 0x1); +FullClassNameCat(name, prop->name, 1); ListAdd(args, MkExpIdentifier(MkIdentifier(name))); } else @@ -1609,9 +1609,9 @@ ListAdd(args, MkExpConstant("0")); if(prop->Get) { strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x0); +FullClassNameCat(name, regClass->fullName, 0); strcat(name, "_Get_"); -FullClassNameCat(name, prop->name, 0x1); +FullClassNameCat(name, prop->name, 1); ListAdd(args, MkExpIdentifier(MkIdentifier(name))); } else @@ -1630,9 +1630,9 @@ ListAdd(args, MkExpIdentifier(MkIdentifier("publicAccess"))); break; } strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x0); +FullClassNameCat(name, regClass->fullName, 0); strcat(name, "_"); -FullClassNameCat(name, prop->name, 0x1); +FullClassNameCat(name, prop->name, 1); stmt = MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier(name)), '=', MkExpCall(MkExpIdentifier(MkIdentifier("eClass_AddProperty")), args)))); ListAdd(registerModuleBody->__anon1.compound.statements, stmt); } @@ -1659,9 +1659,9 @@ ListAdd(args, MkExpString(string)); if(prop->Set) { strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x0); +FullClassNameCat(name, regClass->fullName, 0); strcat(name, "_Set_"); -FullClassNameCat(name, prop->name, 0x1); +FullClassNameCat(name, prop->name, 1); ListAdd(args, MkExpIdentifier(MkIdentifier(name))); } else @@ -1669,9 +1669,9 @@ ListAdd(args, MkExpConstant("0")); if(prop->Get) { strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x0); +FullClassNameCat(name, regClass->fullName, 0); strcat(name, "_Get_"); -FullClassNameCat(name, prop->name, 0x1); +FullClassNameCat(name, prop->name, 1); ListAdd(args, MkExpIdentifier(MkIdentifier(name))); } else @@ -1690,13 +1690,13 @@ ListAdd(args, MkExpIdentifier(MkIdentifier("publicAccess"))); break; } strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x0); +FullClassNameCat(name, regClass->fullName, 0); strcat(name, "_"); -FullClassNameCat(name, prop->name, 0x1); +FullClassNameCat(name, prop->name, 1); strcpy(nameM, "__ecerePropM_"); -FullClassNameCat(nameM, regClass->fullName, 0x0); +FullClassNameCat(nameM, regClass->fullName, 0); strcat(nameM, "_"); -FullClassNameCat(nameM, prop->name, 0x1); +FullClassNameCat(nameM, prop->name, 1); if(prop->dataTypeString) { stmt = MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier(nameM)), '=', MkExpCall(MkExpIdentifier(MkIdentifier("eClass_AddProperty")), args)))); @@ -1711,9 +1711,9 @@ if(prop->IsSet) char name[1024]; strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x1); +FullClassNameCat(name, regClass->fullName, 1); strcat(name, "_IsSet_"); -FullClassNameCat(name, prop->name, 0x0); +FullClassNameCat(name, prop->name, 0); stmt = MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier(nameM)), MkIdentifier("IsSet")), '=', MkExpCast(MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpIdentifier(MkIdentifier(name)))))); ListAdd(registerModuleBody->__anon1.compound.statements, stmt); } @@ -1813,12 +1813,12 @@ ListAdd(args, (exp = MkExpConstant("1"))); ListAdd(args, MkExpIdentifier(MkIdentifier("privateAccess"))); stmt = MkExpressionStmt(MkListOne(MkExpCall(MkExpIdentifier(MkIdentifier(isMember ? "eMember_AddDataMember" : "eClass_AddDataMember")), args))); ListAdd(statement->__anon1.compound.statements, stmt); -privateMembers = 0x0; +privateMembers = 0; } if(member->type == 0) { if(!member->dataType) -member->dataType = ProcessTypeString(member->dataTypeString, 0x0); +member->dataType = ProcessTypeString(member->dataTypeString, 0); ComputeTypeSize(member->dataType); args = MkList(); ListAdd(args, MkExpIdentifier(MkIdentifier(className))); @@ -1893,7 +1893,7 @@ compound->__anon1.compound.context = context; args = MkList(); ListAdd(args, MkExpIdentifier(MkIdentifier(className))); ListAdd(args, MkExpIdentifier(MkIdentifier(memberName))); -RegisterMembersAndProperties((struct __ecereNameSpace__ecere__com__Class *)member, 0x1, memberName, compound); +RegisterMembersAndProperties((struct __ecereNameSpace__ecere__com__Class *)member, 1, memberName, compound); if(isMember) stmt = MkExpressionStmt(MkListOne(MkExpCall(MkExpIdentifier(MkIdentifier("eMember_AddMember")), args))); else @@ -1906,7 +1906,7 @@ lastOffset = member->offset + member->memberOffset; } } else -privateMembers = 0x1; +privateMembers = 1; } if(!isMember) { @@ -1920,13 +1920,13 @@ struct __ecereNameSpace__ecere__sys__OldList * args; char name[1024], nameM[1024]; strcpy(name, "__ecereProp_"); -FullClassNameCat(name, regClass->fullName, 0x1); +FullClassNameCat(name, regClass->fullName, 1); strcat(name, "_"); -FullClassNameCat(name, prop->name, 0x0); +FullClassNameCat(name, prop->name, 0); strcpy(nameM, "__ecerePropM_"); -FullClassNameCat(nameM, regClass->fullName, 0x1); +FullClassNameCat(nameM, regClass->fullName, 1); strcat(nameM, "_"); -FullClassNameCat(nameM, prop->name, 0x0); +FullClassNameCat(nameM, prop->name, 0); args = MkListOne(MkExpCondition(MkExpIdentifier(MkIdentifier(nameM)), MkListOne(MkExpIdentifier(MkIdentifier(nameM))), MkExpIdentifier(MkIdentifier(name)))); stmt = MkExpressionStmt(MkListOne(MkExpCall(MkExpIdentifier(MkIdentifier("eProperty_Watchable")), args))); ListAdd(registerModuleBody->__anon1.compound.statements, stmt); @@ -1950,7 +1950,7 @@ ListAdd(args, MkExpString(string)); if(classProperty->Set) { strcpy(name, "__ecereClassProp_"); -FullClassNameCat(name, regClass->fullName, 0x1); +FullClassNameCat(name, regClass->fullName, 1); strcat(name, "_Set_"); strcat(name, classProperty->name); ListAdd(args, MkExpIdentifier(MkIdentifier(name))); @@ -1960,7 +1960,7 @@ ListAdd(args, MkExpConstant("0")); if(classProperty->Get) { strcpy(name, "__ecereClassProp_"); -FullClassNameCat(name, regClass->fullName, 0x1); +FullClassNameCat(name, regClass->fullName, 1); strcat(name, "_Get_"); strcat(name, classProperty->name); ListAdd(args, MkExpIdentifier(MkIdentifier(name))); @@ -2006,21 +2006,21 @@ extern unsigned int parsingType; extern void ProcessExpressionType(struct Expression * exp); -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 int strcmp(const char * , const char * ); extern void FreeExpContents(struct Expression * exp); -extern char * PrintUInt(uint64 result); +extern char * PrintInt64(long long result); extern void ComputeExpression(struct Expression * exp); @@ -2090,9 +2090,9 @@ struct OpTable ops; extern struct Operand GetOperand(struct Expression * exp); -extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, int value); +extern void __ecereNameSpace__ecere__com__eEnum_AddFixedValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string, long long value); -extern int __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string); +extern long long __ecereNameSpace__ecere__com__eEnum_AddValue(struct __ecereNameSpace__ecere__com__Class * _class, const char * string); extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__OldLink; @@ -2108,7 +2108,7 @@ extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpac struct __ecereNameSpace__ecere__com__EnumClassData { struct __ecereNameSpace__ecere__sys__OldList values; -int largest; +long long largest; } __attribute__ ((gcc_struct)); extern struct ClassFunction * MkClassFunction(struct __ecereNameSpace__ecere__sys__OldList * specifiers, struct Specifier * _class, struct Declarator * decl, struct __ecereNameSpace__ecere__sys__OldList * declList); @@ -2145,14 +2145,14 @@ extern void DeclareMethod(struct __ecereNameSpace__ecere__com__Method * method, extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_FindClass(struct __ecereNameSpace__ecere__com__Instance * module, const char * name); +extern char * PrintUInt64(uint64 result); + extern char * StringFromSpecDecl(struct __ecereNameSpace__ecere__sys__OldList * specs, struct Declarator * decl); extern size_t strlen(const char * ); extern struct MemberInit * MkMemberInit(struct __ecereNameSpace__ecere__sys__OldList * ids, struct Initializer * initializer); -extern char * PrintUInt64(uint64 result); - extern struct Expression * MkExpInstance(struct Instantiation * inst); extern struct Instantiation * MkInstantiation(struct Specifier * _class, struct Expression * exp, struct __ecereNameSpace__ecere__sys__OldList * members); @@ -2194,12 +2194,12 @@ for(e = enumValues->first; e; e = e->next) { if(e->exp) { -struct Type * destType = (destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), destType->kind = 3, destType->refCount = 1, destType); +struct Type * destType = (destType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), destType->kind = 4, destType->refCount = 1, destType); e->exp->destType = destType; -parsingType = 0x1; +parsingType = 1; ProcessExpressionType(e->exp); -parsingType = 0x0; +parsingType = 0; if(!e->exp->expType) { destType->kind = 8; @@ -2208,7 +2208,7 @@ ProcessExpressionType(e->exp); } if(e->exp->type == 0 && e->exp->expType && e->exp->__anon1.__anon1.identifier && e->exp->__anon1.__anon1.identifier->string && e->exp->expType->kind == 15) { -struct __ecereNameSpace__ecere__sys__NamedLink * l; +struct __ecereNameSpace__ecere__sys__NamedLink64 * l; char * string = e->exp->__anon1.__anon1.identifier->string; for(l = e->exp->expType->__anon1.__anon1.members.first; l; l = l->next) @@ -2219,9 +2219,9 @@ if(l->data) { FreeExpContents(e->exp); e->exp->type = 2; -e->exp->__anon1.__anon1.constant = PrintUInt((unsigned int)l->data); +e->exp->__anon1.__anon1.constant = PrintInt64(l->data); FreeType(e->exp->expType); -e->exp->expType = ProcessTypeString("uint", 0x0); +e->exp->expType = ProcessTypeString("int64", 0); } break; } @@ -2232,18 +2232,22 @@ ComputeExpression(e->exp); if(e->exp->isConstant && e->exp->type == 2) { struct Operand op = GetOperand(e->exp); -int value; +long long value; switch(op.kind) { case 1: -value = op.__anon1.c; +value = op.type->isSigned ? (long long)op.__anon1.c : (long long)op.__anon1.uc; break; case 2: -value = op.__anon1.s; +value = op.type->isSigned ? (long long)op.__anon1.s : (long long)op.__anon1.us; break; +case 4: +value = op.type->isSigned ? op.__anon1.i64 : (long long)op.__anon1.ui64; +break; +case 3: default: -value = op.__anon1.i; +value = op.type->isSigned ? (long long)op.__anon1.i : (int)op.__anon1.ui; } __ecereNameSpace__ecere__com__eEnum_AddFixedValue(regClass, e->id->string, value); } @@ -2302,7 +2306,7 @@ __ecereInstance1->id = symbol->id, __ecereInstance1->idCode = symbol->idCode, __ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*excludedSymbols), decl->symbol); func->id = symbol->id; func->idCode = symbol->idCode; -func->dontMangle = 0x1; +func->dontMangle = 1; { struct External * externalDecl = MkExternalDeclaration((((void *)0))); struct Declaration * decl; @@ -2423,7 +2427,7 @@ strcat(baseName, "}"); strcat(baseName, baseType->__anon1._class->string); } else -PrintType(baseType, baseName, 0x0, 0x1); +PrintType(baseType, baseName, 0, 1); string = QMkString(baseName); ListAdd(args, MkExpString(string)); (__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0); @@ -2471,7 +2475,7 @@ ListAdd(args, MkExpConstant("0")); char classDataStructName[1024]; strcpy(classDataStructName, "__ecereClassData_"); -FullClassNameCat(classDataStructName, symbol->string, 0x0); +FullClassNameCat(classDataStructName, symbol->string, 0); ListAdd(args, symbol->classData ? MkExpTypeSize(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(classDataStructName), (((void *)0)))), (((void *)0)))) : MkExpConstant("0")); } if(regClass->type == 0 || regClass->type == 5) @@ -2609,7 +2613,7 @@ ListAdd(args, MkExpIdentifier(MkIdentifier("publicAccess"))); break; } strcpy(name, "__ecereVMethodID_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); exp = MkExpCall(MkExpIdentifier(MkIdentifier("eClass_AddVirtualMethod")), args); @@ -2673,10 +2677,10 @@ stmt = MkExpressionStmt(MkListOne(MkExpCall(MkExpIdentifier(MkIdentifier("eClass ListAdd(registerModuleBody->__anon1.compound.statements, stmt); } } -RegisterMembersAndProperties(regClass, 0x0, "class", registerModuleBody); +RegisterMembersAndProperties(regClass, 0, "class", registerModuleBody); if(classType == 4) { -struct __ecereNameSpace__ecere__sys__NamedLink * value; +struct __ecereNameSpace__ecere__sys__NamedLink64 * value; struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum"); struct __ecereNameSpace__ecere__com__EnumClassData * e = (regClass ? ((void *)(((char *)regClass->data) + enumClass->offsetClass)) : (((void *)0))); @@ -2692,10 +2696,14 @@ ListAdd(args, MkExpString(string)); (__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0); } { -char temp[1024]; +char * temp; -sprintf(temp, "%d", (int)value->data); +if(!strcmp(regClass->dataTypeString, "uint64")) +temp = PrintUInt64(value->data); +else +temp = PrintInt64(value->data); ListAdd(args, MkExpConstant(temp)); +(__ecereNameSpace__ecere__com__eSystem_Delete(temp), temp = 0); } stmt = MkExpressionStmt(MkListOne(MkExpCall(MkExpIdentifier(MkIdentifier("eEnum_AddFixedValue")), args))); ListAdd(registerModuleBody->__anon1.compound.statements, stmt); @@ -2733,7 +2741,7 @@ break; case 1: { char memberTypeString[132] = "TemplateMemberType::"; -unsigned int needClass = 0x1; +unsigned int needClass = 1; ((const char * (*)(struct __ecereNameSpace__ecere__com__Class *, const void *, char * tempString, void * fieldData, unsigned int * needClass))__ecereClass___ecereNameSpace__ecere__com__TemplateMemberType->_vTbl[__ecereVMethodID_class_OnGetString])(__ecereClass___ecereNameSpace__ecere__com__TemplateMemberType, ¶m->__anon1.memberType, memberTypeString + strlen(memberTypeString), (((void *)0)), &needClass); ListAdd(args, MkExpCast(MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpIdentifier(MkIdentifier(memberTypeString)))); @@ -2842,7 +2850,7 @@ else if(def->type == 7) stmt = MkIfStmt(MkListOne(MkExpIdentifier(MkIdentifier("class"))), MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("class")), MkIdentifier("fixed")), '=', MkExpConstant("1")))), (((void *)0))); ListAdd(registerModuleBody->__anon1.compound.statements, stmt); if(regClass) -regClass->fixed = 0x1; +regClass->fixed = 1; } else if(def->type == 8) { @@ -2936,12 +2944,12 @@ FreeExternal(external); } else if(external->type == 0) { -unsigned int setStaticMethod = 0x0; +unsigned int setStaticMethod = 0; if(external->symbol && !external->symbol->type->__anon1.__anon2.thisClass && !external->symbol->type->__anon1.__anon2.staticMethod) { -external->symbol->type->__anon1.__anon2.staticMethod = 0x1; -setStaticMethod = 0x1; +external->symbol->type->__anon1.__anon2.staticMethod = 1; +setStaticMethod = 1; } if(inCompiler) { @@ -2973,10 +2981,10 @@ char * string; char type[1024] = ""; if(setStaticMethod) -function->declarator->symbol->type->__anon1.__anon2.staticMethod = 0x0; -PrintType(function->declarator->symbol->type, type, 0x1, 0x1); +function->declarator->symbol->type->__anon1.__anon2.staticMethod = 0; +PrintType(function->declarator->symbol->type, type, 1, 1); if(setStaticMethod) -function->declarator->symbol->type->__anon1.__anon2.staticMethod = 0x1; +function->declarator->symbol->type->__anon1.__anon2.staticMethod = 1; string = QMkString(type); ListAdd(args, MkExpString(string)); (__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0); @@ -3009,14 +3017,14 @@ struct Declaration * declaration = external->__anon1.declaration; if(external->symbol) { if(external->symbol->type && external->symbol->type->kind == 11 && !external->symbol->type->__anon1.__anon2.thisClass) -external->symbol->type->__anon1.__anon2.staticMethod = 0x1; +external->symbol->type->__anon1.__anon2.staticMethod = 1; } if(external->symbol && declaration->type == 1) { if(declaration->__anon1.__anon1.specifiers) { struct Specifier * specifier; -unsigned int removeExternal = 0x0; +unsigned int removeExternal = 0; for(specifier = (*declaration->__anon1.__anon1.specifiers).first; specifier; specifier = specifier->next) { @@ -3032,7 +3040,7 @@ if(specifier->type == 2) classType = 4; else classType = 1; -removeExternal = 0x1; +removeExternal = 1; symbol->ctx = specifier->__anon1.__anon2.ctx; specifier->__anon1.__anon2.ctx = (((void *)0)); ProcessClass(classType, specifier->__anon1.__anon2.definitions, symbol, specifier->__anon1.__anon2.baseSpecs, specifier->__anon1.__anon2.list, ast, external, declaration->declMode); diff --git a/compiler/bootstrap/libec/bootstrap/pass15.c b/compiler/bootstrap/libec/bootstrap/pass15.c index 9aeb61e..8fffe1a 100644 --- a/compiler/bootstrap/libec/bootstrap/pass15.c +++ b/compiler/bootstrap/libec/bootstrap/pass15.c @@ -40,7 +40,7 @@ typedef unsigned __int64 uint64; #define arch_PointerSize sizeof(void *) #define structSize_Instance (_64BIT ? 24 : 12) #define structSize_Module (_64BIT ? 560 : 300) -#define structSize_NamedLink (_64BIT ? 32 : 16) +#define structSize_NamedLink64 (_64BIT ? 32 : 24) struct __ecereNameSpace__ecere__com__Instance; @@ -1235,7 +1235,7 @@ static char * thisNameSpace; struct __ecereNameSpace__ecere__com__Class * containerClass; -unsigned int thisClassParams = 0x1; +unsigned int thisClassParams = 1; unsigned int internalValueCounter; @@ -1262,7 +1262,7 @@ struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__com int count; unsigned int backOutputLineNumbers = outputLineNumbers; -outputLineNumbers = 0x0; +outputLineNumbers = 0; if(exp) OutputExpression(exp, f); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({ @@ -1293,7 +1293,7 @@ if(param && param->type == 0 && (param->__anon1.dataType || param->dataTypeStrin if(!param->baseType) { if(param->dataTypeString) -param->baseType = ProcessTypeString(param->dataTypeString, 0x0); +param->baseType = ProcessTypeString(param->dataTypeString, 0); else param->baseType = ProcessType(param->__anon1.dataType->specifiers, param->__anon1.dataType->decl); } @@ -1305,10 +1305,10 @@ return (((void *)0)); unsigned int NeedCast(struct Type * type1, struct Type * type2) { if(!type1 || !type2 || type1->keepCast || type2->keepCast) -return 0x1; -if(type1->kind == 20 && type2->kind == 4 && type2->passAsTemplate == 0x0) +return 1; +if(type1->kind == 20 && type2->kind == 4 && type2->passAsTemplate == 0) { -return 0x0; +return 0; } if(type1->kind == type2->kind) { @@ -1322,17 +1322,17 @@ case 4: case 22: case 23: if(type1->passAsTemplate && !type2->passAsTemplate) -return 0x1; +return 1; return type1->isSigned != type2->isSigned; case 8: return type1->__anon1._class != type2->__anon1._class; case 13: return (type1->__anon1.type && type2->__anon1.type && type1->__anon1.type->constant != type2->__anon1.type->constant) || NeedCast(type1->__anon1.type, type2->__anon1.type); default: -return 0x1; +return 1; } } -return 0x1; +return 1; } extern int strcmp(const char * , const char * ); @@ -1452,7 +1452,7 @@ exp->type = 8; exp->__anon1.member.member = id; exp->__anon1.member.memberType = 0; exp->__anon1.member.exp = QMkExpId("this"); -exp->addedThis = 0x1; +exp->addedThis = 1; } else if(_class && _class->templateParams.first) { @@ -1529,7 +1529,10 @@ char * PrintInt64(long long result) { char temp[100]; +if(result > (((int)0x7fffffff)) || result < (((int)0x80000000))) sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64dLL" : "%lldLL"), result); +else +sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result); return __ecereNameSpace__ecere__sys__CopyString(temp); } @@ -1537,10 +1540,12 @@ char * PrintUInt64(uint64 result) { char temp[100]; -if(result > (((long long)0x7fffffffffffffffLL))) +if(result > (0xffffffff)) sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), result); +else if(result > (((int)0x7fffffff))) +sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), result); else -sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64dLL" : "%lldLL"), result); +sprintf(temp, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), result); return __ecereNameSpace__ecere__sys__CopyString(temp); } @@ -1779,8 +1784,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (int)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } struct Operand GetOperand(struct Expression * exp); @@ -1825,8 +1830,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (unsigned int)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetUInt(struct Expression * exp, unsigned int * value2) @@ -1869,8 +1874,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (long long)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetInt64(struct Expression * exp, long long * value2) @@ -1913,8 +1918,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetUInt64(struct Expression * exp, uint64 * value2) @@ -1957,8 +1962,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (intptr_t)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetIntPtr(struct Expression * exp, intptr_t * value2) @@ -2001,8 +2006,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (uintptr_t)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetUIntPtr(struct Expression * exp, uintptr_t * value2) @@ -2045,8 +2050,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (ssize_t)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetIntSize(struct Expression * exp, ssize_t * value2) @@ -2089,8 +2094,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (size_t)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetUIntSize(struct Expression * exp, size_t * value2) @@ -2133,8 +2138,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (short)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetShort(struct Expression * exp, short * value2) @@ -2177,8 +2182,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (unsigned short)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetUShort(struct Expression * exp, unsigned short * value2) @@ -2221,8 +2226,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (char)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetChar(struct Expression * exp, char * value2) @@ -2265,8 +2270,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (unsigned char)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetUChar(struct Expression * exp, unsigned char * value2) @@ -2309,8 +2314,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (float)(float)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetFloat(struct Expression * exp, float * value2) @@ -2353,8 +2358,8 @@ else if(op2->kind == 7) else if(op2->kind == 13) *value2 = (double)(double)op2->__anon1.ui64; else -return 0x0; -return 0x1; +return 0; +return 1; } unsigned int GetDouble(struct Expression * exp, double * value2) @@ -2434,7 +2439,7 @@ if(!dataMember->isProperty) { if(dataMember->type == 0 && dataMember->dataTypeString && !dataMember->dataType) { -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); } } } @@ -2560,7 +2565,7 @@ else { int alignment; -ComputeClassMembers((struct __ecereNameSpace__ecere__com__Class *)dataMember, 0x1); +ComputeClassMembers((struct __ecereNameSpace__ecere__com__Class *)dataMember, 1); alignment = dataMember->structAlignment; if(isMember) { @@ -2676,7 +2681,7 @@ if(deriv->computeSize) deriv->offset = _class->structSize; deriv->memberOffset = 0; deriv->structSize = deriv->offset; -ComputeClassMembers(deriv, 0x0); +ComputeClassMembers(deriv, 0); } } } @@ -2731,7 +2736,7 @@ struct __ecereNameSpace__ecere__sys__OldLink * subModule; for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->modules.first; subModule; subModule = subModule->next) ComputeModuleClasses(subModule->data); for(_class = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->classes.first; _class; _class = _class->next) -ComputeClassMembers(_class, 0x0); +ComputeClassMembers(_class, 0); } extern unsigned int inCompiler; @@ -2746,7 +2751,7 @@ unsigned int size = type ? type->size : 0; if(!size && type && !type->computing) { -type->computing = 0x1; +type->computing = 1; switch(type->kind) { case 24: @@ -2785,7 +2790,7 @@ struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class ? typ if(_class && _class->type == 1) { -ComputeClassMembers(_class, 0x0); +ComputeClassMembers(_class, 0); type->alignment = _class->structAlignment; size = _class->structSize; if(type->alignment && size % type->alignment) @@ -2794,7 +2799,7 @@ size += type->alignment - (size % type->alignment); else if(_class && (_class->type == 3 || _class->type == 4 || _class->type == 2)) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); size = type->alignment = ComputeTypeSize(_class->dataType); } else @@ -2911,7 +2916,7 @@ break; } } type->size = size; -type->computing = 0x0; +type->computing = 0; } return size; } @@ -2954,13 +2959,13 @@ int anonID = 1; struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class); if(addedPadding) -*addedPadding = 0x0; +*addedPadding = 0; if(!isMember && _class->base) { maxSize = _class->structSize; { if(_class->type == 1 || _class->type == 5) -AddMembers(declarations, _class->base, 0x0, &totalSize, topClass, (((void *)0))); +AddMembers(declarations, _class->base, 0, &totalSize, topClass, (((void *)0))); else { unsigned int baseSize = _class->base->templateClass ? _class->base->templateClass->structSize : _class->base->structSize; @@ -2994,7 +2999,7 @@ ReplaceThisClassSpecifiers(specs, topClass); { struct Type * type = ProcessType(specs, decl); -DeclareType(member->dataType, 0x0, 0x0); +DeclareType(member->dataType, 0, 0); FreeType(type); } ComputeTypeSize(member->dataType); @@ -3017,7 +3022,7 @@ char id[100]; sprintf(id, "__anon%d", anonID++); size = 0; -AddMembers(list, (struct __ecereNameSpace__ecere__com__Class *)member, 0x1, &size, topClass, (((void *)0))); +AddMembers(list, (struct __ecereNameSpace__ecere__com__Class *)member, 1, &size, topClass, (((void *)0))); ListAdd(specs, MkStructOrUnion((member->type == 1) ? 4 : 3, (((void *)0)), list)); ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, MkListOne(MkDeclaratorIdentifier(MkIdentifier(id))), (((void *)0))))); alignment = member->structAlignment; @@ -3054,7 +3059,7 @@ char sizeString[50]; sprintf(sizeString, "%d", maxSize - totalSize); ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(CHAR)), MkListOne(MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__ecere_padding")), MkExpConstant(sizeString))), (((void *)0))))); if(addedPadding) -*addedPadding = 0x1; +*addedPadding = 1; } } if(context) @@ -3069,7 +3074,7 @@ struct __ecereNameSpace__ecere__com__DataMember * member; struct Context * context = isMember ? (((void *)0)) : SetupTemplatesContext(_class); if(!isMember && (_class->type == 1 || _class->type == 5) && _class->base->type != 1000) -DeclareMembers(_class->base, 0x0); +DeclareMembers(_class->base, 0); for(member = isMember ? topMember->members.first : _class->membersAndProperties.first; member; member = member->next) { if(!member->isProperty) @@ -3079,15 +3084,15 @@ switch(member->type) case 0: { if(!member->dataType && member->dataTypeString) -member->dataType = ProcessTypeString(member->dataTypeString, 0x0); +member->dataType = ProcessTypeString(member->dataTypeString, 0); if(member->dataType) -DeclareType(member->dataType, 0x0, 0x0); +DeclareType(member->dataType, 0, 0); break; } case 1: case 2: { -DeclareMembers((struct __ecereNameSpace__ecere__com__Class *)member, 0x1); +DeclareMembers((struct __ecereNameSpace__ecere__com__Class *)member, 1); break; } } @@ -3114,7 +3119,7 @@ struct Declaration * decl = def->__anon1.decl; if(decl && decl->__anon1.__anon1.specifiers) { struct Specifier * spec; -unsigned int isStruct = 0x0; +unsigned int isStruct = 0; for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next) { @@ -3122,7 +3127,7 @@ if(spec->type == 3 || spec->type == 4) { if(spec->__anon1.__anon2.definitions) IdentifyAnonStructs(spec->__anon1.__anon2.definitions); -isStruct = 0x1; +isStruct = 1; } } if(isStruct) @@ -3202,9 +3207,9 @@ classSym->declaring--; } return ; } -DeclareMembers(classSym->__anon1.registered, 0x0); +DeclareMembers(classSym->__anon1.registered, 0); structName[0] = (char)0; -FullClassNameCat(structName, name, 0x0); +FullClassNameCat(structName, name, 0); if(external && external->__anon1.declaration && external->__anon1.declaration->__anon1.__anon1.specifiers) { for(spec = (*external->__anon1.declaration->__anon1.__anon1.specifiers).first; spec; spec = spec->next) @@ -3215,11 +3220,11 @@ break; } if(!skipNoHead && (!spec || !spec->__anon1.__anon2.definitions)) { -unsigned int addedPadding = 0x0; +unsigned int addedPadding = 0; -classSym->declaredStructSym = 0x1; +classSym->declaredStructSym = 1; declarations = MkList(); -AddMembers(declarations, classSym->__anon1.registered, 0x0, (((void *)0)), classSym->__anon1.registered, &addedPadding); +AddMembers(declarations, classSym->__anon1.registered, 0, (((void *)0)), classSym->__anon1.registered, &addedPadding); if(!(*declarations).count || ((*declarations).count == 1 && addedPadding)) { FreeList(declarations, FreeClassDef); @@ -3256,7 +3261,7 @@ if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1) char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); external->symbol = classSym; classSym->__anon2.__anon1.pointerExternal = external; @@ -3268,7 +3273,7 @@ else char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); classSym->__anon2.__anon1.structExternal = external; DeclareClass(classSym, className); external->symbol = classSym; @@ -3294,7 +3299,7 @@ if(curExternal && curExternal->symbol && curExternal->symbol->idCode < classSym- classSym->declaring++; { if(classSym->__anon1.registered) -DeclareMembers(classSym->__anon1.registered, 0x0); +DeclareMembers(classSym->__anon1.registered, 0); } if(classSym->__anon1.registered && (classSym->__anon1.registered->type == 1 || classSym->__anon1.registered->type == 5)) { @@ -3344,19 +3349,19 @@ void DeclareProperty(struct __ecereNameSpace__ecere__com__Property * prop, char struct Symbol * symbol = prop->symbol; strcpy(setName, "__ecereProp_"); -FullClassNameCat(setName, prop->_class->fullName, 0x0); +FullClassNameCat(setName, prop->_class->fullName, 0); strcat(setName, "_Set_"); -FullClassNameCat(setName, prop->name, 0x1); +FullClassNameCat(setName, prop->name, 1); strcpy(getName, "__ecereProp_"); -FullClassNameCat(getName, prop->_class->fullName, 0x0); +FullClassNameCat(getName, prop->_class->fullName, 0); strcat(getName, "_Get_"); -FullClassNameCat(getName, prop->name, 0x1); +FullClassNameCat(getName, prop->name, 1); if(prop->_class->type == 1) -DeclareStruct(prop->_class->fullName, 0x0); +DeclareStruct(prop->_class->fullName, 0); if(!symbol || curExternal->symbol->idCode < symbol->id) { -unsigned int imported = 0x0; -unsigned int dllImport = 0x0; +unsigned int imported = 0; +unsigned int dllImport = 0; if(!symbol || symbol->_import) { @@ -3386,20 +3391,20 @@ symbol = prop->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass symbol->_import = (struct ClassImport *)__extension__ ({ struct PropertyImport * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_PropertyImport); -__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->isVirtual = 0x0, __ecereInstance1->hasSet = prop->Set ? 0x1 : 0x0, __ecereInstance1->hasGet = prop->Get ? 0x1 : 0x0, __ecereInstance1; +__ecereInstance1->name = __ecereNameSpace__ecere__sys__CopyString(prop->name), __ecereInstance1->isVirtual = 0, __ecereInstance1->hasSet = prop->Set ? 1 : 0, __ecereInstance1->hasGet = prop->Get ? 1 : 0, __ecereInstance1; }); if(classSym) __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classSym->_import->properties, symbol->_import); } -imported = 0x1; +imported = 1; if((prop->_class->module != privateModule || !strcmp(prop->_class->name, "float") || !strcmp(prop->_class->name, "double")) && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)prop->_class->module + structSize_Instance)))->importType != 1) -dllImport = 0x1; +dllImport = 1; } if(!symbol->type) { struct Context * context = SetupTemplatesContext(prop->_class); -symbol->type = ProcessTypeString(prop->dataTypeString, 0x0); +symbol->type = ProcessTypeString(prop->dataTypeString, 0); FinishTemplatesContext(context); } if(prop->Get) @@ -3413,7 +3418,7 @@ struct __ecereNameSpace__ecere__sys__OldList * params; struct Specifier * spec; struct External * external; struct Declarator * typeDecl; -unsigned int simple = 0x0; +unsigned int simple = 0; specifiers = MkList(); declarators = MkList(); @@ -3439,8 +3444,8 @@ struct Symbol * classSym = spec->__anon1.__anon1.symbol; symbol->_class = classSym->__anon1.registered; if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1) { -DeclareStruct(spec->__anon1.__anon1.name, 0x0); -simple = 0x1; +DeclareStruct(spec->__anon1.__anon1.name, 0); +simple = 1; } } } @@ -3516,7 +3521,7 @@ struct Symbol * classSym = spec->__anon1.__anon1.symbol; symbol->_class = classSym->__anon1.registered; if(classSym->__anon1.registered && classSym->__anon1.registered->type == 1) -DeclareStruct(spec->__anon1.__anon1.name, 0x0); +DeclareStruct(spec->__anon1.__anon1.name, 0); } } } @@ -3555,9 +3560,9 @@ else __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*specifiers), (((void *)0)), MkSpecifier(STATIC)); ListAdd(specifiers, MkSpecifierName("Property")); strcpy(propName, "__ecereProp_"); -FullClassNameCat(propName, prop->_class->fullName, 0x0); +FullClassNameCat(propName, prop->_class->fullName, 0); strcat(propName, "_"); -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); { struct __ecereNameSpace__ecere__sys__OldList * list = MkList(); @@ -3565,9 +3570,9 @@ ListAdd(list, MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((v if(!imported) { strcpy(propName, "__ecerePropM_"); -FullClassNameCat(propName, prop->_class->fullName, 0x0); +FullClassNameCat(propName, prop->_class->fullName, 0); strcat(propName, "_"); -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); ListAdd(list, MkInitDeclarator(MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier(propName))), (((void *)0)))); } decl = MkDeclaration(specifiers, list); @@ -3652,10 +3657,10 @@ extern struct __ecereNameSpace__ecere__com__DataMember * __ecereNameSpace__ecere void ProcessMemberInitData(struct MemberInit * member, struct __ecereNameSpace__ecere__com__Class * _class, struct __ecereNameSpace__ecere__com__Class ** curClass, struct __ecereNameSpace__ecere__com__DataMember ** curMember, struct __ecereNameSpace__ecere__com__DataMember ** subMemberStack, int * subMemberStackPos) { struct Identifier * ident = member->identifiers ? (*member->identifiers).first : (((void *)0)); -unsigned int found = 0x0; +unsigned int found = 0; struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0)); struct __ecereNameSpace__ecere__com__Method * method = (((void *)0)); -unsigned int freeType = 0x0; +unsigned int freeType = 0; yylloc = member->loc; if(!ident) @@ -3665,7 +3670,7 @@ if(curMember) __ecereNameSpace__ecere__com__eClass_FindNextMember(_class, curClass, curMember, subMemberStack, subMemberStackPos); if(*curMember) { -found = 0x1; +found = 1; dataMember = *curMember; } } @@ -3688,13 +3693,13 @@ if(curMember && thisMember->memberAccess == 1) memcpy(subMemberStack, _subMemberStack, sizeof(struct __ecereNameSpace__ecere__com__DataMember *) * _subMemberStackPos); *subMemberStackPos = _subMemberStackPos; } -found = 0x1; +found = 1; } else { method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, ident->string, privateModule); if(method && method->type == 1) -found = 0x1; +found = 1; else method = (((void *)0)); } @@ -3709,7 +3714,7 @@ if(!dataMember->dataType && dataMember->dataTypeString) { struct Context * context = SetupTemplatesContext(_class); -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); FinishTemplatesContext(context); } type = dataMember->dataType; @@ -3783,9 +3788,9 @@ if(arg.__anon1.__anon1.dataTypeString) { unsigned int constant = type->constant; -type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0); +type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0); if(type->kind == 8 && constant) -type->constant = 0x1; +type->constant = 1; else if(type->kind == 13) { struct Type * t = type->__anon1.type; @@ -3795,9 +3800,9 @@ t = t->__anon1.type; if(constant) t->constant = constant; } -freeType = 0x1; +freeType = 1; if(type && _class->templateClass) -type->passAsTemplate = 0x1; +type->passAsTemplate = 1; if(type) { } @@ -3931,8 +3936,8 @@ struct Context * context = SetupTemplatesContext(_class); if(freeType) FreeType(type); -type = ProcessTypeString(templateString, 0x0); -freeType = 0x1; +type = ProcessTypeString(templateString, 0); +freeType = 1; FinishTemplatesContext(context); } } @@ -3951,7 +3956,7 @@ __ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' '); Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "unresolved symbol used as an instance method %s\n", (((void *)0))), expString); } } -else if(!MatchTypes(member->initializer->__anon1.exp->expType, type, (((void *)0)), (((void *)0)), _class, 0x1, 0x1, 0x0, 0x0, 0x1)) +else if(!MatchTypes(member->initializer->__anon1.exp->expType, type, (((void *)0)), (((void *)0)), _class, 1, 1, 0, 0, 1)) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible instance method %s\n", (((void *)0))), ident->string); } @@ -4030,11 +4035,11 @@ struct __ecereNameSpace__ecere__com__Class * _class; classSym = inst->_class->__anon1.__anon1.symbol; _class = classSym ? classSym->__anon1.registered : (((void *)0)); if(!_class || _class->type != 5) -DeclareStruct(inst->_class->__anon1.__anon1.name, 0x0); +DeclareStruct(inst->_class->__anon1.__anon1.name, 0); afterExternal = afterExternal ? afterExternal : curExternal; if(inst->exp) ProcessExpressionType(inst->exp); -inst->isConstant = 0x1; +inst->isConstant = 1; if(inst->members) { struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0)); @@ -4063,7 +4068,7 @@ if(inCompiler) char number[16]; strcpy(name, "__ecereInstMeth_"); -FullClassNameCat(name, _class ? _class->fullName : "_UNKNOWNCLASS", 0x0); +FullClassNameCat(name, _class ? _class->fullName : "_UNKNOWNCLASS", 0); strcat(name, "_"); strcat(name, nameID->string); strcat(name, "_"); @@ -4095,14 +4100,14 @@ _class->symbol = FindClass(_class->fullName); symbol->type->__anon1.__anon2.thisClass = _class->symbol; } } -DeclareType(symbol->type, 0x1, 0x1); +DeclareType(symbol->type, 1, 1); } else if(classSym) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "couldn't find virtual method %s in class %s\n", (((void *)0))), unmangled, classSym->string); } } -createdExternal = ProcessClassFunction(classSym ? classSym->__anon1.registered : (((void *)0)), members->__anon1.function, ast, afterExternal, 0x1); +createdExternal = ProcessClassFunction(classSym ? classSym->__anon1.registered : (((void *)0)), members->__anon1.function, ast, afterExternal, 1); if(nameID) { FreeSpecifier(nameID->_class); @@ -4160,7 +4165,7 @@ for(member = (*members->__anon1.dataMembers).first; member; member = member->nex { ProcessMemberInitData(member, classSym->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos); if(member->initializer && !member->initializer->isConstant) -inst->isConstant = 0x0; +inst->isConstant = 0; } yylloc = oldyyloc; } @@ -4183,12 +4188,12 @@ struct Type * param; if(declareParams) { for(param = type->__anon1.__anon2.params.first; param; param = param->next) -DeclareType(param, declarePointers, 0x1); +DeclareType(param, declarePointers, 1); } -DeclareType(type->__anon1.__anon2.returnType, declarePointers, 0x1); +DeclareType(type->__anon1.__anon2.returnType, declarePointers, 1); } else if(type->kind == 13 && declarePointers) -DeclareType(type->__anon1.type, declarePointers, 0x0); +DeclareType(type->__anon1.type, declarePointers, 0); else if(type->kind == 8) { if(type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 1 || type->__anon1._class->__anon1.registered->type == 5) && !type->__anon1._class->declaring) @@ -4199,10 +4204,10 @@ else if(type->kind == 9 || type->kind == 10) struct Type * member; for(member = type->__anon1.__anon1.members.first; member; member = member->next) -DeclareType(member, 0x0, 0x0); +DeclareType(member, 0, 0); } else if(type->kind == 12) -DeclareType(type->__anon1.__anon4.arrayType, declarePointers, 0x0); +DeclareType(type->__anon1.__anon4.arrayType, declarePointers, 0); } } @@ -4266,7 +4271,7 @@ struct Context * SetupTemplatesContext(struct __ecereNameSpace__ecere__com__Clas { struct Context * context = PushContext(); -context->templateTypesOnly = 0x1; +context->templateTypesOnly = 1; if(_class->symbol && ((struct Symbol *)_class->symbol)->templateParams) { struct TemplateParameter * param = (*((struct Symbol *)_class->symbol)->templateParams).first; @@ -4334,7 +4339,7 @@ if(!method->dataType) { struct Context * context = SetupTemplatesContext(method->_class); -method->dataType = ProcessTypeString(method->dataTypeString, 0x0); +method->dataType = ProcessTypeString(method->dataTypeString, 0); FinishTemplatesContext(context); if(method->type != 1 && method->dataType) { @@ -4354,7 +4359,7 @@ if(!prop->dataType) { struct Context * context = SetupTemplatesContext(prop->_class); -prop->dataType = ProcessTypeString(prop->dataTypeString, 0x0); +prop->dataType = ProcessTypeString(prop->dataTypeString, 0); FinishTemplatesContext(context); } } @@ -4385,10 +4390,10 @@ struct Symbol * symbol = method->symbol; if(!symbol || (!symbol->__anon2.__anon1.pointerExternal && method->type == 1) || symbol->id > (curExternal ? curExternal->symbol->idCode : -1)) { -unsigned int dllImport = 0x0; +unsigned int dllImport = 0; if(!method->dataType) -method->dataType = ProcessTypeString(method->dataTypeString, 0x0); +method->dataType = ProcessTypeString(method->dataTypeString, 0); if(!symbol || symbol->_import || method->type == 1) { if(!symbol || method->type == 1) @@ -4436,11 +4441,11 @@ symbol->type->refCount++; if(!method->dataType->dllExport) { if((method->_class->module != privateModule || !strcmp(method->_class->name, "float") || !strcmp(method->_class->name, "double")) && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)method->_class->module + structSize_Instance)))->importType != 1) -dllImport = 0x1; +dllImport = 1; } } if(method->type != 1 && method->dataType) -DeclareType(method->dataType, 0x1, 0x1); +DeclareType(method->dataType, 1, 1); if(!symbol->__anon2.__anon1.pointerExternal || symbol->__anon2.__anon1.pointerExternal->type == 0) { struct Declaration * decl; @@ -4543,7 +4548,7 @@ char * ReplaceThisClass(struct __ecereNameSpace__ecere__com__Class * _class) { if(thisClassParams && _class->templateParams.count && !_class->templateClass) { -unsigned int first = 0x1; +unsigned int first = 1; int p = 0; struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param; int lastParam = -1; @@ -4563,7 +4568,7 @@ strcat(className, param->name); strcat(className, " = "); } strcat(className, param->name); -first = 0x0; +first = 0; lastParam = p; } p++; @@ -4589,7 +4594,7 @@ struct Type * type; if(thisClassParams && _class->templateParams.count && !_class->templateClass) { -unsigned int first = 0x1; +unsigned int first = 1; int p = 0; struct __ecereNameSpace__ecere__com__ClassTemplateParameter * param; int lastParam = -1; @@ -4609,7 +4614,7 @@ strcat(className, param->name); strcat(className, " = "); } strcat(className, param->name); -first = 0x0; +first = 0; lastParam = p; } p++; @@ -4682,14 +4687,14 @@ struct Symbol * symbol = function->symbol; if(curExternal && (!symbol || symbol->id > curExternal->symbol->idCode)) { -unsigned int imported = 0x0; -unsigned int dllImport = 0x0; +unsigned int imported = 0; +unsigned int dllImport = 0; if(!function->dataType) { -function->dataType = ProcessTypeString(function->dataTypeString, 0x0); +function->dataType = ProcessTypeString(function->dataTypeString, 0); if(!function->dataType->__anon1.__anon2.thisClass) -function->dataType->__anon1.__anon2.staticMethod = 0x1; +function->dataType->__anon1.__anon2.staticMethod = 1; } if(inCompiler) { @@ -4711,16 +4716,16 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&module->functions, symb } } { -symbol->type = ProcessTypeString(function->dataTypeString, 0x0); +symbol->type = ProcessTypeString(function->dataTypeString, 0); if(!symbol->type->__anon1.__anon2.thisClass) -symbol->type->__anon1.__anon2.staticMethod = 0x1; +symbol->type->__anon1.__anon2.staticMethod = 1; } } -imported = symbol->_import ? 0x1 : 0x0; +imported = symbol->_import ? 1 : 0; if(imported && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1) -dllImport = 0x1; +dllImport = 1; } -DeclareType(function->dataType, 0x1, 0x1); +DeclareType(function->dataType, 1, 1); if(inCompiler) { if(!symbol->__anon2.__anon1.pointerExternal || symbol->__anon2.__anon1.pointerExternal->type == 0) @@ -4791,7 +4796,7 @@ if(curExternal) symbol->id = curExternal->symbol->idCode; } } -return (symbol && symbol->_import && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1) ? 0x1 : 0x0; +return (symbol && symbol->_import && function->module != privateModule && ((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1) ? 1 : 0; } extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_GlobalData; @@ -4822,8 +4827,8 @@ if(!symbol) symbol = data->symbol = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); } if(!data->dataType) -data->dataType = ProcessTypeString(data->dataTypeString, 0x0); -DeclareType(data->dataType, 0x1, 0x1); +data->dataType = ProcessTypeString(data->dataTypeString, 0); +DeclareType(data->dataType, 1, 1); if(inCompiler) { if(!symbol->__anon2.__anon1.pointerExternal) @@ -4870,7 +4875,7 @@ extern void Compiler_Warning(const char * format, ...); static unsigned int CheckConstCompatibility(struct Type * source, struct Type * dest, unsigned int warn) { -unsigned int status = 0x1; +unsigned int status = 1; if(((source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered) || source->kind == 12 || source->kind == 13) && ((dest->kind == 8 && dest->__anon1._class && dest->__anon1._class->__anon1.registered) || dest->kind == 13)) { @@ -4887,7 +4892,7 @@ while((destType->kind == 13 || destType->kind == 12) && destType->__anon1.type) destType = destType->__anon1.type; if(!destType->constant && sourceType->constant) { -status = 0x0; +status = 0; if(warn) Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "discarding const qualifier\n", (((void *)0)))); } @@ -4905,7 +4910,7 @@ unsigned int MatchTypes(struct Type * source, struct Type * dest, struct __ecere if(source && dest) { if(warnConst) -CheckConstCompatibility(source, dest, 0x1); +CheckConstCompatibility(source, dest, 1); if(source->kind == 20 && dest->kind != 20) { struct Type * type = ProcessTemplateParameterType(source->__anon1.templateParameter); @@ -4923,33 +4928,33 @@ dest = type; if(dest->classObjectType == 2 && dest->kind != 11) { if(source->classObjectType != 3) -return 0x1; +return 1; else { if((dest->__anon1._class && strcmp(dest->__anon1._class->string, "class")) || (source->__anon1._class && strcmp(source->__anon1._class->string, "class"))) { -return 0x1; +return 1; } } } else { if(source->kind != 11 && source->classObjectType == 3) -return 0x1; +return 1; if(dest->kind != 11 && dest->classObjectType == 3 && source->classObjectType != 2) -return 0x1; +return 1; } if((dest->kind == 9 && source->kind == 9) || (dest->kind == 10 && source->kind == 10)) { if((dest->__anon1.__anon1.enumName && source->__anon1.__anon1.enumName && !strcmp(dest->__anon1.__anon1.enumName, source->__anon1.__anon1.enumName)) || (source->__anon1.__anon1.members.first && source->__anon1.__anon1.members.first == dest->__anon1.__anon1.members.first)) -return 0x1; +return 1; } if(dest->kind == 14 && source->kind != 0) -return 0x1; +return 1; if(dest->kind == 13 && dest->__anon1.type->kind == 0 && ((source->kind == 8 && (!source->__anon1._class || !source->__anon1._class->__anon1.registered || source->__anon1._class->__anon1.registered->type == 1 || source->__anon1._class->__anon1.registered->type == 0 || source->__anon1._class->__anon1.registered->type == 5 || source->__anon1._class->__anon1.registered->type == 1000)) || source->kind == 19 || source->kind == 13 || source->kind == 12 || source->kind == 11 || source->kind == 21)) -return 0x1; +return 1; if(!isConversionExploration && source->kind == 13 && source->__anon1.type->kind == 0 && ((dest->kind == 8 && (!dest->__anon1._class || !dest->__anon1._class->__anon1.registered || dest->__anon1._class->__anon1.registered->type == 1 || dest->__anon1._class->__anon1.registered->type == 0 || dest->__anon1._class->__anon1.registered->type == 5 || dest->__anon1._class->__anon1.registered->type == 1000)) || dest->kind == 19 || dest->kind == 13 || dest->kind == 12 || dest->kind == 11 || dest->kind == 21)) -return 0x1; +return 1; if(((source->kind == 8 && dest->kind == 8) || (source->kind == 19 && dest->kind == 19)) && source->__anon1._class) { if(source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 3) @@ -4957,7 +4962,7 @@ if(source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1 if(conversions != (((void *)0))) { if(source->__anon1._class->__anon1.registered == dest->__anon1._class->__anon1.registered) -return 0x1; +return 1; } else { @@ -4968,24 +4973,24 @@ for(sourceBase = source->__anon1._class->__anon1.registered; sourceBase && sourc for(destBase = dest->__anon1._class->__anon1.registered; destBase && destBase->base->type != 1000; destBase = destBase->base) ; if(sourceBase == destBase) -return 0x1; +return 1; } } else if(source->__anon1._class && dest->__anon1._class && (dest->classObjectType == source->classObjectType || !dest->classObjectType) && (enumBaseType || (!source->__anon1._class->__anon1.registered || source->__anon1._class->__anon1.registered->type != 4) || (!dest->__anon1._class->__anon1.registered || dest->__anon1._class->__anon1.registered->type != 4)) && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, dest->__anon1._class->__anon1.registered)) -return 0x1; +return 1; else { if(enumBaseType && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4 && ((source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type != 4) || source->kind == 8)) { if(__ecereNameSpace__ecere__com__eClass_IsDerived(dest->__anon1._class->__anon1.registered, source->__anon1._class->__anon1.registered)) { -return 0x1; +return 1; } } } } if(source->kind == 19 && dest->kind == 8 && dest->__anon1._class && !strcmp(dest->__anon1._class->string, "ecere::com::Class")) -return 0x1; +return 1; if(doConversion) { if(source->kind == 8) @@ -5003,21 +5008,21 @@ if(convert->memberAccess == 1 || _class->module == privateModule) struct Conversion * after = (conversions != (((void *)0))) ? conversions->last : (((void *)0)); if(!convert->dataType) -convert->dataType = ProcessTypeString(convert->dataTypeString, 0x0); -if((!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), (convert->dataType->kind == 8 && !strcmp(convert->dataTypeString, "String")) ? 0x1 : 0x0, convert->dataType->kind == 8, 0x0, 0x1, warnConst)) +convert->dataType = ProcessTypeString(convert->dataTypeString, 0); +if((!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), (convert->dataType->kind == 8 && !strcmp(convert->dataTypeString, "String")) ? 1 : 0, convert->dataType->kind == 8, 0, 1, warnConst)) { if(!conversions && !convert->Get) -return 0x1; +return 1; else if(conversions != (((void *)0))) { if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (dest->kind != 8 || dest->__anon1._class->__anon1.registered != _class->base)) -return 0x1; +return 1; else { -struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 0x1, conv); +struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 1, conv); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(conversions, after, conv); -return 0x1; +return 1; } } } @@ -5038,10 +5043,10 @@ for(convert = _class->conversions.first; convert; convert = convert->next) if(convert->memberAccess == 1 || _class->module == privateModule) { struct Type * constType = (((void *)0)); -unsigned int success = 0x0; +unsigned int success = 0; if(!convert->dataType) -convert->dataType = ProcessTypeString(convert->dataTypeString, 0x0); +convert->dataType = ProcessTypeString(convert->dataTypeString, 0); if(warnConst && convert->dataType->kind == 13 && convert->dataType->__anon1.type && dest->constant) { struct Type * ptrType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); @@ -5052,41 +5057,41 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->kind = 13, __ecereInstance1->refCount = 1, __ecereInstance1->__anon1.type = ptrType, __ecereInstance1; }); CopyTypeInto(ptrType, convert->dataType->__anon1.type); -ptrType->constant = 0x1; +ptrType->constant = 1; } -if((constType || convert->dataType != dest) && MatchTypes(source, constType ? constType : convert->dataType, conversions, (((void *)0)), (((void *)0)), 0x1, 0x0, 0x0, 0x1, warnConst)) +if((constType || convert->dataType != dest) && MatchTypes(source, constType ? constType : convert->dataType, conversions, (((void *)0)), (((void *)0)), 1, 0, 0, 1, warnConst)) { if(!conversions && !convert->Set) -success = 0x1; +success = 1; else if(conversions != (((void *)0))) { if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (source->kind != 8 || source->__anon1._class->__anon1.registered != _class->base)) -success = 0x1; +success = 1; else { struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(conversions, conv); -success = 0x1; +success = 1; } } } if(constType) FreeType(constType); if(success) -return 0x1; +return 1; } } } if(enumBaseType && dest->__anon1._class && dest->__anon1._class->__anon1.registered && dest->__anon1._class->__anon1.registered->type == 4) { if(!dest->__anon1._class->__anon1.registered->dataType) -dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0x0); +dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0); if(dest->__anon1._class->__anon1.registered->dataType->kind == 8 || source->truth || dest->truth) { -if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 0x1, dest->__anon1._class->__anon1.registered->dataType->kind == 8, 0x0, 0x0, warnConst)) +if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 1, dest->__anon1._class->__anon1.registered->dataType->kind == 8, 0, 0, warnConst)) { -return 0x1; +return 1; } } } @@ -5106,21 +5111,21 @@ if(convert->memberAccess == 1 || _class->module == privateModule) struct Conversion * after = (conversions != (((void *)0))) ? conversions->last : (((void *)0)); if(!convert->dataType) -convert->dataType = ProcessTypeString(convert->dataTypeString, 0x0); -if(convert->dataType != source && (!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), convert->dataType->kind == 8, convert->dataType->kind == 8, 0x0, 0x1, warnConst)) +convert->dataType = ProcessTypeString(convert->dataTypeString, 0); +if(convert->dataType != source && (!isConversionExploration || convert->dataType->kind == 8 || !strcmp(_class->name, "String")) && MatchTypes(convert->dataType, dest, conversions, (((void *)0)), (((void *)0)), convert->dataType->kind == 8, convert->dataType->kind == 8, 0, 1, warnConst)) { if(!conversions && !convert->Get) -return 0x1; +return 1; else if(conversions != (((void *)0))) { if(_class->type == 3 && convert->dataType->kind == 8 && convert->dataType->__anon1._class && convert->dataType->__anon1._class->__anon1.registered && _class->base == convert->dataType->__anon1._class->__anon1.registered->base && (dest->kind != 8 || dest->__anon1._class->__anon1.registered != _class->base)) -return 0x1; +return 1; else { -struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 0x1, conv); +struct Conversion * conv = (conv = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Conversion), conv->convert = convert, conv->isGet = 1, conv); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(conversions, after, conv); -return 0x1; +return 1; } } } @@ -5130,13 +5135,13 @@ return 0x1; if(enumBaseType && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered->type == 4) { if(!source->__anon1._class->__anon1.registered->dataType) -source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0x0); +source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0); if(!isConversionExploration || source->__anon1._class->__anon1.registered->dataType->kind == 8 || !strcmp(source->__anon1._class->__anon1.registered->name, "String")) { -if(MatchTypes(source->__anon1._class->__anon1.registered->dataType, dest, conversions, (((void *)0)), (((void *)0)), source->__anon1._class->__anon1.registered->dataType->kind == 8, source->__anon1._class->__anon1.registered->dataType->kind == 8, 0x0, 0x0, warnConst)) -return 0x1; -else if(MatchTypes(dest, source->__anon1._class->__anon1.registered->dataType, (((void *)0)), (((void *)0)), (((void *)0)), 0x0, 0x0, 0x0, 0x0, warnConst)) -return 0x1; +if(MatchTypes(source->__anon1._class->__anon1.registered->dataType, dest, conversions, (((void *)0)), (((void *)0)), source->__anon1._class->__anon1.registered->dataType->kind == 8, source->__anon1._class->__anon1.registered->dataType->kind == 8, 0, 0, warnConst)) +return 1; +else if(MatchTypes(dest, source->__anon1._class->__anon1.registered->dataType, (((void *)0)), (((void *)0)), (((void *)0)), 0, 0, 0, 0, warnConst)) +return 1; } } } @@ -5144,23 +5149,23 @@ return 0x1; if(source->kind == 8 || source->kind == 19) ; else if(dest->kind == source->kind && (dest->kind != 9 && dest->kind != 10 && dest->kind != 11 && dest->kind != 12 && dest->kind != 13 && dest->kind != 16)) -return 0x1; +return 1; else if(dest->kind == 7 && source->kind == 6) -return 0x1; +return 1; else if(dest->kind == 2 && (source->kind == 1 || source->kind == 24)) -return 0x1; +return 1; else if(dest->kind == 3 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 23)) -return 0x1; +return 1; else if(dest->kind == 4 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 22 || source->kind == 23)) -return 0x1; +return 1; else if(dest->kind == 22 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 23 || source->kind == 4)) -return 0x1; +return 1; else if(dest->kind == 23 && (source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 3 || source->kind == 4 || source->kind == 22)) -return 0x1; +return 1; else if(source->kind == 15 && (dest->kind == 3 || dest->kind == 2 || dest->kind == 1 || source->kind == 24 || dest->kind == 5 || dest->kind == 4 || dest->kind == 22 || dest->kind == 23)) -return 0x1; +return 1; else if(dest->kind == 15 && !isConversionExploration && (source->kind == 3 || source->kind == 2 || source->kind == 1 || source->kind == 24 || source->kind == 5 || source->kind == 4 || source->kind == 22 || source->kind == 23)) -return 0x1; +return 1; else if((dest->kind == 11 || (dest->kind == 13 && dest->__anon1.type->kind == 11) || dest->kind == 16) && ((source->kind == 11 || (source->kind == 13 && source->__anon1.type->kind == 11) || source->kind == 16))) { struct Type * paramSource, * paramDest; @@ -5191,7 +5196,7 @@ if(paramDest && paramDest->kind == 8) Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), paramDest->__anon1._class->string); else Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class should not take an object\n", (((void *)0)))); -return 0x0; +return 0; } paramDest = paramDest->next; } @@ -5204,7 +5209,7 @@ if(dest->__anon1.__anon2.thisClass) if(!paramSource || paramSource->kind != 8 || !__ecereNameSpace__ecere__com__eClass_IsDerived(paramSource->__anon1._class->__anon1.registered, dest->__anon1.__anon2.thisClass->__anon1.registered)) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), dest->__anon1.__anon2.thisClass->string); -return 0x0; +return 0; } } else @@ -5215,7 +5220,7 @@ if(owningClassDest) Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s expected to be derived from method class\n", (((void *)0))), owningClassDest->fullName); else Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "overriding class expected to be derived from method class\n", (((void *)0)))); -return 0x0; +return 0; } } paramSource = paramSource->next; @@ -5227,7 +5232,7 @@ if(dest->__anon1.__anon2.thisClass) if(!__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass ? source->__anon1.__anon2.thisClass->__anon1.registered : owningClassSource, dest->__anon1.__anon2.thisClass->__anon1.registered)) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "method class must be derived from %s\n", (((void *)0))), dest->__anon1.__anon2.thisClass->string); -return 0x0; +return 0; } } else @@ -5235,24 +5240,24 @@ else if(source->__anon1.__anon2.thisClass && source->__anon1.__anon2.thisClass->__anon1.registered && owningClassDest && !__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1.__anon2.thisClass->__anon1.registered, owningClassDest)) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s expected to be derived from method class\n", (((void *)0))), source->__anon1.__anon2.thisClass->__anon1.registered->fullName); -return 0x0; +return 0; } } } } -if(!MatchTypes(source->__anon1.__anon2.returnType, dest->__anon1.__anon2.returnType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst)) +if(!MatchTypes(source->__anon1.__anon2.returnType, dest->__anon1.__anon2.returnType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst)) { Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible return type for function\n", (((void *)0)))); -return 0x0; +return 0; } else -CheckConstCompatibility(dest->__anon1.__anon2.returnType, source->__anon1.__anon2.returnType, 0x1); +CheckConstCompatibility(dest->__anon1.__anon2.returnType, source->__anon1.__anon2.returnType, 1); for(; paramDest; paramDest = paramDest->next) { if(!paramSource) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "not enough parameters\n", (((void *)0)))); -return 0x0; +return 0; } { struct Type * paramDestType = paramDest; @@ -5291,19 +5296,19 @@ if(curParam) { struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = owningClassSource->templateArgs[id]; -paramDestType = type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0); +paramDestType = type = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0); } } -if(!MatchTypes(paramDestType, paramSourceType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst) && (!acceptReversedParams || !MatchTypes(paramSourceType, paramDestType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst))) +if(!MatchTypes(paramDestType, paramSourceType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst) && (!acceptReversedParams || !MatchTypes(paramSourceType, paramDestType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst))) { char type[1024]; type[0] = (char)0; -PrintType(paramDest, type, 0x0, 0x1); +PrintType(paramDest, type, 0, 1); Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible parameter %s (expected %s)\n", (((void *)0))), paramSource->name, type); if(paramDestType != paramDest) FreeType(paramDestType); -return 0x0; +return 0; } if(paramDestType != paramDest) FreeType(paramDestType); @@ -5313,21 +5318,21 @@ paramSource = paramSource->next; if(paramSource) { Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "too many parameters\n", (((void *)0)))); -return 0x0; +return 0; } -return 0x1; +return 1; } else if((dest->kind == 11 || (dest->kind == 13 && dest->__anon1.type->kind == 11) || dest->kind == 16) && (source->kind == 13 && source->__anon1.type->kind == 0)) { -return 0x1; +return 1; } else if((dest->kind == 13 || dest->kind == 12) && (source->kind == 12 || source->kind == 13)) { -if(MatchTypes(source->__anon1.type, dest->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst)) -return 0x1; +if(MatchTypes(source->__anon1.type, dest->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst)) +return 1; } } -return 0x0; +return 0; } static void FreeConvert(struct Conversion * convert) @@ -5353,17 +5358,17 @@ extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpac struct __ecereNameSpace__ecere__com__EnumClassData { struct __ecereNameSpace__ecere__sys__OldList values; -int largest; +long long largest; } __attribute__ ((gcc_struct)); -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 void FreeExpContents(struct Expression * exp); @@ -5398,9 +5403,9 @@ type->kind = 8; if(!_class->symbol) _class->symbol = FindClass(_class->fullName); type->__anon1._class = _class->symbol; -if(MatchTypes(type, dest, &converts, (((void *)0)), (((void *)0)), 0x1, 0x0, 0x0, 0x0, 0x0)) +if(MatchTypes(type, dest, &converts, (((void *)0)), (((void *)0)), 1, 0, 0, 0, 0)) { -struct __ecereNameSpace__ecere__sys__NamedLink * value; +struct __ecereNameSpace__ecere__sys__NamedLink64 * value; struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum"); if(enumClass) @@ -5420,16 +5425,16 @@ if(value) { FreeExpContents(sourceExp); FreeType(sourceExp->expType); -sourceExp->isConstant = 0x1; +sourceExp->isConstant = 1; sourceExp->expType = MkClassType(baseClass->fullName); { char constant[256]; sourceExp->type = 2; -if(!strcmp(baseClass->dataTypeString, "int")) -sprintf(constant, "%d", (int)value->data); +if(!strcmp(baseClass->dataTypeString, "int") || !strcmp(baseClass->dataTypeString, "int64") || !strcmp(baseClass->dataTypeString, "short") || !strcmp(baseClass->dataTypeString, "char")) +sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), value->data); else -sprintf(constant, "0x%X", (int)value->data); +sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64XLL" : "0x%llXLL"), value->data); sourceExp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant); } while(converts.first) @@ -5440,7 +5445,7 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove(&converts, convert); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(conversions, convert); } ((type ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)type) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(type)) : 0), type = 0); -return 0x1; +return 1; } } } @@ -5452,8 +5457,8 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(&converts, FreeConvert) } for(nameSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BinaryTree_Get_first(&nameSpace->nameSpaces); nameSpace != (((void *)0)); nameSpace = (struct __ecereNameSpace__ecere__com__NameSpace *)__ecereProp___ecereNameSpace__ecere__sys__BTNode_Get_next(((struct __ecereNameSpace__ecere__sys__BTNode *)nameSpace))) if(MatchWithEnums_NameSpace(nameSpace, sourceExp, dest, string, conversions)) -return 0x1; -return 0x0; +return 1; +return 0; } extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__SubModule; @@ -5471,16 +5476,16 @@ unsigned int ModuleVisibility(struct __ecereNameSpace__ecere__com__Instance * se struct __ecereNameSpace__ecere__com__SubModule * subModule; if(searchFor == searchIn) -return 0x1; +return 1; for(subModule = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->modules.first; subModule; subModule = subModule->next) { if(subModule->importMode == 1 || searchIn == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)searchIn + structSize_Instance)))->application) { if(ModuleVisibility(subModule->module, searchFor)) -return 0x1; +return 1; } } -return 0x0; +return 0; } extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Application; @@ -5501,17 +5506,17 @@ unsigned int MatchWithEnums_Module(struct __ecereNameSpace__ecere__com__Instance struct __ecereNameSpace__ecere__com__Instance * module; if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Module)))->systemNameSpace, sourceExp, dest, string, conversions)) -return 0x1; +return 1; if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Instance)))->privateNameSpace, sourceExp, dest, string, conversions)) -return 0x1; +return 1; if(MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Instance)))->publicNameSpace, sourceExp, dest, string, conversions)) -return 0x1; +return 1; for(module = ((struct __ecereNameSpace__ecere__com__Application *)(((char *)((struct __ecereNameSpace__ecere__com__Module *)(((char *)mainModule + structSize_Instance)))->application + structSize_Module)))->allModules.first; module; module = ((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->next) { if(ModuleVisibility(mainModule, module) && MatchWithEnums_NameSpace(&((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->publicNameSpace, sourceExp, dest, string, conversions)) -return 0x1; +return 1; } -return 0x0; +return 0; } extern struct Expression * CopyExpression(struct Expression * exp); @@ -5548,7 +5553,7 @@ FreeExpression(computedExp); computedExp = sourceExp; } FreeType(dest); -return 0x1; +return 1; } if(!skipUnitBla && source && dest && source->kind == 8 && dest->kind == 8) { @@ -5568,14 +5573,14 @@ FreeExpression(computedExp); computedExp = sourceExp; } FreeType(dest); -return 0x1; +return 1; } } } if(source) { struct __ecereNameSpace__ecere__sys__OldList * specs; -unsigned int flag = 0x0; +unsigned int flag = 0; long long value = (((int)0x7fffffff)); source->refCount++; @@ -5604,7 +5609,7 @@ FreeType(source); source = __extension__ ({ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); -__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0x0, __ecereInstance1->refCount = 1, __ecereInstance1; +__ecereInstance1->kind = 3, __ecereInstance1->isSigned = 0, __ecereInstance1->refCount = 1, __ecereInstance1; }); } if(dest->kind == 8) @@ -5628,19 +5633,19 @@ _class->symbol = FindClass(_class->fullName); tempType->__anon1._class = _class->symbol; tempType->truth = dest->truth; if(tempType->__anon1._class) -MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst); +MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst); backupSourceExpType = sourceExp->expType; sourceExp->expType = dest; dest->refCount++; -flag = 0x1; +flag = 1; ((tempType ? (__ecereClass_Type->Destructor ? __ecereClass_Type->Destructor((void *)tempType) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(tempType)) : 0), tempType = 0); } } if(_class && _class->type == 2 && source->kind != 8) { if(!dest->__anon1._class->__anon1.registered->dataType) -dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0x0); -if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst)) +dest->__anon1._class->__anon1.registered->dataType = ProcessTypeString(dest->__anon1._class->__anon1.registered->dataTypeString, 0); +if(MatchTypes(source, dest->__anon1._class->__anon1.registered->dataType, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst)) { FreeType(source); FreeType(sourceExp->expType); @@ -5667,7 +5672,7 @@ FreeType(source); FreeType(dest); if(backupSourceExpType) FreeType(backupSourceExpType); -return 0x1; +return 1; } } else if(source->kind == 8) @@ -5682,7 +5687,7 @@ struct Type * tempType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClas struct Type * tempDest, * tempSource; if(!source->__anon1._class->__anon1.registered->dataType) -source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0x0); +source->__anon1._class->__anon1.registered->dataType = ProcessTypeString(source->__anon1._class->__anon1.registered->dataTypeString, 0); for(; _class->base->type != 1000; _class = _class->base) ; tempDest = source; @@ -5692,7 +5697,7 @@ tempType->__anon1._class = FindClass(_class->fullName); tempType->truth = source->truth; tempType->classObjectType = source->classObjectType; if(tempType->__anon1._class) -MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst); +MatchTypes(tempSource, tempDest, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst); if(conversions->last) { ((struct Conversion *)conversions->last)->resultType = dest; @@ -5710,7 +5715,7 @@ if(sourceExp->expType) sourceExp->expType->refCount++; } if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); FreeType(dest); dest = MkClassType(source->__anon1._class->string); dest->truth = source->truth; @@ -5724,17 +5729,17 @@ source->refCount++; } if(!flag) { -if(MatchTypes(source, dest, conversions, (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst)) +if(MatchTypes(source, dest, conversions, (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst)) { FreeType(source); FreeType(dest); -return 0x1; +return 1; } } if(dest->kind == 8) { struct __ecereNameSpace__ecere__com__Class * _class = dest->__anon1._class ? dest->__anon1._class->__anon1.registered : (((void *)0)); -unsigned int fittingValue = 0x0; +unsigned int fittingValue = 0; if(_class && _class->type == 4) { @@ -5742,7 +5747,7 @@ struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere struct __ecereNameSpace__ecere__com__EnumClassData * c = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0))); if(c && value >= 0 && value <= c->largest) -fittingValue = 0x1; +fittingValue = 1; } if(_class && !dest->truth && (_class->type == 3 || fittingValue || (_class->type != 1 && !value && source->kind == 3) || _class->type == 2)) { @@ -5771,10 +5776,10 @@ if(inCompiler) FreeType(dest); if(backupSourceExpType) FreeType(backupSourceExpType); -return 0x1; +return 1; } if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); FreeType(dest); dest = _class->dataType; dest->refCount++; @@ -5825,7 +5830,7 @@ if(sourceExp->expType) FreeType(sourceExp->expType); sourceExp->expType = backupSourceExpType; } -return 0x0; +return 0; } } else if(dest->kind == 7 && (source->kind == 7 || source->kind == 6 || source->kind == 4 || source->kind == 3 || source->kind == 15 || source->kind == 2 || source->kind == 24 || source->kind == 1)) @@ -5883,7 +5888,7 @@ if(sourceExp->expType) FreeType(sourceExp->expType); sourceExp->expType = backupSourceExpType; } -return 0x0; +return 0; } if(!flag && !sourceExp->opDestType) { @@ -5920,7 +5925,7 @@ FreeType(dest); FreeType(source); if(backupSourceExpType) FreeType(backupSourceExpType); -return 0x1; +return 1; } else { @@ -5946,7 +5951,7 @@ if(enumClass) { for(; _class && _class->type == 4; _class = _class->base) { -struct __ecereNameSpace__ecere__sys__NamedLink * value; +struct __ecereNameSpace__ecere__sys__NamedLink64 * value; struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0))); for(value = e->values.first; value; value = value->next) @@ -5958,20 +5963,17 @@ if(value) { FreeExpContents(sourceExp); FreeType(sourceExp->expType); -sourceExp->isConstant = 0x1; +sourceExp->isConstant = 1; sourceExp->expType = MkClassType(_class->fullName); { -char constant[256]; - sourceExp->type = 2; -if(_class->dataTypeString && !strcmp(_class->dataTypeString, "int")) -sprintf(constant, "%d", (int)value->data); +if(_class->dataTypeString && (!strcmp(_class->dataTypeString, "int") || !strcmp(_class->dataTypeString, "int64") || !strcmp(_class->dataTypeString, "short") || !strcmp(_class->dataTypeString, "char"))) +sourceExp->__anon1.__anon1.constant = PrintInt64(value->data); else -sprintf(constant, "0x%X", (int)value->data); -sourceExp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant); +sourceExp->__anon1.__anon1.constant = PrintUInt64(value->data); } FreeType(dest); -return 0x1; +return 1; } } } @@ -5980,12 +5982,12 @@ return 0x1; if(dest->classObjectType != 2 && dest->kind == 8 && MatchWithEnums_Module(privateModule, sourceExp, dest, id->string, conversions)) { FreeType(dest); -return 0x1; +return 1; } } FreeType(dest); } -return 0x0; +return 0; } static unsigned int IntAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6000,7 +6002,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6015,7 +6017,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Add(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6030,7 +6032,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Add(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6045,7 +6047,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6060,7 +6062,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6075,7 +6077,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6090,7 +6092,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6105,7 +6107,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6120,7 +6122,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleAdd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6135,7 +6137,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6150,7 +6152,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6165,7 +6167,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Sub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6180,7 +6182,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Sub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6195,7 +6197,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6210,7 +6212,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6225,7 +6227,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6240,7 +6242,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6255,7 +6257,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6270,7 +6272,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleSub(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6285,7 +6287,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6300,7 +6302,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6315,7 +6317,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Mul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6330,7 +6332,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Mul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6345,7 +6347,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6360,7 +6362,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6375,7 +6377,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6390,7 +6392,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6405,7 +6407,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6420,7 +6422,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleMul(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6435,7 +6437,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6450,7 +6452,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6465,7 +6467,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Div(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6480,7 +6482,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Div(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6495,7 +6497,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6510,7 +6512,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6525,7 +6527,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6540,7 +6542,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6555,7 +6557,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6570,7 +6572,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleDiv(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6585,7 +6587,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntMod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6600,7 +6602,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntMod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6615,7 +6617,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Mod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6630,7 +6632,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Mod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6645,7 +6647,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortMod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6660,7 +6662,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortMod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6675,7 +6677,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharMod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6690,7 +6692,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharMod(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -6705,7 +6707,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntNeg(struct Expression * exp, struct Operand * op1) @@ -6718,7 +6720,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntNeg(struct Expression * exp, struct Operand * op1) @@ -6731,7 +6733,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Neg(struct Expression * exp, struct Operand * op1) @@ -6744,7 +6746,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Neg(struct Expression * exp, struct Operand * op1) @@ -6757,7 +6759,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortNeg(struct Expression * exp, struct Operand * op1) @@ -6770,7 +6772,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortNeg(struct Expression * exp, struct Operand * op1) @@ -6783,7 +6785,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharNeg(struct Expression * exp, struct Operand * op1) @@ -6796,7 +6798,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharNeg(struct Expression * exp, struct Operand * op1) @@ -6809,7 +6811,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatNeg(struct Expression * exp, struct Operand * op1) @@ -6822,7 +6824,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleNeg(struct Expression * exp, struct Operand * op1) @@ -6835,7 +6837,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntInc(struct Expression * exp, struct Operand * op1) @@ -6848,7 +6850,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntInc(struct Expression * exp, struct Operand * op1) @@ -6861,7 +6863,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Inc(struct Expression * exp, struct Operand * op1) @@ -6874,7 +6876,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Inc(struct Expression * exp, struct Operand * op1) @@ -6887,7 +6889,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortInc(struct Expression * exp, struct Operand * op1) @@ -6900,7 +6902,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortInc(struct Expression * exp, struct Operand * op1) @@ -6913,7 +6915,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharInc(struct Expression * exp, struct Operand * op1) @@ -6926,7 +6928,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharInc(struct Expression * exp, struct Operand * op1) @@ -6939,7 +6941,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatInc(struct Expression * exp, struct Operand * op1) @@ -6952,7 +6954,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleInc(struct Expression * exp, struct Operand * op1) @@ -6965,7 +6967,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntDec(struct Expression * exp, struct Operand * op1) @@ -6978,7 +6980,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntDec(struct Expression * exp, struct Operand * op1) @@ -6991,7 +6993,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Dec(struct Expression * exp, struct Operand * op1) @@ -7004,7 +7006,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Dec(struct Expression * exp, struct Operand * op1) @@ -7017,7 +7019,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortDec(struct Expression * exp, struct Operand * op1) @@ -7030,7 +7032,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortDec(struct Expression * exp, struct Operand * op1) @@ -7043,7 +7045,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharDec(struct Expression * exp, struct Operand * op1) @@ -7056,7 +7058,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharDec(struct Expression * exp, struct Operand * op1) @@ -7069,7 +7071,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatDec(struct Expression * exp, struct Operand * op1) @@ -7082,7 +7084,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleDec(struct Expression * exp, struct Operand * op1) @@ -7095,7 +7097,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7110,7 +7112,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7125,7 +7127,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Asign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7140,7 +7142,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Asign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7155,7 +7157,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7170,7 +7172,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7185,7 +7187,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7200,7 +7202,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7215,7 +7217,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7230,7 +7232,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7245,7 +7247,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7260,7 +7262,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7275,7 +7277,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64AddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7290,7 +7292,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64AddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7305,7 +7307,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7320,7 +7322,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7335,7 +7337,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7350,7 +7352,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7365,7 +7367,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7380,7 +7382,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleAddAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7395,7 +7397,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7410,7 +7412,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7425,7 +7427,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64SubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7440,7 +7442,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64SubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7455,7 +7457,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7470,7 +7472,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7485,7 +7487,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7500,7 +7502,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7515,7 +7517,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7530,7 +7532,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleSubAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7545,7 +7547,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7560,7 +7562,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7575,7 +7577,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64MulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7590,7 +7592,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64MulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7605,7 +7607,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7620,7 +7622,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7635,7 +7637,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7650,7 +7652,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7665,7 +7667,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7680,7 +7682,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleMulAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7695,7 +7697,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7710,7 +7712,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7725,7 +7727,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64DivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7740,7 +7742,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64DivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7755,7 +7757,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7770,7 +7772,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7785,7 +7787,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7800,7 +7802,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7815,7 +7817,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7830,7 +7832,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleDivAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7845,7 +7847,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7860,7 +7862,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7875,7 +7877,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64ModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7890,7 +7892,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64ModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7905,7 +7907,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7920,7 +7922,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7935,7 +7937,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7950,7 +7952,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharModAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7965,7 +7967,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7980,7 +7982,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -7995,7 +7997,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64BitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8010,7 +8012,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64BitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8025,7 +8027,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8040,7 +8042,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8055,7 +8057,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8070,7 +8072,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharBitAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8085,7 +8087,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8100,7 +8102,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8115,7 +8117,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64BitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8130,7 +8132,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64BitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8145,7 +8147,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8160,7 +8162,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8175,7 +8177,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8190,7 +8192,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharBitOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8205,7 +8207,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8220,7 +8222,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8235,7 +8237,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64BitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8250,7 +8252,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64BitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8265,7 +8267,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8280,7 +8282,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8295,7 +8297,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8310,7 +8312,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharBitXor(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8325,7 +8327,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8340,7 +8342,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8355,7 +8357,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64LShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8370,7 +8372,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64LShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8385,7 +8387,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8400,7 +8402,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8415,7 +8417,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8430,7 +8432,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharLShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8445,7 +8447,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8460,7 +8462,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8475,7 +8477,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64RShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8490,7 +8492,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64RShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8505,7 +8507,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8520,7 +8522,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8535,7 +8537,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8550,7 +8552,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharRShift(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8565,7 +8567,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntBitNot(struct Expression * exp, struct Operand * op1) @@ -8578,7 +8580,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntBitNot(struct Expression * exp, struct Operand * op1) @@ -8591,7 +8593,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64BitNot(struct Expression * exp, struct Operand * op1) @@ -8604,7 +8606,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64BitNot(struct Expression * exp, struct Operand * op1) @@ -8617,7 +8619,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortBitNot(struct Expression * exp, struct Operand * op1) @@ -8630,7 +8632,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortBitNot(struct Expression * exp, struct Operand * op1) @@ -8643,7 +8645,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharBitNot(struct Expression * exp, struct Operand * op1) @@ -8656,7 +8658,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharBitNot(struct Expression * exp, struct Operand * op1) @@ -8669,7 +8671,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8684,7 +8686,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8699,7 +8701,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64AndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8714,7 +8716,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64AndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8729,7 +8731,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8744,7 +8746,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8759,7 +8761,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8774,7 +8776,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharAndAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8789,7 +8791,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8804,7 +8806,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8819,7 +8821,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64OrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8834,7 +8836,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64OrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8849,7 +8851,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8864,7 +8866,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8879,7 +8881,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8894,7 +8896,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharOrAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8909,7 +8911,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8924,7 +8926,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8939,7 +8941,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64XorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8954,7 +8956,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64XorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8969,7 +8971,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8984,7 +8986,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -8999,7 +9001,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9014,7 +9016,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharXorAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9029,7 +9031,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9044,7 +9046,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9059,7 +9061,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64LShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9074,7 +9076,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64LShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9089,7 +9091,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9104,7 +9106,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9119,7 +9121,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9134,7 +9136,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharLShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9149,7 +9151,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9164,7 +9166,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9179,7 +9181,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64RShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9194,7 +9196,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64RShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9209,7 +9211,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9224,7 +9226,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9239,7 +9241,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9254,7 +9256,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharRShiftAsign(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9269,7 +9271,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntNot(struct Expression * exp, struct Operand * op1) @@ -9282,7 +9284,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntNot(struct Expression * exp, struct Operand * op1) @@ -9295,7 +9297,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Not(struct Expression * exp, struct Operand * op1) @@ -9308,7 +9310,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Not(struct Expression * exp, struct Operand * op1) @@ -9321,7 +9323,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortNot(struct Expression * exp, struct Operand * op1) @@ -9334,7 +9336,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortNot(struct Expression * exp, struct Operand * op1) @@ -9347,7 +9349,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharNot(struct Expression * exp, struct Operand * op1) @@ -9360,7 +9362,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharNot(struct Expression * exp, struct Operand * op1) @@ -9373,7 +9375,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9388,7 +9390,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9403,7 +9405,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Equ(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9418,7 +9420,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Equ(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9433,7 +9435,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9448,7 +9450,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9463,7 +9465,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9478,7 +9480,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9493,7 +9495,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9508,7 +9510,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9523,7 +9525,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9538,7 +9540,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9553,7 +9555,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Nqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9568,7 +9570,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Nqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9583,7 +9585,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9598,7 +9600,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9613,7 +9615,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9628,7 +9630,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9643,7 +9645,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9658,7 +9660,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleNqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9673,7 +9675,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9688,7 +9690,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9703,7 +9705,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64And(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9718,7 +9720,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64And(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9733,7 +9735,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9748,7 +9750,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9763,7 +9765,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9778,7 +9780,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9793,7 +9795,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9808,7 +9810,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleAnd(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9823,7 +9825,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9838,7 +9840,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9853,7 +9855,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Or(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9868,7 +9870,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Or(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9883,7 +9885,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9898,7 +9900,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9913,7 +9915,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9928,7 +9930,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9943,7 +9945,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9958,7 +9960,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleOr(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9973,7 +9975,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -9988,7 +9990,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10003,7 +10005,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Grt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10018,7 +10020,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Grt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10033,7 +10035,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10048,7 +10050,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10063,7 +10065,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10078,7 +10080,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10093,7 +10095,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10108,7 +10110,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleGrt(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10123,7 +10125,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10138,7 +10140,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10153,7 +10155,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Sma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10168,7 +10170,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Sma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10183,7 +10185,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10198,7 +10200,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10213,7 +10215,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10228,7 +10230,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10243,7 +10245,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10258,7 +10260,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleSma(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10273,7 +10275,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10288,7 +10290,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10303,7 +10305,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64GrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10318,7 +10320,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64GrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10333,7 +10335,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10348,7 +10350,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10363,7 +10365,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10378,7 +10380,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10393,7 +10395,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10408,7 +10410,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleGrtEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10423,7 +10425,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10438,7 +10440,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10453,7 +10455,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64SmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10468,7 +10470,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64SmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10483,7 +10485,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10498,7 +10500,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10513,7 +10515,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10528,7 +10530,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10543,7 +10545,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int FloatSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10558,7 +10560,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int DoubleSmaEqu(struct Expression * exp, struct Operand * op1, struct Operand * op2) @@ -10573,7 +10575,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int IntCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10586,7 +10588,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UIntCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10599,7 +10601,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int Int64Cond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10612,7 +10614,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UInt64Cond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10625,7 +10627,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int ShortCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10638,7 +10640,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UShortCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10651,7 +10653,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int CharCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10664,7 +10666,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } static unsigned int UCharCond(struct Expression * exp, struct Operand * op1, struct Operand * op2, struct Operand * op3) @@ -10677,7 +10679,7 @@ exp->expType = op1->type; if(op1->type) op1->type->refCount++; } -return 0x1; +return 1; } struct OpTable intOps = @@ -10734,7 +10736,7 @@ void ReadString(char * output, char * string) { int len = strlen(string); int c, d = 0; -unsigned int quoted = 0x0, escaped = 0x0; +unsigned int quoted = 0, escaped = 0; for(c = 0; c < len; c++) { @@ -10778,16 +10780,16 @@ default: output[d] = ch; } d++; -escaped = 0x0; +escaped = 0; } else { if(ch == '\"') -quoted ^= 0x1; +quoted ^= 1; else if(quoted) { if(ch == '\\') -escaped = 0x1; +escaped = 1; else output[d++] = ch; } @@ -10899,7 +10901,7 @@ if(type) while(type->kind == 8 && type->__anon1._class->__anon1.registered && (type->__anon1._class->__anon1.registered->type == 2 || type->__anon1._class->__anon1.registered->type == 3 || type->__anon1._class->__anon1.registered->type == 4)) { if(!type->__anon1._class->__anon1.registered->dataType) -type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0x0); +type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0); type = type->__anon1._class->__anon1.registered->dataType; } if(exp->type == 3 && op.kind == 13) @@ -10911,7 +10913,7 @@ op.ops = uint64Ops; else if(exp->isConstant && exp->type == 2) { op.kind = type->kind; -op.type = exp->expType; +op.type = type; switch(op.kind) { case 24: @@ -11038,6 +11040,40 @@ break; return op; } +static long long GetEnumValue(struct __ecereNameSpace__ecere__com__Class * _class, void * ptr) +{ +long long v = 0; + +switch(_class->typeSize) +{ +case 8: +if(!strcmp(_class->dataTypeString, "uint64")) +v = (long long)*(uint64 *)ptr; +else +v = *(long long *)ptr; +break; +case 4: +if(!strcmp(_class->dataTypeString, "uint")) +v = (long long)*(unsigned int *)ptr; +else +v = (long long)*(int *)ptr; +break; +case 2: +if(!strcmp(_class->dataTypeString, "uint16")) +v = (long long)*(unsigned short *)ptr; +else +v = (long long)*(short *)ptr; +break; +case 1: +if(!strcmp(_class->dataTypeString, "byte")) +v = (long long)*(unsigned char *)ptr; +else +v = (long long)*(char *)ptr; +break; +} +return v; +} + int __ecereVMethodID_class_OnGetString; extern struct __ecereNameSpace__ecere__com__Class * __ecereClass_int; @@ -11070,7 +11106,7 @@ char * result = (((void *)0)); exp->loc = member->loc = inst->loc; ((struct Identifier *)(*member->identifiers).first)->loc = inst->loc; if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); type = dataMember->dataType; if(type->kind == 8) { @@ -11083,11 +11119,11 @@ struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere if(enumClass) { struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0))); -struct __ecereNameSpace__ecere__sys__NamedLink * item; +struct __ecereNameSpace__ecere__sys__NamedLink64 * item; for(item = e->values.first; item; item = item->next) { -if((int)item->data == *(int *)ptr) +if(item->data == GetEnumValue(_class, ptr)) { result = item->name; break; @@ -11105,7 +11141,7 @@ ProcessExpressionType(exp); if(_class->type == 4 || _class->type == 3 || _class->type == 2) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); type = _class->dataType; } } @@ -11196,7 +11232,7 @@ char * result = (((void *)0)); exp->loc = member->loc = inst->loc; ((struct Identifier *)(*member->identifiers).first)->loc = inst->loc; if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); type = dataMember->dataType; if(type->kind == 8) { @@ -11209,11 +11245,11 @@ struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere if(enumClass) { struct __ecereNameSpace__ecere__com__EnumClassData * e = (_class ? ((void *)(((char *)_class->data) + enumClass->offsetClass)) : (((void *)0))); -struct __ecereNameSpace__ecere__sys__NamedLink * item; +struct __ecereNameSpace__ecere__sys__NamedLink64 * item; for(item = e->values.first; item; item = item->next) { -if((int)item->data == *(int *)ptr) +if(item->data == GetEnumValue(_class, ptr)) { result = item->name; break; @@ -11231,7 +11267,7 @@ ProcessExpressionType(exp); if(_class->type == 4 || _class->type == 3 || _class->type == 2) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); type = _class->dataType; } } @@ -11323,7 +11359,7 @@ struct MemberInit * member; for(member = (*members->__anon1.dataMembers).first; member; member = member->next) { struct Identifier * ident = member->identifiers ? (*member->identifiers).first : (((void *)0)); -unsigned int found = 0x0; +unsigned int found = 0; struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0)); struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0)); unsigned int dataMemberOffset; @@ -11342,7 +11378,7 @@ __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, dataMember- if(_class->type == 0) dataMemberOffset += _class->base->structSize; } -found = 0x1; +found = 1; } } else @@ -11350,7 +11386,7 @@ else prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, ident->string, privateModule); if(prop) { -found = 0x1; +found = 1; if(prop->memberAccess == 1) { curMember = (struct __ecereNameSpace__ecere__com__DataMember *)prop; @@ -11365,7 +11401,7 @@ int _subMemberStackPos = 0; dataMember = __ecereNameSpace__ecere__com__eClass_FindDataMemberAndOffset(_class, ident->string, &dataMemberOffset, privateModule, _subMemberStack, &_subMemberStackPos); if(dataMember) { -found = 0x1; +found = 1; if(dataMember->memberAccess == 1) { curMember = dataMember; @@ -11380,7 +11416,7 @@ if(found && member->initializer && member->initializer->type == 0) { struct Expression * value = member->initializer->__anon1.exp; struct Type * type = (((void *)0)); -unsigned int deepMember = 0x0; +unsigned int deepMember = 0; if(prop) { @@ -11389,12 +11425,12 @@ type = prop->dataType; else if(dataMember) { if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); type = dataMember->dataType; } if(ident && ident->next) { -deepMember = 0x1; +deepMember = 1; for(ident = ident->next; ident && type; ident = ident->next) { if(type->kind == 8) @@ -11441,7 +11477,7 @@ struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__an if(_class->type == 2 || _class->type == 3 || _class->type == 4) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); type = _class->dataType; } } @@ -11587,7 +11623,7 @@ struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__an if(_class->type == 3) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); type = _class->dataType; } } @@ -11635,16 +11671,16 @@ else if(dataMember) { struct __ecereNameSpace__ecere__com__BitMember * bitMember = (struct __ecereNameSpace__ecere__com__BitMember *)dataMember; struct Type * type; -uint64 part; +uint64 part = 0; bits = (bits & ~bitMember->mask); if(!bitMember->dataType) -bitMember->dataType = ProcessTypeString(bitMember->dataTypeString, 0x0); +bitMember->dataType = ProcessTypeString(bitMember->dataTypeString, 0); type = bitMember->dataType; if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered) { if(!type->__anon1._class->__anon1.registered->dataType) -type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0x0); +type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0); type = type->__anon1._class->__anon1.registered->dataType; } switch(type->kind) @@ -11734,7 +11770,7 @@ FreeInstance(inst); static unsigned int Promote(struct Operand * op, int kind, unsigned int isSigned) { -unsigned int result = 0x0; +unsigned int result = 0; switch(kind) { @@ -11979,9 +12015,6 @@ extern struct Expression * MkExpIdentifier(struct Identifier * id); void ComputeExpression(struct Expression * exp) { -char expString[10240]; - -expString[0] = '\0'; switch(exp->type) { case 1: @@ -12138,7 +12171,7 @@ char string[256]; struct Symbol * classSym; string[0] = '\0'; -PrintTypeNoConst(type, string, 0x0, 0x1); +PrintTypeNoConst(type, string, 0, 1); classSym = FindClass(string); _class = classSym ? classSym->__anon1.registered : (((void *)0)); } @@ -12171,7 +12204,7 @@ struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__an if(_class->type == 3) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); type = _class->dataType; } } @@ -12430,7 +12463,7 @@ break; } else { -exp->isConstant = 0x0; +exp->isConstant = 0; } } else if(member) @@ -12471,7 +12504,7 @@ else char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); FreeExpContents(exp); exp->type = 9; @@ -12502,7 +12535,7 @@ struct __ecereNameSpace__ecere__com__Class * _class = type->__anon1._class->__an if(_class && (_class->type == 3 || _class->type == 2)) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); type = _class->dataType; } } @@ -12749,7 +12782,7 @@ void ApplyAnyObjectLogic(struct Expression * e); static unsigned int CheckExpressionType(struct Expression * exp, struct Type * destType, unsigned int skipUnitBla, unsigned int warnConst) { -unsigned int result = 0x1; +unsigned int result = 1; if(destType) { @@ -12760,9 +12793,9 @@ struct __ecereNameSpace__ecere__sys__OldList converts = struct Conversion * convert; if(destType->kind == 0) -return 0x0; +return 0; if(!MatchTypeExpression(exp, destType, &converts, skipUnitBla, warnConst)) -result = 0x0; +result = 0; if(converts.count) { for(convert = converts.first; convert; convert = convert->next) @@ -12781,7 +12814,7 @@ newExp->destType = (((void *)0)); if(convert->isGet) { exp->type = 8; -exp->addedThis = 0x1; +exp->addedThis = 1; exp->__anon1.member.exp = newExp; FreeType(exp->__anon1.member.exp->expType); exp->__anon1.member.exp->expType = MkClassType(convert->convert->_class->fullName); @@ -12789,7 +12822,7 @@ exp->__anon1.member.exp->expType->classObjectType = objectType; exp->__anon1.member.member = MkIdentifier(convert->convert->dataTypeString); exp->__anon1.member.memberType = 1; exp->expType = convert->resultType ? convert->resultType : convert->convert->dataType; -exp->needCast = 0x1; +exp->needCast = 1; if(exp->expType) exp->expType->refCount++; ApplyAnyObjectLogic(exp->__anon1.member.exp); @@ -12798,11 +12831,11 @@ else { { exp->type = 8; -exp->addedThis = 0x1; +exp->addedThis = 1; exp->__anon1.member.exp = newExp; if(newExp->expType && newExp->expType->kind == 8 && newExp->expType->__anon1._class && newExp->expType->__anon1._class->__anon1.registered && newExp->expType->__anon1._class->__anon1.registered->type == 5) { -newExp->byReference = 0x1; +newExp->byReference = 1; } FreeType(exp->__anon1.member.exp->expType); exp->__anon1.member.exp->expType = (((void *)0)); @@ -12817,7 +12850,7 @@ ApplyAnyObjectLogic(exp->__anon1.member.exp); exp->__anon1.member.member = MkIdentifier(convert->convert->_class->fullName); exp->__anon1.member.memberType = 4; exp->expType = convert->resultType ? convert->resultType : MkClassType(convert->convert->_class->fullName); -exp->needCast = 0x1; +exp->needCast = 1; if(convert->resultType) convert->resultType->refCount++; } @@ -12830,7 +12863,7 @@ if(convert->isGet) { exp->expType = convert->resultType ? convert->resultType : convert->convert->dataType; if(exp->destType->casted) -exp->needCast = 0x1; +exp->needCast = 1; if(exp->expType) exp->expType->refCount++; } @@ -12838,7 +12871,7 @@ else { exp->expType = convert->resultType ? convert->resultType : MkClassType(convert->convert->_class->fullName); if(exp->destType->casted) -exp->needCast = 0x1; +exp->needCast = 1; if(convert->resultType) convert->resultType->refCount++; } @@ -12850,12 +12883,12 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Free(&converts, FreeConvert) } if(!result && exp->expType && converts.count) { -result = MatchTypes(exp->expType, exp->destType, (((void *)0)), (((void *)0)), (((void *)0)), 0x1, 0x1, 0x0, 0x0, warnConst); +result = MatchTypes(exp->expType, exp->destType, (((void *)0)), (((void *)0)), (((void *)0)), 1, 1, 0, 0, warnConst); } if(!result && exp->expType && exp->destType) { if((exp->destType->kind == 8 && exp->expType->kind == 13 && exp->expType->__anon1.type->kind == 8 && exp->expType->__anon1.type->__anon1._class == exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && exp->destType->__anon1._class->__anon1.registered->type == 1) || (exp->expType->kind == 8 && exp->destType->kind == 13 && exp->destType->__anon1.type->kind == 8 && exp->destType->__anon1.type->__anon1._class == exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1)) -result = 0x1; +result = 1; } } return result; @@ -12918,7 +12951,7 @@ default: exp->type = 11; exp->__anon1.cast.typeName = MkTypeName(MkListOne(MkSpecifierName("uint64")), (((void *)0))); exp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp)); -exp->needCast = 0x1; +exp->needCast = 1; break; } } @@ -12977,7 +13010,7 @@ else exp->type = 5; exp->__anon1.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp->expType->__anon1._class->string)), (((void *)0))), newExp)); exp->needTemplateCast = 2; -newExp->needCast = 0x1; +newExp->needCast = 1; newExp->needTemplateCast = 2; ProcessExpressionType((*exp->__anon1.list).first); break; @@ -13011,12 +13044,12 @@ struct Declarator * decl; struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(); typeString[0] = '\0'; -PrintType(exp->expType, typeString, 0x0, 0x0); +PrintType(exp->expType, typeString, 0, 0); decl = SpecDeclFromString(typeString, specs, (((void *)0))); exp->type = 11; exp->__anon1.cast.typeName = MkTypeName(specs, decl); exp->__anon1.cast.exp = MkExpBrackets(MkListOne(newExp)); -exp->__anon1.cast.exp->needCast = 0x1; +exp->__anon1.cast.exp->needCast = 1; } break; } @@ -13062,13 +13095,13 @@ static struct Symbol * FindWithNameSpace(struct __ecereNameSpace__ecere__sys__Bi int c; char nameSpace[1024]; const char * namePart; -unsigned int gotColon = 0x0; +unsigned int gotColon = 0; nameSpace[0] = '\0'; for(c = strlen(name) - 1; c >= 0; c--) if(name[c] == ':') { -gotColon = 0x1; +gotColon = 1; break; } namePart = name + c + 1; @@ -13141,7 +13174,7 @@ curContext = (((void *)0)); symbol->__anon2.__anon1.pointerExternal = MkExternalDeclaration(MkDeclaration(CopyList(function->specifiers, CopySpecifier), MkListOne(MkInitDeclarator(CopyDeclarator(function->declarator), (((void *)0)))))); curContext = tmpContext; symbol->__anon2.__anon1.pointerExternal->symbol = symbol; -DeclareType(symbol->type, 0x1, 0x1); +DeclareType(symbol->type, 1, 1); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*ast), curExternal->prev, symbol->__anon2.__anon1.pointerExternal); symbol->id = curExternal->symbol->idCode; } @@ -13165,7 +13198,7 @@ case 8: if(type->__anon1._class->__anon1.registered) { if(!type->__anon1._class->__anon1.registered->dataType) -type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0x0); +type->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type->__anon1._class->__anon1.registered->dataTypeString, 0); GetTypeSpecs(type->__anon1._class->__anon1.registered->dataType, specs); } break; @@ -13285,7 +13318,7 @@ struct Type * member; strcat(string, "struct { "); for(member = type->__anon1.__anon1.members.first; member; member = member->next) { -PrintType(member, string, 0x1, fullName); +PrintType(member, string, 1, fullName); strcat(string, "; "); } strcat(string, "}"); @@ -13347,7 +13380,7 @@ if(fullName) strcat(string, type->name); else { -char * name = __ecereNameSpace__ecere__sys__RSearchString(type->name, "::", strlen(type->name), 0x1, 0x0); +char * name = __ecereNameSpace__ecere__sys__RSearchString(type->name, "::", strlen(type->name), 1, 0); if(name) name += 2; @@ -13412,7 +13445,7 @@ struct Type * param; strcat(string, "("); for(param = type->__anon1.__anon2.params.first; param; param = param->next) { -PrintType(param, string, 0x1, fullName); +PrintType(param, string, 1, fullName); if(param->next) strcat(string, ", "); } @@ -13446,7 +13479,7 @@ if(fullName) strcat(string, s); else { -char * name = __ecereNameSpace__ecere__sys__RSearchString(s, "::", strlen(s), 0x1, 0x0); +char * name = __ecereNameSpace__ecere__sys__RSearchString(s, "::", strlen(s), 1, 0); if(name) name += 2; @@ -13471,12 +13504,12 @@ strcat(string, count); void PrintType(struct Type * type, char * string, unsigned int printName, unsigned int fullName) { -_PrintType(type, string, printName, fullName, 0x1); +_PrintType(type, string, printName, fullName, 1); } void PrintTypeNoConst(struct Type * type, char * string, unsigned int printName, unsigned int fullName) { -_PrintType(type, string, printName, fullName, 0x0); +_PrintType(type, string, printName, fullName, 0); } static struct Type * FindMember(struct Type * type, char * string) @@ -13538,7 +13571,7 @@ extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpac struct Expression * ParseExpressionString(char * expression) { -parseError = 0x0; +parseError = 0; fileInput = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile); ((int (*)(struct __ecereNameSpace__ecere__com__Instance *, const void * buffer, unsigned int size, unsigned int count))__extension__ ({ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput; @@ -13550,7 +13583,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(fileInput, 0, 0); -echoOn = 0x0; +echoOn = 0; parsedExpression = (((void *)0)); resetScanner(); expression_yyparse(); @@ -13570,7 +13603,7 @@ struct __ecereNameSpace__ecere__com__ClassProperty * classProp = (((void *)0)); if(_class && _class->type == 4) { -struct __ecereNameSpace__ecere__sys__NamedLink * value = (((void *)0)); +struct __ecereNameSpace__ecere__sys__NamedLink64 * value = (((void *)0)); struct __ecereNameSpace__ecere__com__Class * enumClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "enum"); if(enumClass) @@ -13592,11 +13625,11 @@ char constant[256]; FreeExpContents(exp); exp->type = 2; -exp->isConstant = 0x1; -if(!strcmp(baseClass->dataTypeString, "int")) -sprintf(constant, "%d", (int)value->data); +exp->isConstant = 1; +if(!strcmp(baseClass->dataTypeString, "int") || !strcmp(baseClass->dataTypeString, "int64") || !strcmp(baseClass->dataTypeString, "char") || !strcmp(baseClass->dataTypeString, "short")) +sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "%I64d" : "%lld"), value->data); else -sprintf(constant, "0x%X", (int)value->data); +sprintf(constant, ((__ecereNameSpace__ecere__com__GetRuntimePlatform() == 1) ? "0x%I64X" : "0x%llX"), value->data); exp->__anon1.__anon1.constant = __ecereNameSpace__ecere__sys__CopyString(constant); exp->expType = MkClassType(baseClass->fullName); break; @@ -13604,7 +13637,7 @@ break; } } if(value) -return 0x1; +return 1; } if((method = __ecereNameSpace__ecere__com__eClass_FindMethod(_class, id->string, privateModule))) { @@ -13614,7 +13647,7 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->refCount = 1, __ecereInstance1->kind = 16, __ecereInstance1->__anon1.__anon3.method = method, __ecereInstance1->__anon1.__anon3.methodClass = (skipIDClassCheck || (id && id->_class)) ? _class : (((void *)0)), __ecereInstance1; }); -return 0x1; +return 1; } else if((prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule))) { @@ -13623,25 +13656,25 @@ ProcessPropertyType(prop); exp->expType = prop->dataType; if(prop->dataType) prop->dataType->refCount++; -return 0x1; +return 1; } else if((member = __ecereNameSpace__ecere__com__eClass_FindDataMember(_class, id->string, privateModule, (((void *)0)), (((void *)0))))) { if(!member->dataType) -member->dataType = ProcessTypeString(member->dataTypeString, 0x0); +member->dataType = ProcessTypeString(member->dataTypeString, 0); exp->expType = member->dataType; if(member->dataType) member->dataType->refCount++; -return 0x1; +return 1; } else if((classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(_class, id->string))) { if(!classProp->dataType) -classProp->dataType = ProcessTypeString(classProp->dataTypeString, 0x0); +classProp->dataType = ProcessTypeString(classProp->dataTypeString, 0); if(classProp->constant) { FreeExpContents(exp); -exp->isConstant = 0x1; +exp->isConstant = 1; if(classProp->dataType->kind == 13 && classProp->dataType->__anon1.type->kind == 1) { exp->type = 3; @@ -13662,9 +13695,9 @@ else exp->expType = classProp->dataType; if(classProp->dataType) classProp->dataType->refCount++; -return 0x1; +return 1; } -return 0x0; +return 0; } static struct GlobalData * ScanGlobalData(struct __ecereNameSpace__ecere__com__NameSpace * nameSpace, char * name) @@ -13768,7 +13801,7 @@ else char string[1024] = ""; struct Symbol * classSym; -PrintTypeNoConst(type, string, 0x0, 0x1); +PrintTypeNoConst(type, string, 0, 1); classSym = FindClass(string); if(classSym) _class = classSym->__anon1.registered; @@ -13807,7 +13840,7 @@ sprintf(size, "%d", e->expType->size); newExp = MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), newExp), '+', MkExpCall(MkExpIdentifier(MkIdentifier("__ENDIAN_PAD")), MkListOne(MkExpConstant(size)))))); } ReplaceExpContents(checkedExp, newExp); -e->byReference = 0x1; +e->byReference = 1; } else if(!e->byReference || (_class && _class->type == 5)) { @@ -13829,7 +13862,7 @@ typeString[0] = '\0'; newExp->prev = (((void *)0)); newExp->next = (((void *)0)); newExp->expType = (((void *)0)); -PrintTypeNoConst(e->expType, typeString, 0x0, 0x1); +PrintTypeNoConst(e->expType, typeString, 0, 1); decl = SpecDeclFromString(typeString, specs, (((void *)0))); newExp->destType = ProcessType(specs, decl); curContext = context; @@ -13883,7 +13916,7 @@ struct Expression * operand = __ecereNameSpace__ecere__com__eInstance_New(__ecer *operand = *checkedExp; __ecereMethod_Expression_Clear(checkedExp); -checkedExp->destType = ProcessTypeString("void *", 0x0); +checkedExp->destType = ProcessTypeString("void *", 0); checkedExp->expType = checkedExp->destType; checkedExp->destType->refCount++; checkedExp->type = 4; @@ -13915,11 +13948,11 @@ __ecereMethod_Expression_Clear(e); e->type = 5; e->__anon1.list = MkListOne(MkExpOp((((void *)0)), '*', thisExp->type == 0 ? thisExp : MkExpBrackets(MkListOne(thisExp)))); if(thisExp->expType->kind == 8 && thisExp->expType->__anon1._class && thisExp->expType->__anon1._class->__anon1.registered && thisExp->expType->__anon1._class->__anon1.registered->type == 5) -((struct Expression *)(*e->__anon1.list).first)->byReference = 0x1; +((struct Expression *)(*e->__anon1.list).first)->byReference = 1; { e->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); CopyTypeInto(e->expType, thisExp->expType); -e->expType->byReference = 0x0; +e->expType->byReference = 0; e->expType->refCount = 1; if(e->expType->kind == 8 && e->expType->__anon1._class && e->expType->__anon1._class->__anon1.registered && (e->expType->__anon1._class->__anon1.registered->type == 2 || e->expType->__anon1._class->__anon1.registered->type == 4 || e->expType->__anon1._class->__anon1.registered->type == 3)) { @@ -13952,9 +13985,9 @@ type = destType; backupClassObjectType = type->classObjectType; backupByReference = type->byReference; type->classObjectType = 0; -type->byReference = 0x0; +type->byReference = 0; typeString[0] = '\0'; -PrintType(type, typeString, 0x0, 0x1); +PrintType(type, typeString, 0, 1); decl = SpecDeclFromString(typeString, specs, (((void *)0))); type->classObjectType = backupClassObjectType; type->byReference = backupByReference; @@ -13970,7 +14003,7 @@ e->__anon1.op.exp1 = (((void *)0)); e->__anon1.op.exp2 = MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), decl)), thisExp); e->expType = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); CopyTypeInto(e->expType, type); -e->expType->byReference = 0x0; +e->expType->byReference = 0; e->expType->refCount = 1; } else @@ -13978,7 +14011,7 @@ else e->type = 11; e->__anon1.cast.typeName = MkTypeName(specs, decl); e->__anon1.cast.exp = thisExp; -e->byReference = 0x1; +e->byReference = 1; e->expType = type; type->refCount++; } @@ -14104,9 +14137,9 @@ void __ecereMethod___ecereNameSpace__ecere__sys__OldList_Clear(struct __ecereNam void ProcessExpressionType(struct Expression * exp) { -unsigned int unresolved = 0x0; +unsigned int unresolved = 0; struct Location oldyylloc = yylloc; -unsigned int notByReference = 0x0; +unsigned int notByReference = 0; if(!exp || exp->expType) return ; @@ -14125,7 +14158,7 @@ id->classSym = id->_class->__anon1.__anon1.symbol; } if(strstr(id->string, "__ecereClass") == id->string) { -exp->expType = ProcessTypeString("ecere::com::Class", 0x1); +exp->expType = ProcessTypeString("ecere::com::Class", 1); break; } else if(id->_class && (id->classSym || (id->_class->__anon1.__anon1.name && !strcmp(id->_class->__anon1.__anon1.name, "property")))) @@ -14136,16 +14169,16 @@ if(exp->type != 0) ProcessExpressionType(exp); break; } -if(id->classSym && ResolveIdWithClass(exp, id->classSym->__anon1.registered, 0x0)) +if(id->classSym && ResolveIdWithClass(exp, id->classSym->__anon1.registered, 0)) break; } else { -struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0x0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0))); +struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0))); if(!symbol) { -if(exp->destType && CheckExpressionType(exp, exp->destType, 0x0, 0x0)) +if(exp->destType && CheckExpressionType(exp, exp->destType, 0, 0)) break; else { @@ -14160,10 +14193,10 @@ break; } else if(currentClass && !id->_class) { -if(ResolveIdWithClass(exp, currentClass, 0x1)) +if(ResolveIdWithClass(exp, currentClass, 1)) break; } -symbol = FindSymbol(id->string, topContext->parent, globalContext, 0x0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0))); +symbol = FindSymbol(id->string, topContext->parent, globalContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0))); } } if(symbol) @@ -14189,11 +14222,11 @@ exp->expType = type; if(type) type->refCount++; if(type && (type->kind == 15)) -exp->isConstant = 0x1; +exp->isConstant = 1; if(symbol->isParam || !strcmp(id->string, "this")) { if(_class && _class->type == 1 && !type->declaredWithStruct) -exp->byReference = 0x1; +exp->byReference = 1; } if(symbol->isIterator) { @@ -14256,7 +14289,7 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(fileInput, 0, 0); -echoOn = 0x0; +echoOn = 0; parsedExpression = (((void *)0)); resetScanner(); expression_yyparse(); @@ -14335,7 +14368,7 @@ id->string = __ecereNameSpace__ecere__sys__CopyString(function->name); name[0] = (char)0; if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1 && (!function->dataType || !function->dataType->dllExport)) strcpy(name, "__ecereFunction_"); -FullClassNameCat(name, id->string, 0x0); +FullClassNameCat(name, id->string, 0); if(DeclareFunction(function, name)) { (__ecereNameSpace__ecere__com__eSystem_Delete(id->string), id->string = 0); @@ -14352,7 +14385,7 @@ break; } } } -unresolved = 0x1; +unresolved = 1; break; } case 1: @@ -14377,7 +14410,7 @@ case 2: if(!exp->expType) { char * constant = exp->__anon1.__anon1.constant; -struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type->constant = 0x1, type); +struct Type * type = (type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), type->refCount = 1, type->constant = 1, type); exp->expType = type; if(constant[0] == '\'') @@ -14393,12 +14426,12 @@ ch = constant[1]; exp->__anon1.__anon1.constant = PrintUInt(ch); type->kind = 8; type->__anon1._class = FindClass("unichar"); -type->isSigned = 0x0; +type->isSigned = 0; } else { type->kind = 1; -type->isSigned = 0x1; +type->isSigned = 1; } } else @@ -14425,7 +14458,7 @@ if(strchr(constant, 'f') || strchr(constant, 'F')) type->kind = 6; else type->kind = 7; -type->isSigned = 0x1; +type->isSigned = 1; } else { @@ -14438,7 +14471,7 @@ unsigned int is64Bit = endP && (!strcmp(endP, "LL") || !strcmp(endP, "ll")); if(isSigned) { if(i64 < (((int)0x80000000))) -is64Bit = 0x1; +is64Bit = 1; } else { @@ -14446,19 +14479,19 @@ if(ui64 > (((int)0x7fffffff))) { if(ui64 > (0xffffffff)) { -is64Bit = 0x1; +is64Bit = 1; if(ui64 <= (((long long)0x7fffffffffffffffLL)) && (constant[0] != '0' || !constant[1])) -isSigned = 0x1; +isSigned = 1; } } else if(constant[0] != '0' || !constant[1]) -isSigned = 0x1; +isSigned = 1; } type->kind = is64Bit ? 4 : 3; type->isSigned = isSigned; } } -exp->isConstant = 0x1; +exp->isConstant = 1; if(exp->destType && exp->destType->kind == 7) type->kind = 7; else if(exp->destType && exp->destType->kind == 6) @@ -14470,14 +14503,14 @@ break; } case 3: { -exp->isConstant = 0x1; +exp->isConstant = 1; exp->expType = __extension__ ({ struct Type * __ecereInstance2 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); __ecereInstance2->refCount = 1, __ecereInstance2->kind = 13, __ecereInstance2->__anon1.type = __extension__ ({ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); -__ecereInstance1->refCount = 1, __ecereInstance1->kind = 1, __ecereInstance1->constant = 0x1, __ecereInstance1->isSigned = 0x1, __ecereInstance1; +__ecereInstance1->refCount = 1, __ecereInstance1->kind = 1, __ecereInstance1->constant = 1, __ecereInstance1->isSigned = 1, __ecereInstance1; }), __ecereInstance2; }); break; @@ -14490,7 +14523,7 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = ProcessType(exp->__anon1._new.typeName->qualifiers, exp->__anon1._new.typeName->declarator), __ecereInstance1; }); -DeclareType(exp->expType->__anon1.type, 0x0, 0x0); +DeclareType(exp->expType->__anon1.type, 0, 0); break; case 14: case 27: @@ -14501,15 +14534,15 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->refCount = 1, __ecereInstance1->kind = 13, __ecereInstance1->__anon1.type = ProcessType(exp->__anon1._renew.typeName->qualifiers, exp->__anon1._renew.typeName->declarator), __ecereInstance1; }); -DeclareType(exp->expType->__anon1.type, 0x0, 0x0); +DeclareType(exp->expType->__anon1.type, 0, 0); break; case 4: { -unsigned int assign = 0x0, boolResult = 0x0, boolOps = 0x0; +unsigned int assign = 0, boolResult = 0, boolOps = 0; struct Type * type1 = (((void *)0)), * type2 = (((void *)0)); -unsigned int useDestType = 0x0, useSideType = 0x0; +unsigned int useDestType = 0, useSideType = 0; struct Location oldyylloc = yylloc; -unsigned int useSideUnit = 0x0; +unsigned int useSideUnit = 0; struct __ecereNameSpace__ecere__com__Class * destClass = (exp->destType && exp->destType->kind == 8 && exp->destType->__anon1._class) ? exp->destType->__anon1._class->__anon1.registered : (((void *)0)); struct Type * dummy = (dummy = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type), dummy->count = 1, dummy->refCount = 1, dummy); @@ -14526,14 +14559,14 @@ case RIGHT_ASSIGN: case AND_ASSIGN: case XOR_ASSIGN: case OR_ASSIGN: -assign = 0x1; +assign = 1; break; case '!': break; case AND_OP: case OR_OP: -boolOps = 0x1; -boolResult = 0x1; +boolOps = 1; +boolResult = 1; break; case EQ_OP: case '<': @@ -14541,36 +14574,36 @@ case '>': case LE_OP: case GE_OP: case NE_OP: -boolResult = 0x1; -useSideType = 0x1; +boolResult = 1; +useSideType = 1; break; case '+': case '-': -useSideUnit = 0x1; -useSideType = 0x1; -useDestType = 0x1; +useSideUnit = 1; +useSideType = 1; +useDestType = 1; break; case LEFT_OP: case RIGHT_OP: -useSideType = 0x1; -useDestType = 0x1; +useSideType = 1; +useDestType = 1; break; case '|': case '^': -useSideType = 0x1; -useDestType = 0x1; +useSideType = 1; +useDestType = 1; break; case '/': case '%': -useSideType = 0x1; -useDestType = 0x1; +useSideType = 1; +useDestType = 1; break; case '&': case '*': if(exp->__anon1.op.exp1) { -useSideType = 0x1; -useDestType = 0x1; +useSideType = 1; +useDestType = 1; } break; } @@ -14579,7 +14612,7 @@ if(exp->__anon1.op.op == '&') if(!exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->type == 0 && exp->__anon1.op.exp2->__anon1.__anon1.identifier) { struct Identifier * id = exp->__anon1.op.exp2->__anon1.__anon1.identifier; -struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0x0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0))); +struct Symbol * symbol = FindSymbol(id->string, curContext, topContext, 0, id->_class && id->_class->__anon1.__anon1.name == (((void *)0))); if(symbol && symbol->isIterator == 2) { @@ -14598,13 +14631,13 @@ break; if(exp->__anon1.op.exp1) { if(exp->__anon1.op.exp2 && useSideUnit && useDestType && destClass && destClass->type == 3 && destClass->base->type != 3) -useDestType = 0x0; +useDestType = 0; if(destClass && useDestType && ((destClass->type == 3 && useSideUnit) || destClass->type == 4 || destClass->type == 2)) { if(exp->__anon1.op.exp1->destType) FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = exp->destType; -exp->__anon1.op.exp1->opDestType = 0x1; +exp->__anon1.op.exp1->opDestType = 1; if(exp->destType) exp->destType->refCount++; } @@ -14620,12 +14653,12 @@ exp->__anon1.op.exp1->destType->count++; ProcessExpressionType(exp->__anon1.op.exp1); if(exp->__anon1.op.exp1->destType && exp->__anon1.op.op != '=') exp->__anon1.op.exp1->destType->count--; -exp->__anon1.op.exp1->opDestType = 0x0; +exp->__anon1.op.exp1->opDestType = 0; if(!exp->__anon1.op.exp2 && (exp->__anon1.op.op == INC_OP || exp->__anon1.op.op == DEC_OP) && exp->__anon1.op.exp1->expType && exp->__anon1.op.exp1->expType->kind == 8 && exp->__anon1.op.exp1->expType->__anon1._class && exp->__anon1.op.exp1->expType->__anon1._class->__anon1.registered && exp->__anon1.op.exp1->expType->__anon1._class->__anon1.registered->type == 3) { exp->__anon1.op.exp2 = MkExpConstant("1"); exp->__anon1.op.op = exp->__anon1.op.op == INC_OP ? ADD_ASSIGN : SUB_ASSIGN; -assign = 0x1; +assign = 1; } if(exp->__anon1.op.exp1->destType == dummy) { @@ -14651,7 +14684,7 @@ else { exp->__anon1.op.exp2->destType = exp->destType; if(!exp->__anon1.op.exp1 || exp->__anon1.op.op != '&') -exp->__anon1.op.exp2->opDestType = 0x1; +exp->__anon1.op.exp2->opDestType = 1; if(exp->destType) exp->destType->refCount++; } @@ -14699,7 +14732,7 @@ if(exp->__anon1.op.exp2->destType) FreeType(exp->__anon1.op.exp2->destType); exp->__anon1.op.exp2->destType = exp->destType; if(exp->__anon1.op.op != '&') -exp->__anon1.op.exp2->opDestType = 0x1; +exp->__anon1.op.exp2->opDestType = 1; if(exp->destType) exp->destType->refCount++; } @@ -14733,10 +14766,10 @@ e = (*e->__anon1.list).last; } } if(e->type == 11 && e->__anon1.cast.exp) -e->__anon1.cast.exp->needCast = 0x1; +e->__anon1.cast.exp->needCast = 1; } ProcessExpressionType(exp->__anon1.op.exp2); -exp->__anon1.op.exp2->opDestType = 0x0; +exp->__anon1.op.exp2->opDestType = 0; if(exp->__anon1.op.exp2->destType && exp->__anon1.op.op != '=') exp->__anon1.op.exp2->destType->count--; if(assign && type1 && type1->kind == 13 && exp->__anon1.op.exp2->expType) @@ -14763,8 +14796,8 @@ char type2String[1024]; type1String[0] = '\0'; type2String[0] = '\0'; -PrintType(exp->__anon1.op.exp2->expType, type1String, 0x0, 0x1); -PrintType(type1, type2String, 0x0, 0x1); +PrintType(exp->__anon1.op.exp2->expType, type1String, 0, 1); +PrintType(type1, type2String, 0, 1); __ecereNameSpace__ecere__sys__ChangeCh(expString, '\n', ' '); Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expression %s (%s); expected %s\n", (((void *)0))), expString, type1String, type2String); } @@ -14779,7 +14812,7 @@ if(exp->__anon1.op.op == '-' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2->e type2 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); type2->refCount = 1; CopyTypeInto(type2, exp->__anon1.op.exp2->expType); -type2->isSigned = 0x1; +type2->isSigned = 1; } else if(exp->__anon1.op.op == '~' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2->expType && (!exp->__anon1.op.exp2->expType->isSigned || exp->__anon1.op.exp2->expType->kind != 3)) { @@ -14789,7 +14822,7 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->kind = 3, __ecereInstance1; }); type2->refCount = 1; -type2->isSigned = 0x1; +type2->isSigned = 1; } else { @@ -14806,13 +14839,13 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1; }); -exp->isConstant = 0x1; +exp->isConstant = 1; } else if(exp->__anon1.op.op == '*' && !exp->__anon1.op.exp1) { exp->expType = Dereference(type2); if(type2 && type2->kind == 8) -notByReference = 0x1; +notByReference = 1; } else if(exp->__anon1.op.op == '&' && !exp->__anon1.op.exp1) exp->expType = Reference(type2); @@ -14825,28 +14858,28 @@ if(exp->__anon1.op.exp1) if(exp->__anon1.op.exp1->destType) FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = MkClassType("bool"); -exp->__anon1.op.exp1->destType->truth = 0x1; +exp->__anon1.op.exp1->destType->truth = 1; if(!exp->__anon1.op.exp1->expType) ProcessExpressionType(exp->__anon1.op.exp1); else -CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0); FreeType(exp->__anon1.op.exp1->expType); exp->__anon1.op.exp1->expType = MkClassType("bool"); -exp->__anon1.op.exp1->expType->truth = 0x1; +exp->__anon1.op.exp1->expType->truth = 1; } if(exp->__anon1.op.exp2) { if(exp->__anon1.op.exp2->destType) FreeType(exp->__anon1.op.exp2->destType); exp->__anon1.op.exp2->destType = MkClassType("bool"); -exp->__anon1.op.exp2->destType->truth = 0x1; +exp->__anon1.op.exp2->destType->truth = 1; if(!exp->__anon1.op.exp2->expType) ProcessExpressionType(exp->__anon1.op.exp2); else -CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0); FreeType(exp->__anon1.op.exp2->expType); exp->__anon1.op.exp2->expType = MkClassType("bool"); -exp->__anon1.op.exp2->expType->truth = 0x1; +exp->__anon1.op.exp2->expType->truth = 1; } } else if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && ((useSideType) || ((!type1 || type1->kind != 8 || !strcmp(type1->__anon1._class->string, "String")) && (!type2 || type2->kind != 8 || !strcmp(type2->__anon1._class->string, "String"))))) @@ -14858,10 +14891,10 @@ if(exp->__anon1.op.op == '-' && ((type1->kind == 8 && type1->__anon1._class->__a struct Type * intType; if(!type1->__anon1._class->__anon1.registered->dataType) -type1->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type1->__anon1._class->__anon1.registered->dataTypeString, 0x0); +type1->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type1->__anon1._class->__anon1.registered->dataTypeString, 0); if(!type2->__anon1._class->__anon1.registered->dataType) -type2->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type2->__anon1._class->__anon1.registered->dataTypeString, 0x0); -intType = ProcessTypeString((type1->__anon1._class->__anon1.registered->dataType->kind == 4 || type2->__anon1._class->__anon1.registered->dataType->kind == 4) ? "int64" : "int", 0x0); +type2->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type2->__anon1._class->__anon1.registered->dataTypeString, 0); +intType = ProcessTypeString((type1->__anon1._class->__anon1.registered->dataType->kind == 4 || type2->__anon1._class->__anon1.registered->dataType->kind == 4) ? "int64" : "int", 0); if(exp->__anon1.op.exp1->destType) FreeType(exp->__anon1.op.exp1->destType); if(exp->__anon1.op.exp2->destType) @@ -14885,7 +14918,7 @@ if(!boolResult && type1->kind == 8 && (!exp->destType || exp->destType->kind != Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "operating on %s and %s with an untyped result, assuming %s\n", (((void *)0))), type1->__anon1._class->string, type2->__anon1._class->string, type1->__anon1._class->string); if(type1->kind == 13 && type1->__anon1.type->kind == 20 && type2->kind != 13) { -struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 0x1); +struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 1); if(argExp) { @@ -14901,7 +14934,7 @@ if(!exp->__anon1.op.exp2->expType) { if(type2) FreeType(type2); -type2 = exp->__anon1.op.exp2->expType = ProcessTypeString("int", 0x0); +type2 = exp->__anon1.op.exp2->expType = ProcessTypeString("int", 0); type2->refCount++; } ProcessExpressionType(exp->__anon1.op.exp2); @@ -14930,7 +14963,7 @@ Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "different l } else { -unsigned int success = 0x0; +unsigned int success = 0; if(type1->kind == 13 && type2->kind == 13) { @@ -14938,17 +14971,17 @@ if(exp->__anon1.op.op == '+') Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "cannot add two pointers\n", (((void *)0)))); else if(exp->__anon1.op.op == '-') { -if(MatchTypes(type1->__anon1.type, type2->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 0x0, 0x0, 0x0, 0x0, 0x0)) +if(MatchTypes(type1->__anon1.type, type2->__anon1.type, (((void *)0)), (((void *)0)), (((void *)0)), 0, 0, 0, 0, 0)) { exp->expType = __extension__ ({ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); __ecereInstance1->kind = 3, __ecereInstance1->refCount = 1, __ecereInstance1; }); -success = 0x1; +success = 1; if(type1->__anon1.type->kind == 20) { -struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 0x1); +struct Expression * argExp = GetTemplateArgExp(type1->__anon1.type->__anon1.templateParameter, thisClass, 1); if(argExp) { @@ -14967,44 +15000,44 @@ return ; } if(!success && exp->__anon1.op.exp1->type == 2) { -if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp1->destType; if(exp->__anon1.op.exp1->destType) exp->__anon1.op.exp1->destType->refCount++; -success = 0x1; +success = 1; } -else if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0)) +else if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp2->destType; if(exp->__anon1.op.exp2->destType) exp->__anon1.op.exp2->destType->refCount++; -success = 0x1; +success = 1; } } else if(!success) { -if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp2->destType; if(exp->__anon1.op.exp2->destType) exp->__anon1.op.exp2->destType->refCount++; -success = 0x1; +success = 1; } -else if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0)) +else if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp1->destType; if(exp->__anon1.op.exp1->destType) exp->__anon1.op.exp1->destType->refCount++; -success = 0x1; +success = 1; } } if(!success) @@ -15024,8 +15057,8 @@ PrintExpression(exp->__anon1.op.exp1, expString1); __ecereNameSpace__ecere__sys__ChangeCh(expString1, '\n', ' '); PrintExpression(exp->__anon1.op.exp2, expString2); __ecereNameSpace__ecere__sys__ChangeCh(expString2, '\n', ' '); -PrintType(exp->__anon1.op.exp1->expType, type1, 0x0, 0x1); -PrintType(exp->__anon1.op.exp2->expType, type2, 0x0, 0x1); +PrintType(exp->__anon1.op.exp1->expType, type1, 0, 1); +PrintType(exp->__anon1.op.exp2->expType, type2, 0, 1); } Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expressions %s (%s) and %s (%s)\n", (((void *)0))), expString1, type1, expString2, type2); } @@ -15038,7 +15071,7 @@ FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType; if(type2->__anon1._class->__anon1.registered->dataType) type2->__anon1._class->__anon1.registered->dataType->refCount++; -CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0); exp->expType = type2; if(type2) type2->refCount++; @@ -15050,24 +15083,24 @@ FreeType(exp->__anon1.op.exp2->destType); exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType; if(type1->__anon1._class->__anon1.registered->dataType) type1->__anon1._class->__anon1.registered->dataType->refCount++; -CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0); exp->expType = type1; if(type1) type1->refCount++; } else if(type1) { -unsigned int valid = 0x0; +unsigned int valid = 0; if(!boolResult && useSideUnit && type1 && type1->kind == 8 && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 3 && type2 && type2->kind != 8) { if(exp->__anon1.op.exp2->destType) FreeType(exp->__anon1.op.exp2->destType); if(!type1->__anon1._class->__anon1.registered->dataType) -type1->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type1->__anon1._class->__anon1.registered->dataTypeString, 0x0); +type1->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type1->__anon1._class->__anon1.registered->dataTypeString, 0); exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType; exp->__anon1.op.exp2->destType->refCount++; -CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0); if(type2) FreeType(type2); type2 = exp->__anon1.op.exp2->destType; @@ -15081,10 +15114,10 @@ if(!boolResult && useSideUnit && type2 && type2->kind == 8 && type2->__anon1._cl if(exp->__anon1.op.exp1->destType) FreeType(exp->__anon1.op.exp1->destType); if(!type2->__anon1._class->__anon1.registered->dataType) -type2->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type2->__anon1._class->__anon1.registered->dataTypeString, 0x0); +type2->__anon1._class->__anon1.registered->dataType = ProcessTypeString(type2->__anon1._class->__anon1.registered->dataTypeString, 0); exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType; exp->__anon1.op.exp1->destType->refCount++; -CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0); type1 = exp->__anon1.op.exp1->destType; exp->expType = type1; type1->refCount++; @@ -15098,26 +15131,26 @@ if(exp->__anon1.op.op == '*' || exp->__anon1.op.op == '/' || exp->__anon1.op.op { if(op1IsEnum && exp->__anon1.op.exp2->expType) { -if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp2->expType; if(exp->__anon1.op.exp2->expType) exp->__anon1.op.exp2->expType->refCount++; -valid = 0x1; +valid = 1; } } else if(op2IsEnum && exp->__anon1.op.exp1->expType) { -if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp1->expType; if(exp->__anon1.op.exp1->expType) exp->__anon1.op.exp1->expType->refCount++; -valid = 0x1; +valid = 1; } } } @@ -15125,26 +15158,26 @@ else { if(op1IsEnum && exp->__anon1.op.exp2->expType) { -if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp2->expType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp1->expType; if(exp->__anon1.op.exp1->expType) exp->__anon1.op.exp1->expType->refCount++; -valid = 0x1; +valid = 1; } } else if(op2IsEnum && exp->__anon1.op.exp1->expType) { -if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp1->expType, 0, 0)) { if(exp->expType) FreeType(exp->expType); exp->expType = exp->__anon1.op.exp2->expType; if(exp->__anon1.op.exp2->expType) exp->__anon1.op.exp2->expType->refCount++; -valid = 0x1; +valid = 1; } } } @@ -15157,7 +15190,7 @@ if(exp->__anon1.op.exp1->destType) FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = type2; type2->refCount++; -if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); @@ -15172,7 +15205,7 @@ if(exp->__anon1.op.exp2->destType) FreeType(exp->__anon1.op.exp2->destType); exp->__anon1.op.exp2->destType = type1; type1->refCount++; -if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); @@ -15197,8 +15230,8 @@ PrintExpression(exp->__anon1.op.exp1, expString1); __ecereNameSpace__ecere__sys__ChangeCh(expString1, '\n', ' '); PrintExpression(exp->__anon1.op.exp2, expString2); __ecereNameSpace__ecere__sys__ChangeCh(expString2, '\n', ' '); -PrintType(exp->__anon1.op.exp1->expType, type1String, 0x0, 0x1); -PrintType(exp->__anon1.op.exp2->expType, type2String, 0x0, 0x1); +PrintType(exp->__anon1.op.exp1->expType, type1String, 0, 1); +PrintType(exp->__anon1.op.exp2->expType, type2String, 0, 1); } Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "incompatible expressions %s (%s) and %s (%s)\n", (((void *)0))), expString1, type1String, expString2, type2String); if(type1->kind == 8 && type1->__anon1._class && type1->__anon1._class->__anon1.registered && type1->__anon1._class->__anon1.registered->type == 4) @@ -15224,7 +15257,7 @@ if(type2->kind == 8 && type2->__anon1._class && type2->__anon1._class->__anon1.r struct Type * oldType = exp->__anon1.op.exp1->expType; exp->__anon1.op.exp1->expType = (((void *)0)); -if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0)) FreeType(oldType); else exp->__anon1.op.exp1->expType = oldType; @@ -15233,7 +15266,7 @@ if(exp->__anon1.op.exp1->destType) FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = type2; type2->refCount++; -if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0)) +if(CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0)) { if(exp->expType) FreeType(exp->expType); @@ -15252,12 +15285,12 @@ FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = type2->__anon1._class->__anon1.registered->dataType; if(type2->__anon1._class->__anon1.registered->dataType) type2->__anon1._class->__anon1.registered->dataType->refCount++; -CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp1, exp->__anon1.op.exp1->destType, 0, 0); } if(exp->__anon1.op.op == '!') { exp->expType = MkClassType("bool"); -exp->expType->truth = 0x1; +exp->expType->truth = 1; } else { @@ -15275,7 +15308,7 @@ FreeType(exp->__anon1.op.exp2->destType); exp->__anon1.op.exp2->destType = type1->__anon1._class->__anon1.registered->dataType; if(type1->__anon1._class->__anon1.registered->dataType) type1->__anon1._class->__anon1.registered->dataType->refCount++; -CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0x0, 0x0); +CheckExpressionType(exp->__anon1.op.exp2, exp->__anon1.op.exp2->destType, 0, 0); } exp->expType = type1; if(type1) @@ -15313,13 +15346,13 @@ if(boolResult) { FreeType(exp->expType); exp->expType = MkClassType("bool"); -exp->expType->truth = 0x1; +exp->expType->truth = 1; } if(exp->__anon1.op.op != SIZEOF) exp->isConstant = (!exp->__anon1.op.exp1 || exp->__anon1.op.exp1->isConstant) && (!exp->__anon1.op.exp2 || exp->__anon1.op.exp2->isConstant); if(exp->__anon1.op.op == SIZEOF && exp->__anon1.op.exp2->expType) { -DeclareType(exp->__anon1.op.exp2->expType, 0x0, 0x0); +DeclareType(exp->__anon1.op.exp2->expType, 0, 0); } if(exp->__anon1.op.op == DELETE && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->expType && __ecereProp_Type_Get_specConst(exp->__anon1.op.exp2->expType)) Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "deleting const qualified object\n", (((void *)0)))); @@ -15334,10 +15367,10 @@ case 32: { struct Expression * e; -exp->isConstant = 0x1; +exp->isConstant = 1; for(e = (*exp->__anon1.list).first; e; e = e->next) { -unsigned int inced = 0x0; +unsigned int inced = 0; if(!e->next) { @@ -15348,7 +15381,7 @@ if(e->destType) { exp->destType->refCount++; e->destType->count++; -inced = 0x1; +inced = 1; } } ProcessExpressionType(e); @@ -15361,7 +15394,7 @@ if(e->expType) e->expType->refCount++; } if(!e->isConstant) -exp->isConstant = 0x0; +exp->isConstant = 0; } e = (*exp->__anon1.list).first; if(!e->next && e->type == 8) @@ -15383,10 +15416,10 @@ case 6: { struct Expression * e; -exp->isConstant = 0x1; +exp->isConstant = 1; ProcessExpressionType(exp->__anon1.index.exp); if(!exp->__anon1.index.exp->isConstant) -exp->isConstant = 0x0; +exp->isConstant = 0; if(exp->__anon1.index.exp->expType) { struct Type * source = exp->__anon1.index.exp->expType; @@ -15398,20 +15431,20 @@ struct __ecereNameSpace__ecere__com__Class * c = _class->templateClass ? _class- if(_class != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(c, containerClass) && _class->templateArgs) { -exp->expType = ProcessTypeString(_class->templateArgs[2].__anon1.__anon1.dataTypeString, 0x0); +exp->expType = ProcessTypeString(_class->templateArgs[2].__anon1.__anon1.dataTypeString, 0); if(exp->__anon1.index.index && (*exp->__anon1.index.index).last) { -struct Type * type = ProcessTypeString(_class->templateArgs[1].__anon1.__anon1.dataTypeString, 0x0); +struct Type * type = ProcessTypeString(_class->templateArgs[1].__anon1.__anon1.dataTypeString, 0); if(type->kind == 8) -type->constant = 0x1; +type->constant = 1; else if(type->kind == 13) { struct Type * t = type; while(t->kind == 13) t = t->__anon1.type; -t->constant = 0x1; +t->constant = 1; } ((struct Expression *)(*exp->__anon1.index.index).last)->destType = type; } @@ -15431,12 +15464,12 @@ if(!e->next) { } if(!e->isConstant) -exp->isConstant = 0x0; +exp->isConstant = 0; } if(!exp->expType) exp->expType = Dereference(exp->__anon1.index.exp->expType); if(exp->expType) -DeclareType(exp->expType, 0x0, 0x0); +DeclareType(exp->expType, 0, 0); break; } case 7: @@ -15462,14 +15495,14 @@ struct Identifier * id = idExp->__anon1.__anon1.identifier; if(!strcmp(id->string, "__builtin_frame_address")) { -exp->expType = ProcessTypeString("void *", 0x1); +exp->expType = ProcessTypeString("void *", 1); if(exp->__anon1.call.arguments && (*exp->__anon1.call.arguments).first) ProcessExpressionType((*exp->__anon1.call.arguments).first); break; } else if(!strcmp(id->string, "__ENDIAN_PAD")) { -exp->expType = ProcessTypeString("int", 0x1); +exp->expType = ProcessTypeString("int", 1); if(exp->__anon1.call.arguments && (*exp->__anon1.call.arguments).first) ProcessExpressionType((*exp->__anon1.call.arguments).first); break; @@ -15560,7 +15593,7 @@ a->expType->refCount++; else if(!strcmp(id->string, "Sgn")) { ListAdd(exp->__anon1.list, MkExpCondition(MkExpBrackets(MkListOne(MkExpOp((((void *)0)), '!', CopyExpression(tempExp1)))), MkListOne(MkExpConstant("0")), MkExpBrackets(MkListOne(MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))), MkListOne(MkExpConstant("-1")), MkExpConstant("1")))))); -exp->expType = ProcessTypeString("int", 0x0); +exp->expType = ProcessTypeString("int", 0); } FreeExpression(tempExp1); if(tempExp2) @@ -15600,7 +15633,7 @@ typeString[0] = '\0'; struct Symbol * back = functionType->__anon1.__anon2.thisClass; functionType->__anon1.__anon2.thisClass = (((void *)0)); -PrintType(functionType, typeString, 0x1, 0x1); +PrintType(functionType, typeString, 1, 1); functionType->__anon1.__anon2.thisClass = back; } if(strstr(typeString, "thisclass")) @@ -15613,7 +15646,7 @@ struct Context * context = SetupTemplatesContext(exp->__anon1.call.exp->expType- decl = SpecDeclFromString(typeString, specs, (((void *)0))); if(thisClass != (exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass->templateClass ? exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass->templateClass : exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass)) -thisClassParams = 0x0; +thisClassParams = 0; ReplaceThisClassSpecifiers(specs, exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass); { struct __ecereNameSpace__ecere__com__Class * backupThisClass = thisClass; @@ -15622,7 +15655,7 @@ thisClass = exp->__anon1.call.exp->expType->__anon1.__anon3.usedClass; ProcessDeclarator(decl); thisClass = backupThisClass; } -thisClassParams = 0x1; +thisClassParams = 1; functionType = ProcessType(specs, decl); functionType->refCount = 0; FinishTemplatesContext(context); @@ -15649,7 +15682,7 @@ Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "called object } else if(functionType) { -unsigned int emptyParams = 0x0, noParams = 0x0; +unsigned int emptyParams = 0, noParams = 0; struct Expression * e = exp->__anon1.call.arguments ? (*exp->__anon1.call.arguments).first : (((void *)0)); struct Type * type = functionType->__anon1.__anon2.params.first; struct Expression * memberExp = (exp->__anon1.call.exp->type == 8) ? exp->__anon1.call.exp : (((void *)0)); @@ -15657,7 +15690,7 @@ int extra = 0; struct Location oldyylloc = yylloc; if(!type) -emptyParams = 0x1; +emptyParams = 1; if(functionType->extraParam && e && functionType->__anon1.__anon2.thisClass) { e->destType = MkClassType(functionType->__anon1.__anon2.thisClass->string); @@ -15696,7 +15729,7 @@ type->refCount = 0; } if(type && type->kind == 0) { -noParams = 0x1; +noParams = 1; if(!type->refCount) FreeType(type); type = (((void *)0)); @@ -15756,11 +15789,11 @@ struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = _class->templat { struct Context * context = SetupTemplatesContext(_class); -templatedType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0); +templatedType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0); FinishTemplatesContext(context); } if(templatedType->kind == 8 && constant) -templatedType->constant = 0x1; +templatedType->constant = 1; else if(templatedType->kind == 13) { struct Type * t = templatedType->__anon1.type; @@ -15773,7 +15806,7 @@ t->constant = constant; e->destType = templatedType; if(templatedType) { -templatedType->passAsTemplate = 0x1; +templatedType->passAsTemplate = 1; } } else @@ -15847,11 +15880,11 @@ Compiler_Warning(__ecereNameSpace__ecere__GetTranslatedString("ec", "%s undefine symbol = __extension__ ({ struct Symbol * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Symbol); -__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->type = ProcessTypeString("int()", 0x1), __ecereInstance1; +__ecereInstance1->string = __ecereNameSpace__ecere__sys__CopyString(string), __ecereInstance1->type = ProcessTypeString("int()", 1), __ecereInstance1; }); __ecereMethod___ecereNameSpace__ecere__sys__BinaryTree_Add(&globalContext->symbols, (struct __ecereNameSpace__ecere__sys__BTNode *)symbol); if(strstr(symbol->string, "::")) -globalContext->hasNameSpace = 0x1; +globalContext->hasNameSpace = 1; yylloc = oldyylloc; } } @@ -15909,7 +15942,7 @@ exp->__anon1.member.member->classSym = exp->__anon1.member.member->_class->__ano ProcessExpressionType(exp->__anon1.member.exp); if(exp->__anon1.member.exp->expType && exp->__anon1.member.exp->expType->kind == 8 && exp->__anon1.member.exp->expType->__anon1._class && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered && exp->__anon1.member.exp->expType->__anon1._class->__anon1.registered->type == 0) { -exp->isConstant = 0x0; +exp->isConstant = 0; } else exp->isConstant = exp->__anon1.member.exp->isConstant; @@ -16068,7 +16101,7 @@ templateString[len++] = '\0'; struct Context * context = SetupTemplatesContext(_class); FreeType(exp->expType); -exp->expType = ProcessTypeString(templateString, 0x0); +exp->expType = ProcessTypeString(templateString, 0); FinishTemplatesContext(context); } } @@ -16112,15 +16145,15 @@ else if(type->kind == 13) { _class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr"); FreeType(exp->expType); -exp->expType = ProcessTypeString("uintptr", 0x0); -exp->byReference = 0x1; +exp->expType = ProcessTypeString("uintptr", 0); +exp->byReference = 1; } else { char string[1024] = ""; struct Symbol * classSym; -PrintTypeNoConst(type, string, 0x0, 0x1); +PrintTypeNoConst(type, string, 0, 1); classSym = FindClass(string); if(classSym) _class = classSym->__anon1.registered; @@ -16153,11 +16186,11 @@ member = (((void *)0)); if(!member && !prop) prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, id->string, privateModule); if((member && member->_class == (_class->templateClass ? _class->templateClass : _class)) || (prop && prop->_class == (_class->templateClass ? _class->templateClass : _class))) -exp->__anon1.member.thisPtr = 0x1; +exp->__anon1.member.thisPtr = 1; } else { -unsigned int useMemberForNonConst = 0x0; +unsigned int useMemberForNonConst = 0; if(!id->classSym) { @@ -16196,7 +16229,7 @@ classProp = __ecereNameSpace__ecere__com__eClass_FindClassProperty(type->__anon1 if(classProp) { exp->__anon1.member.memberType = 5; -exp->expType = ProcessTypeString(classProp->dataTypeString, 0x0); +exp->expType = ProcessTypeString(classProp->dataTypeString, 0); } else { @@ -16206,9 +16239,9 @@ struct Expression * classExp = exp->__anon1.member.exp; type->refCount++; FreeType(classExp->expType); -classExp->expType = ProcessTypeString("ecere::com::Class", 0x0); +classExp->expType = ProcessTypeString("ecere::com::Class", 0); strcpy(structName, "__ecereClassData_"); -FullClassNameCat(structName, type->__anon1._class->string, 0x0); +FullClassNameCat(structName, type->__anon1._class->string, 0); exp->type = 9; exp->__anon1.member.member = id; exp->__anon1.member.exp = MkExpBrackets(MkListOne(MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(structName), (((void *)0)))), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))), MkExpMember(classExp, MkIdentifier("data"))), '+', MkExpMember(MkExpClass(MkListOne(MkSpecifierName(type->__anon1._class->string)), (((void *)0))), MkIdentifier("offsetClass")))))))); @@ -16252,7 +16285,7 @@ struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Ty CopyTypeInto(type, exp->expType); type->refCount = 1; -type->constant = 0x1; +type->constant = 1; exp->expType = type; } else if(prop->dataType) @@ -16269,12 +16302,12 @@ ProcessExpressionType(exp); return ; } exp->__anon1.member.memberType = 3; -DeclareStruct(_class->fullName, 0x0); +DeclareStruct(_class->fullName, 0); if(!member->dataType) { struct Context * context = SetupTemplatesContext(_class); -member->dataType = ProcessTypeString(member->dataTypeString, 0x0); +member->dataType = ProcessTypeString(member->dataTypeString, 0); FinishTemplatesContext(context); } exp->expType = member->dataType; @@ -16355,9 +16388,9 @@ struct Context * context = SetupTemplatesContext(tClass); unsigned int constant = exp->expType->constant; FreeType(exp->expType); -exp->expType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0); +exp->expType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0); if(exp->expType->kind == 8 && constant) -exp->expType->constant = 0x1; +exp->expType->constant = 1; else if(exp->expType->kind == 13) { struct Type * t = exp->expType->__anon1.type; @@ -16375,12 +16408,12 @@ FreeType(exp->expType); exp->expType = ReplaceThisClassType(_class); } if(tClass->templateClass && (exp->expType->kind != 20 || (!exp->expType->__anon1.templateParameter || (!exp->expType->__anon1.templateParameter->dataTypeString && !exp->expType->__anon1.templateParameter->__anon1.dataType)))) -exp->expType->passAsTemplate = 0x1; +exp->expType->passAsTemplate = 1; if(!exp->destType) { -exp->destType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0); +exp->destType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0); if(exp->destType->kind == 8 && constant) -exp->destType->constant = 0x1; +exp->destType->constant = 1; else if(exp->destType->kind == 13) { struct Type * t = exp->destType->__anon1.type; @@ -16430,7 +16463,7 @@ struct __ecereNameSpace__ecere__com__ClassTemplateArgument arg = tClass->templat struct Context * context = SetupTemplatesContext(tClass); struct Type * basicType; -basicType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0x0); +basicType = ProcessTypeString(arg.__anon1.__anon1.dataTypeString, 0); if(basicType) { if(basicType->kind == 21) @@ -16581,7 +16614,7 @@ FreeType(exp->expType); { struct Context * context = SetupTemplatesContext(tClass); -exp->expType = ProcessTypeString(templateString, 0x0); +exp->expType = ProcessTypeString(templateString, 0); FinishTemplatesContext(context); } } @@ -16659,10 +16692,10 @@ if(classSym->__anon1.registered->type == 5) char name[1024]; name[0] = '\0'; -DeclareStruct(classSym->string, 0x0); +DeclareStruct(classSym->string, 0); FreeSpecifier(exp->__anon1._class); exp->type = 10; -FullClassNameCat(name, classSym->string, 0x0); +FullClassNameCat(name, classSym->string, 0); exp->__anon1.typeName = MkTypeName(MkListOne(MkStructOrUnion(3, MkIdentifier(name), (((void *)0)))), (((void *)0))); } else @@ -16678,7 +16711,7 @@ else char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); FreeExpContents(exp); exp->type = 9; @@ -16703,8 +16736,8 @@ struct Type * __ecereInstance1 = __ecereNameSpace__ecere__com__eInstance_New(__e __ecereInstance1->refCount = 1, __ecereInstance1->kind = 23, __ecereInstance1; }); -exp->isConstant = 0x1; -DeclareType(type, 0x0, 0x0); +exp->isConstant = 1; +DeclareType(type, 0, 0); FreeType(type); break; } @@ -16716,9 +16749,9 @@ type->count = 1; FreeType(exp->__anon1.cast.exp->destType); exp->__anon1.cast.exp->destType = type; type->refCount++; -type->casted = 0x1; +type->casted = 1; ProcessExpressionType(exp->__anon1.cast.exp); -type->casted = 0x0; +type->casted = 0; type->count = 0; exp->expType = type; if(!exp->__anon1.cast.exp->needCast && !NeedCast(exp->__anon1.cast.exp->expType, type)) @@ -16766,13 +16799,13 @@ case 12: { struct Expression * e; -exp->isConstant = 0x1; +exp->isConstant = 1; FreeType(exp->__anon1.cond.cond->destType); exp->__anon1.cond.cond->destType = MkClassType("bool"); -exp->__anon1.cond.cond->destType->truth = 0x1; +exp->__anon1.cond.cond->destType->truth = 1; ProcessExpressionType(exp->__anon1.cond.cond); if(!exp->__anon1.cond.cond->isConstant) -exp->isConstant = 0x0; +exp->isConstant = 0; for(e = (*exp->__anon1.cond.exp).first; e; e = e->next) { if(!e->next) @@ -16790,7 +16823,7 @@ if(e->expType) e->expType->refCount++; } if(!e->isConstant) -exp->isConstant = 0x0; +exp->isConstant = 0; } FreeType(exp->__anon1.cond.elseExp->destType); exp->__anon1.cond.elseExp->destType = exp->destType ? exp->destType : exp->expType; @@ -16798,7 +16831,7 @@ if(exp->__anon1.cond.elseExp->destType) exp->__anon1.cond.elseExp->destType->refCount++; ProcessExpressionType(exp->__anon1.cond.elseExp); if(!exp->__anon1.cond.elseExp->isConstant) -exp->isConstant = 0x0; +exp->isConstant = 0; break; } case 23: @@ -16828,12 +16861,12 @@ if(spec && spec->type == 1) { exp->expType = MkClassType(spec->__anon1.__anon1.name); exp->expType->kind = 19; -exp->byReference = 0x1; +exp->byReference = 1; } else { exp->expType = MkClassType("ecere::com::Class"); -exp->byReference = 0x1; +exp->byReference = 1; } break; } @@ -16848,10 +16881,10 @@ char structName[1024]; struct Expression * classExp; strcpy(structName, "__ecereClassData_"); -FullClassNameCat(structName, _class->fullName, 0x0); +FullClassNameCat(structName, _class->fullName, 0); exp->type = 9; exp->__anon1.member.member = id; -if(curCompound && FindSymbol("this", curContext, curCompound->__anon1.compound.context, 0x0, 0x0)) +if(curCompound && FindSymbol("this", curContext, curCompound->__anon1.compound.context, 0, 0)) classExp = MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class")); else classExp = MkExpIdentifier(MkIdentifier("class")); @@ -16889,7 +16922,7 @@ type->refCount++; } else { -if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1)) +if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1)) { FreeType(type); type = e->expType; @@ -16898,7 +16931,7 @@ e = (*exp->__anon1.list).first; ProcessExpressionType(e); if(e->expType) { -if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1)) +if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1)) { FreeType(e->expType); e->expType = (((void *)0)); @@ -16919,7 +16952,7 @@ e->expType = (((void *)0)); if(type) { typeStringBuf[0] = '\0'; -PrintTypeNoConst(type, typeStringBuf, 0x0, 0x1); +PrintTypeNoConst(type, typeStringBuf, 0, 1); typeString = typeStringBuf; FreeType(type); type = (((void *)0)); @@ -16939,7 +16972,7 @@ if(exp->__anon1.list) { struct Expression * e; -type = ProcessTypeString(typeString, 0x0); +type = ProcessTypeString(typeString, 0); while((e = (*exp->__anon1.list).first)) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*exp->__anon1.list), e); @@ -16951,7 +16984,7 @@ ListAdd(initializers, MkInitializerAssignment(e)); FreeType(type); (__ecereNameSpace__ecere__com__eSystem_Delete(exp->__anon1.list), exp->__anon1.list = 0); } -DeclareStruct("ecere::com::BuiltInContainer", 0x0); +DeclareStruct("ecere::com::BuiltInContainer", 0); ListAdd(structInitializers, MkInitializerAssignment(MkExpMember(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))), MkIdentifier("_vTbl")))); ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp); ListAdd(structInitializers, MkInitializerAssignment(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))))); @@ -16968,14 +17001,14 @@ __ecereInstance1->type = 2, __ecereInstance1->__anon1.__anon1.constant = __ecere ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp); ListAdd(structInitializers, MkInitializerAssignment(MkExpClass(CopyList(specs, CopySpecifier), CopyDeclarator(decl)))); ProcessExpressionType(((struct Initializer *)(*structInitializers).last)->__anon1.exp); -exp->expType = ProcessTypeString(templateString, 0x0); +exp->expType = ProcessTypeString(templateString, 0); exp->type = 5; exp->__anon1.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(templateString)), (((void *)0))), MkExpOp((((void *)0)), '&', expExt = MkExpExtensionInitializer(MkTypeName(MkListOne(MkSpecifierName("BuiltInContainer")), (((void *)0))), MkInitializerList(structInitializers))))); ProcessExpressionType(expExt); } else { -exp->expType = ProcessTypeString("Container", 0x0); +exp->expType = ProcessTypeString("Container", 0); Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Couldn't determine type of array elements\n", (((void *)0)))); } break; @@ -16988,7 +17021,7 @@ exp->expType = ReplaceThisClassType(thisClass); } if(exp->expType && (exp->expType->kind == 9 || exp->expType->kind == 10 || exp->expType->kind == 15) && !exp->expType->__anon1.__anon1.members.first && exp->expType->__anon1.__anon1.enumName) { -struct Symbol * symbol = FindSymbol(exp->expType->__anon1.__anon1.enumName, curContext, globalContext, 0x1, 0x0); +struct Symbol * symbol = FindSymbol(exp->expType->__anon1.__anon1.enumName, curContext, globalContext, 1, 0); if(symbol) { @@ -17008,11 +17041,11 @@ member->refCount++; } else { -struct __ecereNameSpace__ecere__sys__NamedLink * member; +struct __ecereNameSpace__ecere__sys__NamedLink64 * member; for(member = symbol->type->__anon1.__anon1.members.first; member; member = member->next) { -struct __ecereNameSpace__ecere__sys__NamedLink * value = (value = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink), value->name = __ecereNameSpace__ecere__sys__CopyString(member->name), value); +struct __ecereNameSpace__ecere__sys__NamedLink64 * value = (value = __ecereNameSpace__ecere__com__eSystem_New0(structSize_NamedLink64), value->name = __ecereNameSpace__ecere__sys__CopyString(member->name), value); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&exp->expType->__anon1.__anon1.members, value); } @@ -17028,7 +17061,7 @@ if(!exp->needTemplateCast && exp->expType && (exp->expType->kind == 20 || exp->e exp->needTemplateCast = 1; if(exp->destType->kind == 0) ; -else if(!CheckExpressionType(exp, exp->destType, 0x0, !exp->destType->casted)) +else if(!CheckExpressionType(exp, exp->destType, 0, !exp->destType->casted)) { if(!exp->destType->count || unresolved) { @@ -17045,7 +17078,7 @@ if(inCompiler) char expString[10240]; expString[0] = '\0'; -PrintType(exp->destType, type2, 0x0, 0x1); +PrintType(exp->destType, type2, 0, 1); if(inCompiler) { PrintExpression(exp, expString); @@ -17082,8 +17115,8 @@ type1[0] = '\0'; type2[0] = '\0'; if(inCompiler) { -PrintType(exp->expType, type1, 0x0, 0x1); -PrintType(exp->destType, type2, 0x0, 0x1); +PrintType(exp->expType, type1, 0, 1); +PrintType(exp->destType, type2, 0, 1); } if(exp->destType->truth && exp->destType->__anon1._class && exp->destType->__anon1._class->__anon1.registered && !strcmp(exp->destType->__anon1._class->__anon1.registered->name, "bool") && exp->expType->kind != 0 && exp->expType->kind != 9 && exp->expType->kind != 10 && (exp->expType->kind != 8 || exp->expType->classObjectType || (exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type != 1))) ; @@ -17130,7 +17163,7 @@ if(inCompiler) ApplyAnyObjectLogic(exp); if(!notByReference && exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 5 && (!exp->destType || (exp->destType->kind != 3 && exp->destType->kind != 4 && exp->destType->kind != 22 && exp->destType->kind != 23 && exp->destType->kind != 5 && exp->destType->kind != 2 && exp->destType->kind != 1 && exp->destType->kind != 24))) { -exp->byReference = 0x1; +exp->byReference = 1; } yylloc = oldyylloc; } @@ -17261,7 +17294,7 @@ FindNextDataMember(type->__anon1._class->__anon1.registered, &curClass, &curMemb if(curMember) { if(!curMember->dataType) -curMember->dataType = ProcessTypeString(curMember->dataTypeString, 0x0); +curMember->dataType = ProcessTypeString(curMember->dataTypeString, 0); initializerType = curMember->dataType; } } @@ -17269,7 +17302,7 @@ ProcessInitializer(i, initializerType); if(initializerType && type && (type->kind == 9 || type->kind == 10)) initializerType = initializerType->next; if(!i->isConstant) -init->isConstant = 0x0; +init->isConstant = 0; } if(type && type->kind == 12) FreeType(initializerType); @@ -17309,9 +17342,9 @@ case 1: struct Symbol * symbol = FindType(curContext, spec->__anon1.__anon1.name); if(symbol) -DeclareType(symbol->type, 0x1, 0x1); +DeclareType(symbol->type, 1, 1); else if((symbol = spec->__anon1.__anon1.symbol) && symbol->__anon1.registered && symbol->__anon1.registered->type == 1 && declareStruct) -DeclareStruct(spec->__anon1.__anon1.name, 0x0); +DeclareStruct(spec->__anon1.__anon1.name, 0); break; } case 2: @@ -17417,7 +17450,7 @@ if(thisClass) spec->type = 1; spec->__anon1.__anon1.name = ReplaceThisClass(thisClass); spec->__anon1.__anon1.symbol = FindClass(spec->__anon1.__anon1.name); -ProcessSpecifier(spec, 0x0); +ProcessSpecifier(spec, 0); } } } @@ -17441,7 +17474,7 @@ switch(decl->type) { case 1: { -unsigned int declareStruct = 0x0; +unsigned int declareStruct = 0; if(decl->__anon1.__anon1.declarators) { @@ -17477,7 +17510,7 @@ for(subType = type; subType; ) { if(subType->kind == 8) { -declareStruct = 0x1; +declareStruct = 1; break; } else if(subType->kind == 13) @@ -17512,7 +17545,7 @@ case 0: { struct Specifier * spec; struct Declarator * d; -unsigned int declareStruct = 0x0; +unsigned int declareStruct = 0; if(decl->__anon1.__anon1.declarators) { @@ -17526,7 +17559,7 @@ for(subType = type; subType; ) { if(subType->kind == 8) { -declareStruct = 0x1; +declareStruct = 1; break; } else if(subType->kind == 13) @@ -17559,13 +17592,13 @@ struct __ecereNameSpace__ecere__sys__OldList * args; DeclareProperty(prop, setName, getName); strcpy(propName, "__ecereProp_"); -FullClassNameCat(propName, prop->_class->fullName, 0x0); +FullClassNameCat(propName, prop->_class->fullName, 0); strcat(propName, "_"); -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); strcpy(propNameM, "__ecerePropM_"); -FullClassNameCat(propNameM, prop->_class->fullName, 0x0); +FullClassNameCat(propNameM, prop->_class->fullName, 0); strcat(propNameM, "_"); -FullClassNameCat(propNameM, prop->name, 0x1); +FullClassNameCat(propNameM, prop->name, 1); if(prop->isWatchable) { args = MkList(); @@ -17588,7 +17621,7 @@ ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM))); ListAdd(stmt->__anon1.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args)); } if(curFunction->propSet && !strcmp(curFunction->propSet->string, prop->name) && (!object || (object->type == 0 && !strcmp(object->__anon1.__anon1.identifier->string, "this")))) -curFunction->propSet->fireWatchersDone = 0x1; +curFunction->propSet->fireWatchersDone = 1; } extern struct Declaration * MkDeclarationInst(struct Instantiation * inst); @@ -17672,7 +17705,7 @@ struct Expression * exp; FreeType(((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType); ((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType = MkClassType("bool"); -((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType->truth = 0x1; +((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->destType->truth = 1; for(exp = (*stmt->__anon1.ifStmt.exp).first; exp; exp = exp->next) { ProcessExpressionType(exp); @@ -17713,7 +17746,7 @@ struct Expression * exp; FreeType(((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType); ((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType = MkClassType("bool"); -((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType->truth = 0x1; +((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->destType->truth = 1; for(exp = (*stmt->__anon1.whileStmt.exp).first; exp; exp = exp->next) { ProcessExpressionType(exp); @@ -17733,7 +17766,7 @@ if((*stmt->__anon1.doWhile.exp).last) { FreeType(((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType); ((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType = MkClassType("bool"); -((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType->truth = 0x1; +((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->destType->truth = 1; } for(exp = (*stmt->__anon1.doWhile.exp).first; exp; exp = exp->next) { @@ -17754,7 +17787,7 @@ if(stmt->__anon1.forStmt.check && stmt->__anon1.forStmt.check->__anon1.expressio { FreeType(((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType); ((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType = MkClassType("bool"); -((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType->truth = 0x1; +((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->destType->truth = 1; } if(stmt->__anon1.forStmt.check) ProcessStatement(stmt->__anon1.forStmt.check); @@ -17786,7 +17819,7 @@ for(e = exp ? (*exp).first : (((void *)0)); e; e = e->next) if(!e->next) { FreeType(e->destType); -e->destType = ProcessTypeString("Container", 0x0); +e->destType = ProcessTypeString("Container", 0); } if(!isBuiltin || e->next) ProcessExpressionType(e); @@ -17797,7 +17830,7 @@ if(isBuiltin || (source && source->kind == 8 && source->__anon1._class && source struct __ecereNameSpace__ecere__com__Class * _class = source ? source->__anon1._class->__anon1.registered : (((void *)0)); struct Symbol * symbol; struct Expression * expIt = (((void *)0)); -unsigned int isMap = 0x0, isArray = 0x0, isLinkList = 0x0, isList = 0x0, isCustomAVLTree = 0x0; +unsigned int isMap = 0, isArray = 0, isLinkList = 0, isList = 0, isCustomAVLTree = 0; struct __ecereNameSpace__ecere__com__Class * arrayClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Array"); struct __ecereNameSpace__ecere__com__Class * linkListClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "LinkList"); struct __ecereNameSpace__ecere__com__Class * customAVLTreeClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "CustomAVLTree"); @@ -17810,17 +17843,17 @@ if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._cla { struct __ecereNameSpace__ecere__com__Class * mapClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Map"); -isCustomAVLTree = 0x1; +isCustomAVLTree = 1; if(__ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, mapClass)) -isMap = 0x1; +isMap = 1; } else if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, arrayClass)) -isArray = 0x1; +isArray = 1; else if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, linkListClass)) { struct __ecereNameSpace__ecere__com__Class * listClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "List"); -isLinkList = 0x1; +isLinkList = 1; isList = __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, listClass); } if(isArray) @@ -17867,7 +17900,7 @@ type->refCount++; } else { -if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1)) +if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1)) { FreeType(type); type = e->expType; @@ -17876,7 +17909,7 @@ e = (*arrayExp->__anon1.list).first; ProcessExpressionType(e); if(e->expType) { -if(!MatchTypeExpression(e, type, (((void *)0)), 0x0, 0x1)) +if(!MatchTypeExpression(e, type, (((void *)0)), 0, 1)) { FreeType(e->expType); e->expType = (((void *)0)); @@ -17897,7 +17930,7 @@ e->expType = (((void *)0)); if(type) { typeStringBuf[0] = '\0'; -PrintType(type, typeStringBuf, 0x0, 0x1); +PrintType(type, typeStringBuf, 0, 1); typeString = typeStringBuf; FreeType(type); } @@ -17913,7 +17946,7 @@ if(arrayExp->__anon1.list) struct Expression * e; builtinCount = (*arrayExp->__anon1.list).count; -type = ProcessTypeString(typeString, 0x0); +type = ProcessTypeString(typeString, 0); while((e = (*arrayExp->__anon1.list).first)) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*arrayExp->__anon1.list), e); @@ -17932,7 +17965,7 @@ FreeList(exp, FreeExpression); } else { -arrayExp->expType = ProcessTypeString("Container", 0x0); +arrayExp->expType = ProcessTypeString("Container", 0); Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "Couldn't determine type of array elements\n", (((void *)0)))); } } @@ -17953,7 +17986,7 @@ else sprintf(iteratorType, "Iterator<%s, %s >", _class->templateArgs[2].__anon1.__anon1.dataTypeString, _class->templateArgs[1].__anon1.__anon1.dataTypeString); stmt->__anon1.compound.declarations = MkListOne(MkDeclarationInst(MkInstantiationNamed(MkListOne(MkSpecifierName(iteratorType)), MkExpIdentifier(id), MkListOne(MkMembersInitList(MkListOne(MkMemberInit(isMap ? MkListOne(MkIdentifier("map")) : (((void *)0)), MkInitializerAssignment(MkExpBrackets(exp))))))))); } -symbol = FindSymbol(id->string, curContext, curContext, 0x0, 0x0); +symbol = FindSymbol(id->string, curContext, curContext, 0, 0); if(block) { switch(block->type) @@ -18157,7 +18190,7 @@ if(object && object->expType && object->expType->kind == 8 && object->expType->_ func = MkClassFunction(MkListOne(MkSpecifier(VOID)), (((void *)0)), MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(watcherName)), MkListOne(MkTypeName(MkListOne(MkSpecifierName(object->expType->__anon1._class->string)), MkDeclaratorIdentifier(MkIdentifier("value"))))), (((void *)0))); ProcessClassFunctionBody(func, propWatch->compound); propWatch->compound = (((void *)0)); -createdExternal = ProcessClassFunction(watcherClass, func, ast, curExternal, 0x1); +createdExternal = ProcessClassFunction(watcherClass, func, ast, curExternal, 1); createdExternal->symbol->idCode = external->symbol->idCode; curExternal = createdExternal; ProcessFunction(createdExternal->__anon1.function); @@ -18194,9 +18227,9 @@ struct __ecereNameSpace__ecere__sys__OldList * args = MkList(); DeclareProperty(prop, setName, getName); strcpy(propName, "__ecereProp_"); -FullClassNameCat(propName, prop->_class->fullName, 0x0); +FullClassNameCat(propName, prop->_class->fullName, 0); strcat(propName, "_"); -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); ListAdd(args, CopyExpression(object)); ListAdd(args, MkExpIdentifier(MkIdentifier(propName))); ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this"))); @@ -18340,9 +18373,9 @@ struct __ecereNameSpace__ecere__sys__OldList * args = MkList(); DeclareProperty(prop, setName, getName); strcpy(propName, "__ecereProp_"); -FullClassNameCat(propName, prop->_class->fullName, 0x0); +FullClassNameCat(propName, prop->_class->fullName, 0); strcat(propName, "_"); -FullClassNameCat(propName, prop->name, 0x1); +FullClassNameCat(propName, prop->name, 1); ListAdd(args, CopyExpression(object)); ListAdd(args, MkExpIdentifier(MkIdentifier(propName))); ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this"))); @@ -18398,7 +18431,7 @@ char className[1024]; char structName[1024]; struct Declarator * funcDecl; struct Symbol * thisSymbol; -unsigned int typedObject = 0x0; +unsigned int typedObject = 0; if(_class && !_class->base) { @@ -18406,7 +18439,7 @@ _class = currentClass; if(_class && !_class->symbol) _class->symbol = FindClass(_class->fullName); classSym = _class ? _class->symbol : (((void *)0)); -typedObject = 0x1; +typedObject = 1; } thisClass = _class; if(inCompiler && _class) @@ -18423,15 +18456,15 @@ FreeType(param); if(type->classObjectType != 1) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert(&symbol->type->__anon1.__anon2.params, (((void *)0)), MkClassType(_class->fullName)); -symbol->type->__anon1.__anon2.staticMethod = 0x1; +symbol->type->__anon1.__anon2.staticMethod = 1; symbol->type->__anon1.__anon2.thisClass = (((void *)0)); -symbol->type->extraParam = 0x0; +symbol->type->extraParam = 0; } } strcpy(className, "__ecereClass_"); -FullClassNameCat(className, _class->fullName, 0x1); +FullClassNameCat(className, _class->fullName, 1); structName[0] = (char)0; -FullClassNameCat(structName, _class->fullName, 0x0); +FullClassNameCat(structName, _class->fullName, 0); funcDecl = GetFuncDecl(function->declarator); if(funcDecl) { @@ -18447,7 +18480,7 @@ FreeTypeName(param); } if(!function->propertyNoThis) { -struct TypeName * thisParam; +struct TypeName * thisParam = (((void *)0)); if(type->classObjectType != 1) { @@ -18548,12 +18581,12 @@ struct Initializer * initializer; struct Expression * exp, * bytePtr; strcpy(pointerName, "__ecerePointer_"); -FullClassNameCat(pointerName, _class->fullName, 0x0); +FullClassNameCat(pointerName, _class->fullName, 0); { char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); DeclareClass(classSym, className); } bytePtr = QBrackets(MkExpCast(QMkType("char", QMkPtrDecl((((void *)0)))), QMkExpId("this"))); @@ -18767,7 +18800,7 @@ char name[1024]; name[0] = (char)0; if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)function->module + structSize_Instance)))->importType != 1 && (!function->dataType || !function->dataType->dllExport)) strcpy(name, "__ecereFunction_"); -FullClassNameCat(name, s, 0x0); +FullClassNameCat(name, s, 0); DeclareFunction(function, name); } } @@ -18844,13 +18877,13 @@ DeclareFunctionUtil("eInstance_IncRef"); DeclareFunctionUtil("eInstance_StopWatching"); DeclareFunctionUtil("eInstance_Watch"); DeclareFunctionUtil("eInstance_FireWatchers"); -DeclareStruct("ecere::com::Class", 0x0); -DeclareStruct("ecere::com::Instance", 0x0); -DeclareStruct("ecere::com::Property", 0x0); -DeclareStruct("ecere::com::DataMember", 0x0); -DeclareStruct("ecere::com::Method", 0x0); -DeclareStruct("ecere::com::SerialBuffer", 0x0); -DeclareStruct("ecere::com::ClassTemplateArgument", 0x0); +DeclareStruct("ecere::com::Class", 0); +DeclareStruct("ecere::com::Instance", 0); +DeclareStruct("ecere::com::Property", 0); +DeclareStruct("ecere::com::DataMember", 0); +DeclareStruct("ecere::com::Method", 0); +DeclareStruct("ecere::com::SerialBuffer", 0); +DeclareStruct("ecere::com::ClassTemplateArgument", 0); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*ast), temp); for(external = (*ast).first; external; external = external->next) { diff --git a/compiler/bootstrap/libec/bootstrap/pass16.c b/compiler/bootstrap/libec/bootstrap/pass16.c index d9577c4..bb6ee8d 100644 --- a/compiler/bootstrap/libec/bootstrap/pass16.c +++ b/compiler/bootstrap/libec/bootstrap/pass16.c @@ -1193,7 +1193,7 @@ FixModuleName(moduleName); sprintf(registerName, "__ecereCreateModuleInstances_%s", moduleName); declarator = MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(registerName)), (((void *)0))); { -struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0x0); +struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0); ProcessFunctionBody(function, createInstancesBody); ListAdd(ast, MkExternalFunction(function)); @@ -1209,7 +1209,7 @@ ListAdd(specifiers, MkSpecifier(VOID)); sprintf(registerName, "__ecereDestroyModuleInstances_%s", moduleName); declarator = MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(registerName)), (((void *)0))); { -struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0x0); +struct FunctionDefinition * function = _MkFunction(specifiers, declarator, (((void *)0)), 0); ProcessFunctionBody(function, destroyInstancesBody); ListAdd(ast, MkExternalFunction(function)); @@ -1280,7 +1280,7 @@ static void ProcessExpression(struct Expression * exp); static unsigned int ProcessInstMembers_SimpleMemberEnsure(struct __ecereNameSpace__ecere__com__DataMember * parentMember, struct Instantiation * inst, struct Expression * instExp, struct __ecereNameSpace__ecere__sys__OldList * list, unsigned int zeroOut) { struct Symbol * classSym = inst->_class->__anon1.__anon1.symbol; -unsigned int fullSet = 0x1; +unsigned int fullSet = 1; struct __ecereNameSpace__ecere__com__DataMember * dataMember; for(dataMember = parentMember->members.first; dataMember; dataMember = dataMember->next) @@ -1290,11 +1290,11 @@ if(!dataMember->isProperty) if(!dataMember->name && (dataMember->type == 1 || dataMember->type == 2)) { if(!ProcessInstMembers_SimpleMemberEnsure(dataMember, inst, instExp, list, zeroOut)) -fullSet = 0x0; +fullSet = 0; } else { -unsigned int memberFilled = 0x0; +unsigned int memberFilled = 0; if(inst->members && (*inst->members).first) { @@ -1332,7 +1332,7 @@ subMemberStackPos = _subMemberStackPos; } if(!firstID->next && thisMember == dataMember) { -memberFilled = 0x1; +memberFilled = 1; break; } } @@ -1342,7 +1342,7 @@ else __ecereNameSpace__ecere__com__eClass_FindNextMember(classSym->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos); if(curMember == dataMember) { -memberFilled = 0x1; +memberFilled = 1; break; } } @@ -1365,7 +1365,7 @@ struct Expression * value = MkExpConstant("0"); memberExp = MkExpMember(instExpCopy, MkIdentifier(dataMember->name)); memberExp->__anon1.member.memberType = 3; -value->usage = (value->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +value->usage = (value->usage & ~0x1) | (((unsigned int)(1)) << 0); setExp = MkExpOp(memberExp, '=', value); value->loc = inst->loc; setExp->loc = inst->loc; @@ -1377,7 +1377,7 @@ ProcessExpressionType(setExp); ProcessExpression(setExp); ListAdd(list, setExp); } -fullSet = 0x0; +fullSet = 0; } } } @@ -1437,7 +1437,7 @@ static unsigned int ProcessInstMembers(struct Instantiation * inst, struct Expre { struct MembersInit * members; struct Symbol * classSym = inst->_class->__anon1.__anon1.symbol; -unsigned int fullSet = 0x1, convert = 0x0; +unsigned int fullSet = 1, convert = 0; if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 2) { @@ -1461,7 +1461,7 @@ struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0)); struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256]; int subMemberStackPos = 0; struct MemberInit * member = (((void *)0)); -unsigned int found = 0x0; +unsigned int found = 0; for(members = (*inst->members).first; members; members = members->next) { @@ -1489,7 +1489,7 @@ subMemberStackPos = _subMemberStackPos; } if(thisMember == bitMember) { -found = 0x1; +found = 1; break; } } @@ -1498,7 +1498,7 @@ else __ecereNameSpace__ecere__com__eClass_FindNextMember(classSym->__anon1.registered, &curClass, (struct __ecereNameSpace__ecere__com__DataMember **)&curMember, subMemberStack, &subMemberStackPos); if(curMember == bitMember) { -found = 0x1; +found = 1; break; } } @@ -1571,7 +1571,7 @@ if(inst->members && (*inst->members).first) { struct MemberInit * member = (((void *)0)); struct __ecereNameSpace__ecere__com__Property * prop = (((void *)0)); -unsigned int found = 0x0; +unsigned int found = 0; for(members = (*inst->members).first; members; members = members->next) { @@ -1586,14 +1586,14 @@ struct Identifier * firstID = (*member->identifiers).first; prop = __ecereNameSpace__ecere__com__eClass_FindProperty(_class, firstID->string, privateModule); if(prop) { -found = 0x1; +found = 1; break; } prop = (((void *)0)); } else { -found = 0x1; +found = 1; break; } } @@ -1650,7 +1650,7 @@ struct __ecereNameSpace__ecere__com__Class * lastClass = _class; for(_class = classSym->__anon1.registered; _class->base != lastClass && _class->base->type != 1000; _class = _class->base) ; if(_class->structSize != _class->memberOffset) -fullSet = 0x0; +fullSet = 0; for(dataMember = _class->membersAndProperties.first; dataMember; dataMember = dataMember->next) { if(!dataMember->isProperty) @@ -1658,11 +1658,11 @@ if(!dataMember->isProperty) if(!dataMember->name && (dataMember->type == 1 || dataMember->type == 2)) { if(!ProcessInstMembers_SimpleMemberEnsure(dataMember, inst, instExp, list, zeroOut)) -fullSet = 0x0; +fullSet = 0; } else { -unsigned int memberFilled = 0x0; +unsigned int memberFilled = 0; if(inst->members && (*inst->members).first) { @@ -1699,7 +1699,7 @@ subMemberStackPos = _subMemberStackPos; } if(!firstID->next && curMember == dataMember) { -memberFilled = 0x1; +memberFilled = 1; break; } } @@ -1709,7 +1709,7 @@ else __ecereNameSpace__ecere__com__eClass_FindNextMember(classSym->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos); if(curMember == dataMember) { -memberFilled = 0x1; +memberFilled = 1; break; } } @@ -1732,7 +1732,7 @@ struct Expression * value = MkExpConstant("0"); memberExp = MkExpMember(instExpCopy, MkIdentifier(dataMember->name)); memberExp->__anon1.member.memberType = 3; -value->usage = (value->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +value->usage = (value->usage & ~0x1) | (((unsigned int)(1)) << 0); setExp = MkExpOp(memberExp, '=', value); value->loc = inst->loc; setExp->loc = inst->loc; @@ -1744,7 +1744,7 @@ ProcessExpressionType(setExp); ProcessExpression(setExp); ListAdd(list, setExp); } -fullSet = 0x0; +fullSet = 0; } } } @@ -1813,10 +1813,10 @@ ident = MkIdentifier(thisMember->name); if(ident) { struct Expression * memberExp; -unsigned int freeMemberExp = 0x0; +unsigned int freeMemberExp = 0; if(thisMember && thisMember->isProperty && ((struct __ecereNameSpace__ecere__com__Property *)thisMember)->conversion) -convert = 0x1; +convert = 1; if(member->identifiers && (*member->identifiers).count > 1) { struct Identifier * id = (*member->identifiers).first; @@ -1829,7 +1829,7 @@ else memberExp = MkExpMember(instExpCopy, ident); if(member->initializer && member->initializer->type == 0 && member->initializer->__anon1.exp) { -member->initializer->__anon1.exp->usage = (member->initializer->__anon1.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +member->initializer->__anon1.exp->usage = (member->initializer->__anon1.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); setExp = MkExpOp(memberExp, '=', member->initializer->__anon1.exp); member->initializer->__anon1.exp = (((void *)0)); FreeInitializer(member->initializer); @@ -1837,7 +1837,7 @@ member->initializer = (((void *)0)); } else { -freeMemberExp = 0x1; +freeMemberExp = 1; } memberExp->loc = inst->loc; if(member->identifiers) @@ -1911,7 +1911,7 @@ __ecereInstance1->isRemote = classSym->__anon1.registered ? classSym->__anon1.re }); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add(&classSym->module->classes, classSym->_import); } -classSym->_import->itself = 0x1; +classSym->_import->itself = 1; specifiers = MkList(); declarators = MkList(); ListAdd(specifiers, MkSpecifier(EXTERN)); @@ -2022,7 +2022,7 @@ struct __ecereNameSpace__ecere__sys__OldList list = 0 }; -ProcessInstMembers(inst, (((void *)0)), &list, 0x0); +ProcessInstMembers(inst, (((void *)0)), &list, 0); ProcessExpression(inst->exp); exp->type = 4; exp->__anon1.op.op = '='; @@ -2039,7 +2039,7 @@ struct __ecereNameSpace__ecere__sys__OldList list = 0, 0, 0, 0, 0 }; -ProcessInstMembers(inst, (((void *)0)), &list, 0x0); +ProcessInstMembers(inst, (((void *)0)), &list, 0); FreeType(exp->destType); *exp = *(struct Expression *)list.first; { @@ -2063,7 +2063,7 @@ struct __ecereNameSpace__ecere__sys__OldList list = }; struct Expression * e; -ProcessInstMembers(inst, (((void *)0)), &list, 0x0); +ProcessInstMembers(inst, (((void *)0)), &list, 0); ProcessExpression(inst->exp); exp->type = 4; exp->__anon1.op.op = '='; @@ -2086,7 +2086,7 @@ struct __ecereNameSpace__ecere__sys__OldList list = 0 }; -ProcessInstMembers(inst, (((void *)0)), &list, 0x0); +ProcessInstMembers(inst, (((void *)0)), &list, 0); if(list.first) { struct Expression * e = list.first; @@ -2117,7 +2117,7 @@ if(inst->exp) { exp->type = 5; exp->__anon1.list = MkList(); -ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0x0); +ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0); ProcessExpression(inst->exp); if(!(*exp->__anon1.list).count) { @@ -2157,7 +2157,7 @@ exp->__anon1.list = MkList(); instExp = QMkExpId(className); instExp->loc = exp->loc; instExp->expType = MkClassType(inst->_class->__anon1.__anon1.name); -decl->__anon1.inst->fullSet = ProcessInstMembers(inst, instExp, exp->__anon1.list, 0x0); +decl->__anon1.inst->fullSet = ProcessInstMembers(inst, instExp, exp->__anon1.list, 0); ListAdd(exp->__anon1.list, instExp); } } @@ -2186,7 +2186,7 @@ char size[256]; sprintf(size, "%d", classSym->__anon1.registered->templateClass ? classSym->__anon1.registered->templateClass->structSize : classSym->__anon1.registered->structSize); newCall = MkExpCall(QMkExpId("ecere::com::eSystem_New0"), MkListOne(MkExpConstant(size))); -newCall->byReference = 0x1; +newCall->byReference = 1; } else { @@ -2194,16 +2194,16 @@ strcpy(className, "__ecereClass_"); if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 5 && classSym->__anon1.registered->templateClass) { classSym = FindClass(classSym->__anon1.registered->templateClass->fullName); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); } else -FullClassNameCat(className, inst->_class->__anon1.__anon1.name, 0x1); +FullClassNameCat(className, inst->_class->__anon1.__anon1.name, 1); DeclareClass(classSym, className); newCall = MkExpCall(QMkExpId("ecere::com::eInstance_New"), MkListOne(QMkExpId(className))); newCall->usage = exp->usage; ProcessExpressionType(newCall); newCall->expType->passAsTemplate = exp->expType->passAsTemplate; -newCall->byReference = 0x1; +newCall->byReference = 1; } if(inst->exp) { @@ -2217,7 +2217,7 @@ ListAdd(exp->__anon1.list, MkExpOp(inst->exp, '=', newCall)); } else FreeExpression(newCall); -ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0x0); +ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0); if(inst->built) FreeExpression(inst->exp); } @@ -2273,14 +2273,14 @@ exp->__anon1.compound->__anon1.compound.statements = MkListOne(MkExpressionStmt( instExp = QMkExpId(ecereTemp); instExp->tempCount = tempCount; instExp->expType = MkClassType(inst->_class->__anon1.__anon1.name); -instExp->byReference = 0x1; -ProcessInstMembers(inst, instExp, expList, 0x0); +instExp->byReference = 1; +ProcessInstMembers(inst, instExp, expList, 0); FreeExpression(instExp); if(exp->usage) { struct Expression * tmpExp = QMkExpId(ecereTemp); -tmpExp->byReference = 0x1; +tmpExp->byReference = 1; ListAdd(expList, tmpExp); } exp->tempCount = tempCount; @@ -2329,9 +2329,9 @@ switch(exp->__anon1.op.op) { case '=': if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); if(exp->__anon1.op.exp1) -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x2) | (((unsigned int)(0x1)) << 1); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x2) | (((unsigned int)(1)) << 1); break; case MUL_ASSIGN: case DIV_ASSIGN: @@ -2344,19 +2344,19 @@ case AND_ASSIGN: case XOR_ASSIGN: case OR_ASSIGN: if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); if(exp->__anon1.op.exp1) -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x2) | (((unsigned int)(0x1)) << 1); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x2) | (((unsigned int)(1)) << 1); break; case INC_OP: case DEC_OP: if(exp->__anon1.op.exp1) -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x2) | (((unsigned int)(0x1)) << 1); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x2) | (((unsigned int)(1)) << 1); case '&': if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2) { -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); } break; case '*': @@ -2364,12 +2364,12 @@ case '+': case '-': if(exp->__anon1.op.exp1) { -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(1)) << 0); } case '~': case '!': if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); break; case '/': case '%': @@ -2386,9 +2386,9 @@ case '^': case AND_OP: case OR_OP: if(exp->__anon1.op.exp1) -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(1)) << 0); if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); break; } if(exp->__anon1.op.exp1) @@ -2398,7 +2398,7 @@ if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp1->destTyp struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); CopyTypeInto(type, exp->__anon1.op.exp1->destType); -type->passAsTemplate = 0x0; +type->passAsTemplate = 0; FreeType(exp->__anon1.op.exp1->destType); exp->__anon1.op.exp1->destType = type; } @@ -2411,7 +2411,7 @@ if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->destTyp struct Type * type = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_Type); CopyTypeInto(type, exp->__anon1.op.exp2->destType); -type->passAsTemplate = 0x0; +type->passAsTemplate = 0; FreeType(exp->__anon1.op.exp2->destType); exp->__anon1.op.exp2->destType = type; } @@ -2434,7 +2434,7 @@ int __simpleStruct0, __simpleStruct1; e->tempCount = (__simpleStruct0 = e->tempCount, __simpleStruct1 = exp->tempCount, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1); if(!e->next) { -e->usage |= (exp->usage & ((((unsigned int)(0x1)) | (((unsigned int)(0x1)) << 2)))); +e->usage |= (exp->usage & ((((unsigned int)(1)) | (((unsigned int)(1)) << 2)))); } ProcessExpression(e); exp->tempCount = (__simpleStruct2 = exp->tempCount, __simpleStruct3 = e->tempCount, (__simpleStruct2 > __simpleStruct3) ? __simpleStruct2 : __simpleStruct3); @@ -2445,12 +2445,12 @@ case 6: { struct Expression * e; -exp->__anon1.index.exp->usage = (exp->__anon1.index.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.index.exp->usage = (exp->__anon1.index.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.index.exp); for(e = (*exp->__anon1.index.index).first; e; e = e->next) { if(!e->next) -e->usage = (e->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +e->usage = (e->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(e); } exp->tempCount = exp->__anon1.index.exp->tempCount; @@ -2465,8 +2465,8 @@ if(exp->__anon1.call.arguments) { for(e = (*exp->__anon1.call.arguments).first; e; e = e->next) { -e->usage = (e->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -e->usage = (e->usage & ~0x4) | (((unsigned int)(0x1)) << 2); +e->usage = (e->usage & ~0x1) | (((unsigned int)(1)) << 0); +e->usage = (e->usage & ~0x4) | (((unsigned int)(1)) << 2); ProcessExpression(e); } } @@ -2474,7 +2474,7 @@ break; } case 8: { -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.member.exp); if(!exp->__anon1.member.memberType) { @@ -2528,7 +2528,7 @@ if(prop) { exp->__anon1.member.memberType = 1; if(!prop->dataType) -prop->dataType = ProcessTypeString(prop->dataTypeString, 0x0); +prop->dataType = ProcessTypeString(prop->dataTypeString, 0); FreeType(exp->expType); exp->expType = prop->dataType; if(prop->dataType) @@ -2547,9 +2547,9 @@ method->dataType->refCount++; else if(member) { exp->__anon1.member.memberType = 3; -DeclareStruct(_class->fullName, 0x0); +DeclareStruct(_class->fullName, 0); if(!member->dataType) -member->dataType = ProcessTypeString(member->dataTypeString, 0x0); +member->dataType = ProcessTypeString(member->dataTypeString, 0); FreeType(exp->expType); exp->expType = member->dataType; if(member->dataType) @@ -2578,18 +2578,18 @@ case 12: struct Expression * e; if(((unsigned int)((exp->usage & 0x1) >> 0))) -exp->__anon1.cond.cond->usage = (exp->__anon1.cond.cond->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.cond.cond->usage = (exp->__anon1.cond.cond->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.cond.cond); for(e = (*exp->__anon1.cond.exp).first; e; e = e->next) { if(!e->next && ((unsigned int)((exp->usage & 0x1) >> 0))) -e->usage = (e->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +e->usage = (e->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(e); } if(exp->__anon1.cond.elseExp) { if(((unsigned int)((exp->usage & 0x1) >> 0))) -exp->__anon1.cond.elseExp->usage = (exp->__anon1.cond.elseExp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.cond.elseExp->usage = (exp->__anon1.cond.elseExp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.cond.elseExp); } break; @@ -2622,7 +2622,7 @@ static void ProcessInitializer(struct Initializer * init) switch(init->type) { case 0: -init->__anon1.exp->usage = (init->__anon1.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +init->__anon1.exp->usage = (init->__anon1.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(init->__anon1.exp); break; case 1: @@ -2696,7 +2696,7 @@ static unsigned int ProcessBracketInst_DataMember(struct __ecereNameSpace__ecere { struct Symbol * classSym = inst->_class->__anon1.__anon1.symbol; struct __ecereNameSpace__ecere__com__DataMember * dataMember = (((void *)0)); -unsigned int someMemberSet = 0x0; +unsigned int someMemberSet = 0; int anonID = 1; for(dataMember = parentMember->members.first; dataMember; dataMember = dataMember->next) @@ -2712,7 +2712,7 @@ if(!ProcessBracketInst_DataMember(dataMember, inst, subList ? subList : list, da { if(subList) FreeList(subList, FreeInitializer); -return 0x0; +return 0; } if(subList && (*subList).count) { @@ -2722,12 +2722,12 @@ char id[100]; sprintf(id, "__anon%d", anonID); init->id = MkIdentifier(id); ListAdd(list, init); -someMemberSet = 0x1; +someMemberSet = 1; } else { if(list->count) -someMemberSet = 0x1; +someMemberSet = 1; (__ecereNameSpace__ecere__com__eSystem_Delete(subList), subList = 0); } anonID++; @@ -2738,7 +2738,7 @@ struct __ecereNameSpace__ecere__com__Class * curClass = (((void *)0)); struct __ecereNameSpace__ecere__com__DataMember * curMember = (((void *)0)); struct __ecereNameSpace__ecere__com__DataMember * subMemberStack[256]; int subMemberStackPos = 0; -unsigned int found = 0x0; +unsigned int found = 0; if(inst->members && (*inst->members).first) { @@ -2776,7 +2776,7 @@ struct MembersInit * nextMembers; struct MemberInit * next = member->next; if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); symbol = (dataMember->dataType && dataMember->dataType->kind == 8) ? dataMember->dataType->__anon1._class : (((void *)0)); spec = _MkSpecifierName(dataMember->dataTypeString, symbol, (((void *)0))); { @@ -2812,7 +2812,7 @@ ListAdd(partList, nextMember); } member->initializer->__anon1.exp = MkExpInstance(MkInstantiation(spec, (((void *)0)), MkListOne(MkMembersInitList(partList)))); } -found = 0x1; +found = 1; break; } } @@ -2821,7 +2821,7 @@ else __ecereNameSpace__ecere__com__eClass_FindNextMember(classSym->__anon1.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos); if(curMember == dataMember) { -found = 0x1; +found = 1; break; } } @@ -2856,7 +2856,7 @@ init = (((void *)0)); } else { -member->initializer->__anon1.exp->usage = (member->initializer->__anon1.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +member->initializer->__anon1.exp->usage = (member->initializer->__anon1.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(member->initializer->__anon1.exp); init->type = 0; init->__anon1.exp = member->initializer->__anon1.exp; @@ -2866,7 +2866,7 @@ ListAdd(list, init); member->initializer->__anon1.exp = (((void *)0)); FreeInitializer(member->initializer); member->initializer = (((void *)0)); -someMemberSet = 0x1; +someMemberSet = 1; } else if(member && member->initializer && member->initializer->type == 1) { @@ -2874,7 +2874,7 @@ if(namedParentMember->type == 1 && dataMember->name) member->initializer->id = MkIdentifier(dataMember->name); ListAdd(list, member->initializer); member->initializer = (((void *)0)); -someMemberSet = 0x1; +someMemberSet = 1; } else if(dataMember && dataMember->dataTypeString && parentMember->type != 1 && namedParentMember->type != 1) { @@ -2884,7 +2884,7 @@ struct Initializer * init = (init = __ecereNameSpace__ecere__com__eInstance_New( if(namedParentMember->type == 1 && dataMember->name) init->id = MkIdentifier(dataMember->name); if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); classSym = (dataMember->dataType && dataMember->dataType->kind == 8) ? dataMember->dataType->__anon1._class : (((void *)0)); if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 1) { @@ -2910,7 +2910,7 @@ else init->type = 0; init->__anon1.exp = MkExpConstant("0"); } -someMemberSet = 0x1; +someMemberSet = 1; if(init) ListAdd(list, init); } @@ -2925,7 +2925,7 @@ dataMember = parentMember->members.first; if(namedParentMember->type == 1 && dataMember->name) init->id = MkIdentifier(dataMember->name); if(!dataMember->dataType && dataMember->dataTypeString) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); classSym = (dataMember->dataType && dataMember->dataType->kind == 8) ? dataMember->dataType->__anon1._class : (((void *)0)); if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 1) { @@ -2945,7 +2945,7 @@ init->__anon1.exp = MkExpConstant("0"); } ListAdd(list, init); } -return 0x1; +return 1; } extern void Compiler_Error(const char * format, ...); @@ -2960,7 +2960,7 @@ struct __ecereNameSpace__ecere__com__Class * _class = (((void *)0)); int anonID = 1; if(recursionCount > 500) -return 0x0; +return 0; recursionCount++; while(_class != classSym->__anon1.registered) { @@ -2975,12 +2975,12 @@ if(!dataMember->isProperty && !dataMember->name && (dataMember->type == 1 || dat { struct __ecereNameSpace__ecere__sys__OldList * subList = MkList(); -if(!ProcessBracketInst_DataMember(dataMember, inst, subList ? subList : list, dataMember, 0x0)) +if(!ProcessBracketInst_DataMember(dataMember, inst, subList ? subList : list, dataMember, 0)) { if(subList) FreeList(subList, FreeInitializer); recursionCount--; -return 0x0; +return 0; } if(dataMember->type == 2 || (subList && (*subList).count)) { @@ -2999,7 +2999,7 @@ else { struct MembersInit * members; struct MemberInit * member = (((void *)0)); -unsigned int found = 0x0; +unsigned int found = 0; if(inst->members && (*inst->members).first) { @@ -3041,7 +3041,7 @@ Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "No set define continue; } recursionCount--; -return 0x0; +return 0; } if((*member->identifiers).count > 1 && member->initializer && member->initializer->type == 0) { @@ -3052,7 +3052,7 @@ struct MemberInit * next = member->next; struct Symbol * symbol; if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); symbol = (dataMember->dataType && dataMember->dataType->kind == 8) ? dataMember->dataType->__anon1._class : (((void *)0)); spec = _MkSpecifierName(dataMember->dataTypeString, symbol, (((void *)0))); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*member->identifiers), firstID); @@ -3083,7 +3083,7 @@ ListAdd(partList, nextMember); member->initializer->__anon1.exp = MkExpInstance(MkInstantiation(spec, (((void *)0)), MkListOne(MkMembersInitList(partList)))); member->identifiers = (((void *)0)); } -found = 0x1; +found = 1; break; } } @@ -3100,9 +3100,9 @@ Compiler_Error(__ecereNameSpace__ecere__GetTranslatedString("ec", "No set define continue; } recursionCount--; -return 0x0; +return 0; } -found = 0x1; +found = 1; break; } } @@ -3127,11 +3127,11 @@ ListAdd(list, MkInitializerList(subList)); } else { -member->initializer->__anon1.exp->usage = (member->initializer->__anon1.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +member->initializer->__anon1.exp->usage = (member->initializer->__anon1.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(member->initializer->__anon1.exp); ListAdd(list, MkInitializerAssignment(CopyExpression(member->initializer->__anon1.exp))); } -member->takeOutExp = 0x1; +member->takeOutExp = 1; } else if(member && member->initializer && member->initializer->type == 1) { @@ -3143,7 +3143,7 @@ else if(dataMember && dataMember->dataTypeString) struct Symbol * classSym; if(!dataMember->dataType) -dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0x0); +dataMember->dataType = ProcessTypeString(dataMember->dataTypeString, 0); classSym = (dataMember->dataType && dataMember->dataType->kind == 8) ? dataMember->dataType->__anon1._class : (((void *)0)); if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 1) { @@ -3184,7 +3184,7 @@ member->initializer = (((void *)0)); } } recursionCount--; -return 0x1; +return 1; } static void ProcessDeclaration(struct Declaration * decl) @@ -3293,7 +3293,7 @@ struct __ecereNameSpace__ecere__sys__OldList list = 0 }; -ProcessInstMembers(inst, inst->exp, &list, 0x0); +ProcessInstMembers(inst, inst->exp, &list, 0); ProcessExpression(inst->exp); ListAdd(decl->__anon1.__anon1.specifiers, MkSpecifierName(inst->_class->__anon1.__anon1.name)); ListAdd(decl->__anon1.__anon1.declarators, MkInitDeclarator(MkDeclaratorIdentifier(inst->exp->__anon1.__anon1.identifier), MkInitializerAssignment(list.first))); @@ -3306,7 +3306,7 @@ struct __ecereNameSpace__ecere__sys__OldList list = 0 }; -ProcessInstMembers(inst, inst->exp, &list, 0x0); +ProcessInstMembers(inst, inst->exp, &list, 0); ProcessExpression(inst->exp); ListAdd(decl->__anon1.__anon1.specifiers, MkSpecifierName(inst->_class->__anon1.__anon1.name)); ListAdd(decl->__anon1.__anon1.declarators, MkInitDeclarator(MkDeclaratorIdentifier(inst->exp->__anon1.__anon1.identifier), MkInitializerAssignment(list.first))); @@ -3316,7 +3316,7 @@ else if(classSym && classSym->__anon1.registered && classSym->__anon1.registered { struct Expression * exp; -DeclareStruct(inst->_class->__anon1.__anon1.name, 0x0); +DeclareStruct(inst->_class->__anon1.__anon1.name, 0); ProcessExpression(inst->exp); { if(inst->fullSet) @@ -3339,7 +3339,7 @@ else { FreeList(list, FreeInitializer); exp = MkExpBrackets(MkList()); -ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0x1); +ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 1); ListAdd(exp->__anon1.list, CopyExpression(inst->exp)); ListAdd(decl->__anon1.__anon1.specifiers, MkSpecifierName(inst->_class->__anon1.__anon1.name)); ListAdd(decl->__anon1.__anon1.declarators, MkInitDeclarator(MkDeclaratorIdentifier(inst->exp->__anon1.__anon1.identifier), MkInitializerAssignment(exp))); @@ -3356,10 +3356,10 @@ strcpy(className, "__ecereClass_"); if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 5 && classSym->__anon1.registered->templateClass) { classSym = FindClass(classSym->__anon1.registered->templateClass->fullName); -FullClassNameCat(className, classSym->string, 0x1); +FullClassNameCat(className, classSym->string, 1); } else -FullClassNameCat(className, inst->_class->__anon1.__anon1.name, 0x1); +FullClassNameCat(className, inst->_class->__anon1.__anon1.name, 1); if(classSym) DeclareClass(classSym, className); if(classSym && classSym->__anon1.registered && classSym->__anon1.registered->type == 5 && (classSym->__anon1.registered->templateClass ? classSym->__anon1.registered->templateClass->fixed : classSym->__anon1.registered->fixed)) @@ -3373,7 +3373,7 @@ else { newCall = MkExpCall(QMkExpId("ecere::com::eInstance_New"), MkListOne(QMkExpId(className))); ProcessExpressionType(newCall); -newCall->byReference = 0x1; +newCall->byReference = 1; } if(inst->exp) { @@ -3385,7 +3385,7 @@ if(inst->members && (*inst->members).first) newExp = MkExpOp(CopyExpression(inst->exp), '=', newCall); exp = MkExpBrackets(MkList()); ListAdd(exp->__anon1.list, newExp); -ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0x0); +ProcessInstMembers(inst, inst->exp, exp->__anon1.list, 0); ListAdd(exp->__anon1.list, inst->exp); ProcessExpression(inst->exp); inst->exp = (((void *)0)); @@ -3482,7 +3482,7 @@ case 4: { struct Expression * exp; -((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.ifStmt.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -3497,7 +3497,7 @@ case 5: { struct Expression * exp; -((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.switchStmt.exp).first; exp; exp = exp->next) ProcessExpression(exp); ProcessStatement(stmt->__anon1.switchStmt.stmt); @@ -3509,7 +3509,7 @@ if(stmt->__anon1.whileStmt.exp) { struct Expression * exp; -((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.whileStmt.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -3525,7 +3525,7 @@ if(stmt->__anon1.doWhile.exp) { struct Expression * exp; -((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.doWhile.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -3543,7 +3543,7 @@ if(stmt->__anon1.forStmt.init) ProcessStatement(stmt->__anon1.forStmt.init); if(stmt->__anon1.forStmt.check && stmt->__anon1.forStmt.check->__anon1.expressions) { -((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); } if(stmt->__anon1.forStmt.check) ProcessStatement(stmt->__anon1.forStmt.check); @@ -3568,7 +3568,7 @@ struct Expression * exp; if(stmt->__anon1.expressions && (*stmt->__anon1.expressions).last) { -((struct Expression *)(*stmt->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.expressions).first; exp; exp = exp->next) { ProcessExpression(exp); diff --git a/compiler/bootstrap/libec/bootstrap/pass2.c b/compiler/bootstrap/libec/bootstrap/pass2.c index 4cce8b3..2ef3399 100644 --- a/compiler/bootstrap/libec/bootstrap/pass2.c +++ b/compiler/bootstrap/libec/bootstrap/pass2.c @@ -1211,7 +1211,7 @@ static struct Expression * FixReference(struct Expression * e, unsigned int want if(e->expType && e->type != 2) { struct Type * type = e->expType; -unsigned int isPointer = 0x0; +unsigned int isPointer = 0; if(type->kind == 8) { @@ -1304,14 +1304,14 @@ return e; static unsigned int FixMember(struct Expression * exp) { -unsigned int byReference = 0x0; +unsigned int byReference = 0; for(; exp; ) { if(exp->type == 5 || exp->type == 32) { if((*exp->__anon1.list).count > 1) -byReference = 0x1; +byReference = 1; exp = (*exp->__anon1.list).last; } else if(exp->type == 11) @@ -1321,7 +1321,7 @@ exp = exp->__anon1.cast.exp; else { if(byReference) -FixReference(exp, 0x1); +FixReference(exp, 1); else byReference = exp->byReference; break; @@ -1598,7 +1598,7 @@ struct Declarator * decl; struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(); strcpy(name, "__ecereVMethodID_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); DeclareMethod(method, name); @@ -1624,7 +1624,7 @@ if(_class) char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, _class->fullName, 0x1); +FullClassNameCat(className, _class->fullName, 1); if(!_class->symbol) _class->symbol = FindClass(_class->fullName); DeclareClass(_class->symbol, className); @@ -1639,7 +1639,7 @@ else char name[1024]; strcpy(name, "__ecereMethod_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); (__ecereNameSpace__ecere__com__eSystem_Delete(exp->__anon1.__anon1.identifier->string), exp->__anon1.__anon1.identifier->string = 0); @@ -1694,7 +1694,7 @@ switch(exp->__anon1.op.op) { case '=': if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); break; case MUL_ASSIGN: case DIV_ASSIGN: @@ -1706,19 +1706,19 @@ case RIGHT_ASSIGN: case AND_ASSIGN: case XOR_ASSIGN: case OR_ASSIGN: -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); break; case INC_OP: case DEC_OP: case '&': if(exp->__anon1.op.exp1 && exp->__anon1.op.exp2) { -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); } else if(exp->__anon1.op.exp2) { -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x40) | (((unsigned int)(0x1)) << 6); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x40) | (((unsigned int)(1)) << 6); } break; case '*': @@ -1726,12 +1726,12 @@ case '+': case '-': if(exp->__anon1.op.exp1) { -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(1)) << 0); } case '~': case '!': if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); break; case '/': case '%': @@ -1748,9 +1748,9 @@ case '^': case AND_OP: case OR_OP: if(exp->__anon1.op.exp1) -exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp1->usage = (exp->__anon1.op.exp1->usage & ~0x1) | (((unsigned int)(1)) << 0); if(exp->__anon1.op.exp2) -exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.op.exp2->usage = (exp->__anon1.op.exp2->usage & ~0x1) | (((unsigned int)(1)) << 0); break; } if(exp->__anon1.op.op == '=' || exp->__anon1.op.op == MUL_ASSIGN || exp->__anon1.op.op == DIV_ASSIGN || exp->__anon1.op.op == ADD_ASSIGN || exp->__anon1.op.op == MOD_ASSIGN || exp->__anon1.op.op == SUB_ASSIGN || exp->__anon1.op.op == LEFT_ASSIGN || exp->__anon1.op.op == RIGHT_ASSIGN || exp->__anon1.op.op == AND_ASSIGN || exp->__anon1.op.op == OR_ASSIGN || exp->__anon1.op.op == XOR_ASSIGN || exp->__anon1.op.op == INC_OP || exp->__anon1.op.op == DEC_OP) @@ -1767,7 +1767,7 @@ struct __ecereNameSpace__ecere__com__Class * propertyClass; char setName[1024], getName[1024]; testExp = exp->__anon1.op.exp1->__anon1.member.exp; -while(0x1) +while(1) { while(testExp) { @@ -1839,8 +1839,8 @@ tempExp->expType = MkClassType(propertyClass->fullName); parentExp->__anon1.member.exp = tempExp; value = MkExpBrackets(MkList()); copy = CopyExpression(topExp); -copy->usage = (copy->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -copy->usage = (copy->usage & ~0x20) | (((unsigned int)(0x1)) << 5); +copy->usage = (copy->usage & ~0x1) | (((unsigned int)(1)) << 0); +copy->usage = (copy->usage & ~0x20) | (((unsigned int)(1)) << 5); ListAdd(value->__anon1.list, copy); ListAdd(value->__anon1.list, MkExpOp(exp->__anon1.op.exp1, exp->__anon1.op.op, exp->__anon1.op.exp2)); ListAdd(value->__anon1.list, CopyExpression(tempExp)); @@ -1865,8 +1865,8 @@ tempExp->expType = MkClassType(propertyClass->fullName); parentExp->__anon1.member.exp = tempExp; value = MkExpBrackets(MkList()); copy = CopyExpression(topExp); -copy->usage = (copy->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -copy->usage = (copy->usage & ~0x20) | (((unsigned int)(0x1)) << 5); +copy->usage = (copy->usage & ~0x1) | (((unsigned int)(1)) << 0); +copy->usage = (copy->usage & ~0x20) | (((unsigned int)(1)) << 5); ListAdd(value->__anon1.list, copy); ListAdd(value->__anon1.list, MkExpOp(exp->__anon1.op.exp1, exp->__anon1.op.op, exp->__anon1.op.exp2)); ListAdd(value->__anon1.list, CopyExpression(tempExp)); @@ -2032,7 +2032,7 @@ struct Expression * value = exp->__anon1.op.exp2; char setName[1024], getName[1024]; char * setToUse = convertTo ? getName : setName; char * getToUse = convertTo ? setName : getName; -unsigned int needAddress = 0x0; +unsigned int needAddress = 0; int operator = exp->__anon1.op.op; switch(operator) @@ -2081,14 +2081,14 @@ exp2 = (((void *)0)); } value->expType = memberExp->expType; memberExp->expType->refCount++; -value->usage = (value->usage & ~0x4) | (((unsigned int)(0x1)) << 2); +value->usage = (value->usage & ~0x4) | (((unsigned int)(1)) << 2); } else if(value) { exp2 = (((void *)0)); } if(value) -value->usage = (value->usage & ~0x4) | (((unsigned int)(0x1)) << 2); +value->usage = (value->usage & ~0x4) | (((unsigned int)(1)) << 2); DeclareProperty(prop, setName, getName); if(memberExp->__anon1.member.exp) ProcessExpression(memberExp->__anon1.member.exp); @@ -2150,14 +2150,14 @@ newExp->__anon1.call.arguments = MkList(); if(convertTo) { ListAdd(newExp->__anon1.call.arguments, value); -ListAdd(newExp->__anon1.call.arguments, FixReference(memberExp->__anon1.member.exp, 0x1)); +ListAdd(newExp->__anon1.call.arguments, FixReference(memberExp->__anon1.member.exp, 1)); } else { -ListAdd(newExp->__anon1.call.arguments, FixReference(memberExp->__anon1.member.exp, 0x1)); +ListAdd(newExp->__anon1.call.arguments, FixReference(memberExp->__anon1.member.exp, 1)); ListAdd(newExp->__anon1.call.arguments, value); } -needAddress = 0x1; +needAddress = 1; } memberExp->__anon1.member.exp = (((void *)0)); if(value) @@ -2165,7 +2165,7 @@ if(value) value->tempCount = exp->tempCount; ProcessExpression(value); if(needAddress) -FixReference(value, 0x1); +FixReference(value, 1); } FreeExpression(memberExp); } @@ -2264,7 +2264,7 @@ struct __ecereNameSpace__ecere__sys__OldList * args = MkList(); exp->type = 5; exp->__anon1.list = MkList(); -object->usage = (object->usage & ~0x80) | (((unsigned int)(0x1)) << 7); +object->usage = (object->usage & ~0x80) | (((unsigned int)(1)) << 7); ProcessExpression(object); ListAdd(args, object); if(exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 0 && strcmp(exp->expType->__anon1._class->__anon1.registered->dataTypeString, "char *")) @@ -2287,7 +2287,7 @@ char className[1024]; if(_class->templateClass) _class = _class->templateClass; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, _class->fullName, 0x0); +FullClassNameCat(className, _class->fullName, 0); if(!_class->symbol) _class->symbol = FindClass(_class->fullName); DeclareClass(_class->symbol, className); @@ -2296,13 +2296,13 @@ ListAdd(list, MkExpCondition(MkExpPointer(QMkExpId(className), MkIdentifier("Des ListAdd(list, MkExpCall(QMkExpId("ecere::com::eSystem_Delete"), args)); o = CopyExpression(object); ProcessExpressionType(o); -o->usage = (o->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +o->usage = (o->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(o); ListAdd(exp->__anon1.list, MkExpBrackets(MkListOne(MkExpCondition(o, MkListOne(MkExpBrackets(list)), MkExpConstant("0"))))); } else if(exp->expType && exp->expType->kind == 20) { -struct Expression * argExp = GetTemplateArgExp(exp->expType->__anon1.templateParameter, thisClass, 0x0); +struct Expression * argExp = GetTemplateArgExp(exp->expType->__anon1.templateParameter, thisClass, 0); if(argExp) { @@ -2329,7 +2329,7 @@ if(exp->type == 4) { if(exp->__anon1.op.op == '=' && exp->__anon1.op.exp1 && exp->__anon1.op.exp1->expType && exp->__anon1.op.exp1->expType->kind == 20 && (exp->__anon1.op.exp1->type == 6 || (exp->__anon1.op.exp1->type == 4 && exp->__anon1.op.exp1->__anon1.op.op == '*' && !exp->__anon1.op.exp1->__anon1.op.exp1))) { -struct Expression * argExp = GetTemplateArgExp(exp->__anon1.op.exp1->expType->__anon1.templateParameter, thisClass, 0x0); +struct Expression * argExp = GetTemplateArgExp(exp->__anon1.op.exp1->expType->__anon1.templateParameter, thisClass, 0); if(argExp) { @@ -2385,7 +2385,7 @@ return ; } else if(exp->__anon1.op.op == '*' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->expType && exp->__anon1.op.exp2->expType->kind == 13 && exp->__anon1.op.exp2->expType->__anon1.type && exp->__anon1.op.exp2->expType->__anon1.type->kind == 20) { -struct Expression * argExp = GetTemplateArgExp(exp->__anon1.op.exp2->expType->__anon1.type->__anon1.templateParameter, thisClass, 0x0); +struct Expression * argExp = GetTemplateArgExp(exp->__anon1.op.exp2->expType->__anon1.type->__anon1.templateParameter, thisClass, 0); if(argExp) { @@ -2419,7 +2419,7 @@ if(exp->__anon1.op.exp2) exp->__anon1.op.exp1->tempCount = exp->__anon1.op.exp2->tempCount; ProcessExpression(exp->__anon1.op.exp1); if(exp->__anon1.op.op == '=' && exp->__anon1.op.exp2 && (!exp->__anon1.op.exp2->byReference || (exp->__anon1.op.exp2->expType && exp->__anon1.op.exp2->expType->kind == 8 && exp->__anon1.op.exp2->expType->__anon1._class && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type == 1)) && exp->__anon1.op.exp2->expType && (exp->__anon1.op.exp2->expType->kind != 13 && exp->__anon1.op.exp2->expType->kind != 20)) -FixReference(exp->__anon1.op.exp1, 0x0); +FixReference(exp->__anon1.op.exp1, 0); } if(exp->__anon1.op.exp2) { @@ -2430,7 +2430,7 @@ if(exp->__anon1.op.exp1 || (exp->__anon1.op.op != '*' && exp->__anon1.op.op != ' { if((!exp->__anon1.op.exp1 && (!exp->__anon1.op.exp2 || !exp->__anon1.op.exp2->expType || exp->__anon1.op.exp2->expType->kind != 8 || !exp->__anon1.op.exp2->expType->__anon1._class || !exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered || (exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type != 0 && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type != 1 && exp->__anon1.op.exp2->expType->__anon1._class->__anon1.registered->type != 5))) || (exp->__anon1.op.exp1 && exp->__anon1.op.exp1->expType && exp->__anon1.op.exp1->expType->kind != 13 && exp->__anon1.op.exp1->expType->kind != 20)) { -FixReference(exp->__anon1.op.exp2, exp->__anon1.op.exp1 ? exp->__anon1.op.exp1->byReference : 0x0); +FixReference(exp->__anon1.op.exp2, exp->__anon1.op.exp1 ? exp->__anon1.op.exp1->byReference : 0); } } } @@ -2453,7 +2453,7 @@ exp->next = next; if(exp->__anon1.op.op == '&' && !exp->__anon1.op.exp1 && exp->__anon1.op.exp2 && exp->__anon1.op.exp2->expType && exp->__anon1.op.exp2->expType->kind == 20 && !exp->__anon1.op.exp2->expType->passAsTemplate) { struct Expression * exp2 = exp->__anon1.op.exp2; -struct Expression * argExp = GetTemplateArgExp(exp2->expType->__anon1.templateParameter, thisClass, 0x0); +struct Expression * argExp = GetTemplateArgExp(exp2->expType->__anon1.templateParameter, thisClass, 0); if(argExp) { @@ -2493,7 +2493,7 @@ for(e = (*exp->__anon1.list).first; e; e = e->next) { if(!e->next) { -e->usage |= (exp->usage & (((unsigned int)(0x1)) | (((unsigned int)(0x1)) << 2) | (((unsigned int)(0x1)) << 4))); +e->usage |= (exp->usage & (((unsigned int)(1)) | (((unsigned int)(1)) << 2) | (((unsigned int)(1)) << 4))); } e->tempCount = exp->tempCount; ProcessExpression(e); @@ -2508,13 +2508,13 @@ case 6: { struct Expression * e; struct Expression * checkedExp = exp->__anon1.index.exp; -unsigned int isBuiltin = 0x0; +unsigned int isBuiltin = 0; while(checkedExp->type == 23 || checkedExp->type == 5 || checkedExp->type == 11) { if(checkedExp->type == 23) { -isBuiltin = 0x1; +isBuiltin = 1; break; } else if(checkedExp->type == 5) @@ -2523,11 +2523,11 @@ else checkedExp = checkedExp->__anon1.cast.exp; } exp->__anon1.index.exp->tempCount = exp->tempCount; -exp->__anon1.index.exp->usage = (exp->__anon1.index.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.index.exp->usage = (exp->__anon1.index.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.index.exp); if(exp->__anon1.index.exp->expType && exp->__anon1.index.exp->expType->kind == 13 && exp->__anon1.index.exp->expType->__anon1.type && exp->__anon1.index.exp->expType->__anon1.type->kind == 20) { -struct Expression * argExp = GetTemplateArgExp(exp->__anon1.index.exp->expType->__anon1.type->__anon1.templateParameter, thisClass, 0x0); +struct Expression * argExp = GetTemplateArgExp(exp->__anon1.index.exp->expType->__anon1.type->__anon1.templateParameter, thisClass, 0); if(argExp) { @@ -2556,7 +2556,7 @@ return ; for(e = (*exp->__anon1.index.index).first; e; e = e->next) { if(!e->next) -e->usage = (e->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +e->usage = (e->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(e); } exp->tempCount = exp->__anon1.index.exp->tempCount; @@ -2567,11 +2567,11 @@ struct Type * source = exp->__anon1.index.exp->expType; if(source->kind == 8 && source->__anon1._class && source->__anon1._class->__anon1.registered && source->__anon1._class->__anon1.registered != containerClass && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, containerClass)) { struct __ecereNameSpace__ecere__com__Class * _class = source->__anon1._class->__anon1.registered; -unsigned int isArray = 0x0; +unsigned int isArray = 0; struct __ecereNameSpace__ecere__com__Class * arrayClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "Array"); if(source && __ecereNameSpace__ecere__com__eClass_IsDerived(source->__anon1._class->__anon1.registered, arrayClass)) -isArray = 0x1; +isArray = 1; if(isArray && _class->templateArgs) { struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(); @@ -2625,9 +2625,9 @@ break; case 7: { struct Expression * e; -unsigned int typedObject = 0x0; +unsigned int typedObject = 0; struct Type * ellipsisDestType = (((void *)0)); -unsigned int usedEllipsis = 0x0; +unsigned int usedEllipsis = 0; if(exp->__anon1.call.arguments) { @@ -2636,20 +2636,20 @@ for(e = (*exp->__anon1.call.arguments).first; e; e = e->next) int __simpleStruct2, __simpleStruct3; int __simpleStruct0, __simpleStruct1; -e->usage = (e->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -e->usage = (e->usage & ~0x4) | (((unsigned int)(0x1)) << 2); +e->usage = (e->usage & ~0x1) | (((unsigned int)(1)) << 0); +e->usage = (e->usage & ~0x4) | (((unsigned int)(1)) << 2); e->tempCount = (__simpleStruct0 = e->tempCount, __simpleStruct1 = exp->tempCount, (__simpleStruct0 > __simpleStruct1) ? __simpleStruct0 : __simpleStruct1); ProcessExpression(e); exp->tempCount = (__simpleStruct2 = exp->tempCount, __simpleStruct3 = e->tempCount, (__simpleStruct2 > __simpleStruct3) ? __simpleStruct2 : __simpleStruct3); } } -exp->__anon1.call.exp->usage = (exp->__anon1.call.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -exp->__anon1.call.exp->usage = (exp->__anon1.call.exp->usage & ~0x8) | (((unsigned int)(0x1)) << 3); +exp->__anon1.call.exp->usage = (exp->__anon1.call.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); +exp->__anon1.call.exp->usage = (exp->__anon1.call.exp->usage & ~0x8) | (((unsigned int)(1)) << 3); exp->__anon1.call.exp->tempCount = exp->tempCount; ProcessExpression(exp->__anon1.call.exp); if(exp->__anon1.call.exp->expType && exp->__anon1.call.exp->expType->kind == 16) { -unsigned int nullMemberExp = 0x0; +unsigned int nullMemberExp = 0; struct Expression * memberExp = (exp->__anon1.call.exp->type == 8) ? exp->__anon1.call.exp : (((void *)0)); struct __ecereNameSpace__ecere__com__Class * _class = exp->__anon1.call.exp->expType->__anon1.__anon3.methodClass; struct __ecereNameSpace__ecere__com__Class * argClass = exp->__anon1.call.exp->expType->__anon1.__anon3.methodClass; @@ -2664,7 +2664,7 @@ struct Context * back; struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(); strcpy(name, "__ecereVMethodID_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); DeclareMethod(method, name); @@ -2697,7 +2697,7 @@ if(method->dataType->__anon1.__anon2.thisClass && !strcmp(method->dataType->__an { struct TypeName * param; -typedObject = 0x1; +typedObject = 1; param = MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), (((void *)0)))); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*param->qualifiers), (((void *)0)), MkSpecifier(CONST)); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*funcDecl->__anon1.function.parameters), (((void *)0)), param); @@ -2734,15 +2734,15 @@ else if(type->kind == 13) { argClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr"); FreeType(memberExp->__anon1.member.exp->expType); -memberExp->__anon1.member.exp->expType = ProcessTypeString("uintptr", 0x0); -memberExp->__anon1.member.exp->byReference = 0x1; +memberExp->__anon1.member.exp->expType = ProcessTypeString("uintptr", 0); +memberExp->__anon1.member.exp->byReference = 1; } else { char string[1024] = ""; struct Symbol * classSym; -PrintTypeNoConst(type, string, 0x0, 0x1); +PrintTypeNoConst(type, string, 0, 1); classSym = FindClass(string); if(classSym) argClass = classSym->__anon1.registered; @@ -2768,7 +2768,7 @@ cl = __ecereClass_int; if(cl->templateClass && !_class && exp->__anon1.call.exp->expType->__anon1._class && !exp->__anon1.call.exp->expType->__anon1.__anon3.methodClass && (type->kind == 19 || (regClass && regClass->type == 0 && strcmp(regClass->dataTypeString, "char *")))) cl = cl->templateClass; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, cl->fullName, 0x1); +FullClassNameCat(className, cl->fullName, 1); if(!cl->symbol) cl->symbol = FindClass(cl->fullName); DeclareClass(cl->symbol, className); @@ -2804,7 +2804,7 @@ else char name[1024]; strcpy(name, "__ecereMethod_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); if(!memberExp) @@ -2825,15 +2825,15 @@ if(!exp->__anon1.call.arguments) exp->__anon1.call.arguments = MkList(); if(typedObject && memberExp->__anon1.member.exp && memberExp->__anon1.member.exp->expType) { -unsigned int changeReference = 0x0; +unsigned int changeReference = 0; struct Expression * memberExpMemberExp = CopyExpression(memberExp->__anon1.member.exp); if(argClass && (argClass->type == 4 || argClass->type == 3 || argClass->type == 2 || argClass->type == 1000) && strcmp(argClass->fullName, "class") && strcmp(argClass->fullName, "uintptr") && strcmp(argClass->fullName, "intptr")) -changeReference = 0x1; +changeReference = 1; if(!memberExp->__anon1.member.exp->expType->classObjectType && ((((memberExp->__anon1.member.exp->expType->kind != 13 && (memberExp->__anon1.member.exp->expType->kind != 8 || !memberExp->__anon1.member.exp->expType->__anon1._class || !memberExp->__anon1.member.exp->expType->__anon1._class->__anon1.registered || memberExp->__anon1.member.exp->expType->__anon1._class->__anon1.registered->type == 1)))) || method->dataType->byReference)) -changeReference = 0x1; +changeReference = 1; if(typedObject && memberExp->__anon1.member.exp->expType->classObjectType && memberExp->__anon1.member.exp->expType->byReference != method->dataType->byReference) -changeReference = 0x1; +changeReference = 1; if(changeReference) { if(memberExp->__anon1.member.exp->type == 5 && memberExp->__anon1.member.exp->__anon1.list && (*memberExp->__anon1.member.exp->__anon1.list).count == 1 && ((struct Expression *)(*memberExp->__anon1.member.exp->__anon1.list).first)->type == 4 && ((struct Expression *)(*memberExp->__anon1.member.exp->__anon1.list).first)->__anon1.op.op == '*' && !((struct Expression *)(*memberExp->__anon1.member.exp->__anon1.list).first)->__anon1.op.exp1) @@ -2851,7 +2851,7 @@ else if(!memberExp->__anon1.member.exp->byReference) struct Expression * checkedExp = memberExp->__anon1.member.exp; struct Expression * parentExp = (((void *)0)); struct Expression * newExp; -unsigned int disconnected = 0x0; +unsigned int disconnected = 0; while(((checkedExp->type == 5 || checkedExp->type == 32) && checkedExp->__anon1.list) || checkedExp->type == 11) { @@ -2862,7 +2862,7 @@ checkedExp = (*checkedExp->__anon1.list).last; if(checkedExp && !disconnected) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*parentExp->__anon1.list), checkedExp); -disconnected = 0x1; +disconnected = 1; } } else if(checkedExp->type == 11) @@ -2871,12 +2871,12 @@ checkedExp = checkedExp->__anon1.cast.exp; if(checkedExp && !disconnected) { checkedExp->__anon1.cast.exp = (((void *)0)); -disconnected = 0x1; +disconnected = 1; } } } if(!parentExp) -nullMemberExp = 0x1; +nullMemberExp = 1; newExp = (typedObject && !memberExp->__anon1.member.exp->expType->classObjectType) ? checkedExp : MkExpOp((((void *)0)), '&', checkedExp); if(parentExp && (parentExp->type == 5 || parentExp->type == 32)) { @@ -2904,13 +2904,13 @@ __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->__anon1.call. else { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->__anon1.call.arguments), (((void *)0)), memberExp->__anon1.member.exp); -nullMemberExp = 0x1; +nullMemberExp = 1; } } else { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->__anon1.call.arguments), (((void *)0)), memberExp->__anon1.member.exp); -nullMemberExp = 0x1; +nullMemberExp = 1; } { char className[1024]; @@ -2924,14 +2924,14 @@ strcpy(className, "class"); else if(cl) { strcpy(className, "__ecereClass_"); -FullClassNameCat(className, cl->fullName, 0x1); +FullClassNameCat(className, cl->fullName, 1); if(!cl->symbol) cl->symbol = FindClass(cl->fullName); DeclareClass(cl->symbol, className); } if(className[0]) { -if(memberExp && cl && cl->type == 0 && (!type || type->byReference == 0x0) && strcmp(cl->dataTypeString, "char *")) +if(memberExp && cl && cl->type == 0 && (!type || type->byReference == 0) && strcmp(cl->dataTypeString, "char *")) { struct Expression * c; struct Context * context = PushContext(); @@ -2955,7 +2955,7 @@ FreeExpression(memberExpMemberExp); else { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->__anon1.call.arguments), (((void *)0)), memberExp->__anon1.member.exp); -nullMemberExp = 0x1; +nullMemberExp = 1; } } } @@ -2975,7 +2975,7 @@ struct Type * destType = (e->destType && e->destType->kind == 14) ? ellipsisDest if(destType && (destType->classObjectType == 2 || destType->classObjectType == 3)) { if(e->destType && e->destType->kind == 14) -usedEllipsis = 0x1; +usedEllipsis = 1; ellipsisDestType = destType; if(e && e->expType) { @@ -2998,15 +2998,15 @@ else if(type->kind == 13) { _class = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, "uintptr"); FreeType(e->expType); -e->expType = ProcessTypeString("uintptr", 0x0); -e->byReference = 0x1; +e->expType = ProcessTypeString("uintptr", 0); +e->byReference = 1; } else { char string[1024] = ""; struct Symbol * classSym; -PrintTypeNoConst(type, string, 0x0, 0x1); +PrintTypeNoConst(type, string, 0, 1); classSym = FindClass(string); if(classSym) _class = classSym->__anon1.registered; @@ -3073,7 +3073,7 @@ else if(parentExp->type == 23) __ecereMethod___ecereNameSpace__ecere__sys__OldList_Remove((&*((struct Statement *)(*parentExp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions), checkedExp); __ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*((struct Statement *)(*parentExp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions), newExp); } -e->byReference = 0x1; +e->byReference = 1; FreeType(checkedExp->expType); FreeType(checkedExp->destType); ((checkedExp ? (__ecereClass_Expression->Destructor ? __ecereClass_Expression->Destructor((void *)checkedExp) : 0, __ecereNameSpace__ecere__com__eSystem_Delete(checkedExp)) : 0), checkedExp = 0); @@ -3102,7 +3102,7 @@ exp->destType->refCount++; newExp->prev = (((void *)0)); newExp->next = (((void *)0)); newExp->expType = (((void *)0)); -PrintTypeNoConst(e->expType, typeString, 0x0, 0x1); +PrintTypeNoConst(e->expType, typeString, 0, 1); decl = SpecDeclFromString(typeString, specs, (((void *)0))); newExp->destType = ProcessType(specs, decl); curContext = context; @@ -3145,7 +3145,7 @@ else if(checkedExp->type == 11) checkedExp = checkedExp->__anon1.cast.exp; } newExp = MkExpOp((((void *)0)), '&', checkedExp); -newExp->byReference = 0x1; +newExp->byReference = 1; if(parentExp->type == 7) { __ecereMethod___ecereNameSpace__ecere__sys__OldList_Insert((&*exp->__anon1.call.arguments), e->prev, newExp); @@ -3182,12 +3182,12 @@ strcpy(className, "class"); else { strcpy(className, "__ecereClass_"); -FullClassNameCat(className, _class->fullName, 0x1); +FullClassNameCat(className, _class->fullName, 1); if(!_class->symbol) _class->symbol = FindClass(_class->fullName); DeclareClass(_class->symbol, className); } -if(_class->type == 0 && destType->byReference == 0x0 && strcmp(_class->dataTypeString, "char *")) +if(_class->type == 0 && destType->byReference == 0 && strcmp(_class->dataTypeString, "char *")) { struct Expression * c; struct Context * context = PushContext(); @@ -3229,8 +3229,8 @@ break; } case 8: { -unsigned int changeToPtr = 0x0; -unsigned int noHead = 0x0; +unsigned int changeToPtr = 0; +unsigned int noHead = 0; struct Type * type = exp->__anon1.member.exp ? exp->__anon1.member.exp->expType : (((void *)0)); struct Specifier * memberClassSpecifier = exp->__anon1.member.member ? exp->__anon1.member.member->_class : (((void *)0)); @@ -3262,7 +3262,7 @@ if(!_class) char string[2048] = ""; struct Symbol * classSym; -PrintTypeNoConst(type, string, 0x0, 0x1); +PrintTypeNoConst(type, string, 0, 1); classSym = FindClass(string); _class = classSym ? classSym->__anon1.registered : (((void *)0)); } @@ -3327,7 +3327,7 @@ struct __ecereNameSpace__ecere__com__Class * propertyClass; char * nameToUse = convertTo ? setName : getName; FreeIdentifier(exp->__anon1.member.member); -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.member.exp); DeclareProperty(prop, setName, getName); propertyClass = convertTo ? _class : ((((struct Symbol *)prop->symbol)->type && ((struct Symbol *)prop->symbol)->type->kind == 8) ? ((struct Symbol *)prop->symbol)->type->__anon1._class->__anon1.registered : ((struct Symbol *)prop->symbol)->_class); @@ -3363,13 +3363,13 @@ exp->type = 7; exp->__anon1.call.exp = QMkExpId(nameToUse); exp->__anon1.call.arguments = args; } -ListAdd(args, FixReference(ptr, 0x1)); +ListAdd(args, FixReference(ptr, 1)); } else if(propertyClass && propertyClass->type == 3) { struct __ecereNameSpace__ecere__sys__OldList * args = MkList(); -ListAdd(args, FixReference(ptr, 0x1)); +ListAdd(args, FixReference(ptr, 1)); exp->type = 7; exp->__anon1.call.exp = QMkExpId(nameToUse); exp->__anon1.call.arguments = args; @@ -3383,7 +3383,7 @@ struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(), * decls = MkLis struct Expression * tempExp; className[0] = (char)0; -FullClassNameCat(className, propertyClass->fullName, 0x0); +FullClassNameCat(className, propertyClass->fullName, 0); ListAdd(specs, MkStructOrUnion(3, MkIdentifier(className), (((void *)0)))); sprintf(className, "__simpleStruct%d", curContext->simpleID++); ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(className)), (((void *)0)))); @@ -3398,13 +3398,13 @@ tempExp = QMkExpId(className); tempExp->expType = MkClassType(propertyClass->fullName); if(convertTo) { -ListAdd(args, FixReference(CopyExpression(tempExp), 0x1)); -ListAdd(args, FixReference(ptr, 0x1)); +ListAdd(args, FixReference(CopyExpression(tempExp), 1)); +ListAdd(args, FixReference(ptr, 1)); } else { -ListAdd(args, FixReference(ptr, 0x1)); -ListAdd(args, FixReference(CopyExpression(tempExp), 0x1)); +ListAdd(args, FixReference(ptr, 1)); +ListAdd(args, FixReference(CopyExpression(tempExp), 1)); } if(((unsigned int)((exp->usage & 0x20) >> 5))) { @@ -3420,8 +3420,8 @@ exp->__anon1.list = MkList(); ListAdd(exp->__anon1.list, MkExpCall(QMkExpId(nameToUse), args)); if(((unsigned int)((exp->usage & 0x10) >> 4))) { -ListAdd(exp->__anon1.list, FixReference(tempExp, 0x1)); -exp->byReference = 0x1; +ListAdd(exp->__anon1.list, FixReference(tempExp, 1)); +exp->byReference = 1; } else ListAdd(exp->__anon1.list, tempExp); @@ -3432,7 +3432,7 @@ else exp->type = 7; exp->__anon1.call.exp = QMkExpId(nameToUse); exp->__anon1.call.arguments = MkList(); -ListAdd(exp->__anon1.call.arguments, FixReference(ptr, 0x1)); +ListAdd(exp->__anon1.call.arguments, FixReference(ptr, 1)); } } else if(prop->conversion) @@ -3463,7 +3463,7 @@ struct __ecereNameSpace__ecere__sys__OldList * specs = MkList(); struct Declarator * decl; typeString[0] = (char)0; -PrintType(exp->expType, typeString, 0x0, 0x0); +PrintType(exp->expType, typeString, 0, 0); decl = SpecDeclFromString(typeString, specs, (((void *)0))); exp->__anon1.cast.typeName = MkTypeName(specs, decl); } @@ -3490,12 +3490,12 @@ if((((unsigned int)((exp->usage & 0x1) >> 0)) || exp->__anon1.member.exp->expTyp char name[1024]; FreeIdentifier(exp->__anon1.member.member); -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.member.exp); if(method->type == 1) { strcpy(name, "__ecereVMethodID_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); exp->type = 6; @@ -3504,7 +3504,7 @@ if(memberClassSpecifier) char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, _class->fullName, 0x1); +FullClassNameCat(className, _class->fullName, 1); if(!_class->symbol) _class->symbol = FindClass(_class->fullName); DeclareClass(_class->symbol, className); @@ -3529,7 +3529,7 @@ else FreeExpression(exp->__anon1.member.exp); exp->type = 0; strcpy(name, "__ecereMethod_"); -FullClassNameCat(name, method->_class->fullName, 0x0); +FullClassNameCat(name, method->_class->fullName, 0); strcat(name, "_"); strcat(name, method->name); exp->__anon1.__anon1.identifier = MkIdentifier(name); @@ -3577,18 +3577,18 @@ exp->__anon1.member.member->string = __ecereNameSpace__ecere__com__PrintString(_ } if(((unsigned int)((exp->usage & 0x1) >> 0))) { -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); } ProcessExpression(exp->__anon1.member.exp); if(type->kind == 8 && type->__anon1._class && type->__anon1._class->__anon1.registered) -DeclareStruct(type->__anon1._class->__anon1.registered->fullName, 0x0); +DeclareStruct(type->__anon1._class->__anon1.registered->fullName, 0); if(_class->type == 5) { -noHead = 0x1; +noHead = 1; } else if(_class->type == 1) { -changeToPtr = 0x1; +changeToPtr = 1; } else if(_class->type == 2) { @@ -3619,7 +3619,7 @@ if(exp->__anon1.member.exp->type == 0 && thisPtr && type->kind == 8 && (!exp->__ char pointerName[1024]; strcpy(pointerName, "__ecerePointer_"); -FullClassNameCat(pointerName, type->__anon1._class->__anon1.registered->fullName, 0x0); +FullClassNameCat(pointerName, type->__anon1._class->__anon1.registered->fullName, 0); if(exp->__anon1.member.exp->__anon1.__anon1.identifier) FreeIdentifier(exp->__anon1.member.exp->__anon1.__anon1.identifier); exp->__anon1.member.exp->__anon1.__anon1.identifier = MkIdentifier(pointerName); @@ -3632,13 +3632,13 @@ char structName[1024]; char className[1024]; strcpy(className, "__ecereClass_"); -FullClassNameCat(className, member->_class->fullName, 0x1); +FullClassNameCat(className, member->_class->fullName, 1); if(!member->_class->symbol) member->_class->symbol = FindClass(member->_class->fullName); DeclareClass(member->_class->symbol, className); -DeclareStruct(member->_class->fullName, 0x0); +DeclareStruct(member->_class->fullName, 0); structName[0] = (char)0; -FullClassNameCat(structName, member->_class->fullName, 0x0); +FullClassNameCat(structName, member->_class->fullName, 0); checkedExp = exp->__anon1.member.exp; while(((checkedExp->type == 5 || checkedExp->type == 32) && checkedExp->__anon1.list && (*checkedExp->__anon1.list).count == 1) || checkedExp->type == 11) { @@ -3710,8 +3710,8 @@ exp->type = 9; FreeSpecifier(memberClassSpecifier); if(exp->__anon1.member.exp && (exp->type == 8 || exp->type == 9)) { -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x10) | (((unsigned int)(0x1)) << 4); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x10) | (((unsigned int)(1)) << 4); exp->__anon1.member.exp->tempCount = exp->tempCount; ProcessExpression(exp->__anon1.member.exp); exp->tempCount = exp->__anon1.member.exp->tempCount; @@ -3725,13 +3725,13 @@ case 23: struct Expression * e = (*((struct Statement *)(*exp->__anon1.compound->__anon1.compound.statements).last)->__anon1.expressions).last; if(e) -e->usage |= exp->usage & (((unsigned int)(0x1)) | (((unsigned int)(0x1)) << 2) | (((unsigned int)(0x1)) << 4)); +e->usage |= exp->usage & (((unsigned int)(1)) | (((unsigned int)(1)) << 2) | (((unsigned int)(1)) << 4)); ProcessStatement(exp->__anon1.compound); break; } case 9: { -exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.member.exp->usage = (exp->__anon1.member.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.member.exp); break; } @@ -3741,7 +3741,7 @@ struct Specifier * spec = exp->__anon1.typeName->qualifiers ? (*exp->__anon1.typ if(spec && spec->type == 8 && !exp->__anon1.typeName->declarator) { -struct Expression * argExp = GetTemplateArgExp(spec->__anon1.templateParameter, thisClass, 0x0); +struct Expression * argExp = GetTemplateArgExp(spec->__anon1.templateParameter, thisClass, 0); if(argExp) { @@ -3763,12 +3763,12 @@ case 11: { if(exp->__anon1.cast.exp) { -exp->__anon1.cast.exp->usage |= exp->usage & (((unsigned int)(0x1)) | (((unsigned int)(0x1)) << 4)); +exp->__anon1.cast.exp->usage |= exp->usage & (((unsigned int)(1)) | (((unsigned int)(1)) << 4)); ProcessExpression(exp->__anon1.cast.exp); if(exp->__anon1.cast.exp->byReference) exp->byReference = exp->__anon1.cast.exp->byReference; if(exp->expType && exp->expType->kind == 8 && exp->expType->__anon1._class && exp->expType->__anon1._class->__anon1.registered && exp->expType->__anon1._class->__anon1.registered->type == 1 && exp->__anon1.cast.exp->expType && (exp->__anon1.cast.exp->expType->kind == 13 || exp->__anon1.cast.exp->expType->kind == 12 || (exp->__anon1.cast.exp->expType->kind == 8 && exp->__anon1.cast.exp->expType->__anon1._class && exp->__anon1.cast.exp->expType->__anon1._class->__anon1.registered && !strcmp(exp->__anon1.cast.exp->expType->__anon1._class->__anon1.registered->dataTypeString, "char *")))) -exp->byReference = 0x1; +exp->byReference = 1; } break; } @@ -3777,16 +3777,16 @@ case 12: struct Expression * e; if(((unsigned int)((exp->usage & 0x1) >> 0))) -exp->__anon1.cond.cond->usage = (exp->__anon1.cond.cond->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.cond.cond->usage = (exp->__anon1.cond.cond->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.cond.cond); for(e = (*exp->__anon1.cond.exp).first; e; e = e->next) { if(!e->next && ((unsigned int)((exp->usage & 0x1) >> 0))) -e->usage = (e->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +e->usage = (e->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(e); } if(((unsigned int)((exp->usage & 0x1) >> 0))) -exp->__anon1.cond.elseExp->usage = (exp->__anon1.cond.elseExp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +exp->__anon1.cond.elseExp->usage = (exp->__anon1.cond.elseExp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(exp->__anon1.cond.elseExp); break; } @@ -3795,7 +3795,7 @@ case 24: if(exp->__anon1._classExp.specifiers && (*exp->__anon1._classExp.specifiers).first && ((struct Specifier *)(*exp->__anon1._classExp.specifiers).first)->type == 8) { struct Specifier * spec = (*exp->__anon1._classExp.specifiers).first; -struct Expression * argExp = GetTemplateArgExp(spec->__anon1.templateParameter, thisClass, 0x1); +struct Expression * argExp = GetTemplateArgExp(spec->__anon1.templateParameter, thisClass, 1); if(argExp) { @@ -3818,7 +3818,7 @@ char * string = StringFromSpecDecl(exp->__anon1._classExp.specifiers, exp->__ano struct Symbol * classSym = FindClass(string); strcpy(className, "__ecereClass_"); -FullClassNameCat(className, string, 0x1); +FullClassNameCat(className, string, 1); DeclareClass(classSym, className); (__ecereNameSpace__ecere__com__eSystem_Delete(string), string = 0); FreeList(exp->__anon1._classExp.specifiers, FreeSpecifier); @@ -3860,7 +3860,7 @@ nbExp->needTemplateCast = 2; if(((unsigned int)((exp->usage & 0x80) >> 7))) strcpy(typeString, "void *"); else -PrintType(exp->expType, typeString, 0x0, 0x0); +PrintType(exp->expType, typeString, 0, 0); decl = SpecDeclFromString(typeString, specs, (((void *)0))); if(specs && (*specs).first && ((struct Specifier *)(*specs).first)->type == 8 && exp->destType && !exp->destType->passAsTemplate && exp->destType->kind == 20 && exp->destType->__anon1.templateParameter && (exp->destType->__anon1.templateParameter->dataTypeString || exp->destType->__anon1.templateParameter->__anon1.dataType) && !((unsigned int)((exp->usage & 0x4) >> 2))) { @@ -3897,14 +3897,14 @@ switch(init->type) case 0: if(init->__anon1.exp) { -init->__anon1.exp->usage = (init->__anon1.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +init->__anon1.exp->usage = (init->__anon1.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(init->__anon1.exp); if(init->__anon1.exp->destType && init->__anon1.exp->destType->kind == 8 && init->__anon1.exp->destType->__anon1._class && init->__anon1.exp->destType->__anon1._class->__anon1.registered && init->__anon1.exp->destType->__anon1._class->__anon1.registered->type == 5) { -FixReference(init->__anon1.exp, 0x1); +FixReference(init->__anon1.exp, 1); } else if(init->__anon1.exp->destType && init->__anon1.exp->destType->kind == 8) -FixReference(init->__anon1.exp, 0x0); +FixReference(init->__anon1.exp, 0); } break; case 1: @@ -3952,7 +3952,7 @@ break; case 1: if(stmt->__anon1.caseStmt.exp) { -stmt->__anon1.caseStmt.exp->usage = (stmt->__anon1.caseStmt.exp->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +stmt->__anon1.caseStmt.exp->usage = (stmt->__anon1.caseStmt.exp->usage & ~0x1) | (((unsigned int)(1)) << 0); ProcessExpression(stmt->__anon1.caseStmt.exp); } if(stmt->__anon1.caseStmt.stmt) @@ -4006,7 +4006,7 @@ if(stmt->__anon1.ifStmt.exp) { struct Expression * exp; -((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.ifStmt.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.ifStmt.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -4024,7 +4024,7 @@ struct Expression * exp; if(stmt->__anon1.switchStmt.exp && (*stmt->__anon1.switchStmt.exp).last) { -((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.switchStmt.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.switchStmt.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -4039,7 +4039,7 @@ struct Expression * exp; if(stmt->__anon1.whileStmt.exp && (*stmt->__anon1.whileStmt.exp).last) { -((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.whileStmt.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.whileStmt.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -4054,7 +4054,7 @@ struct Expression * exp; if(stmt->__anon1.doWhile.exp && (*stmt->__anon1.doWhile.exp).last) { -((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage = (((struct Expression *)(*stmt->__anon1.doWhile.exp).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.doWhile.exp).first; exp; exp = exp->next) { ProcessExpression(exp); @@ -4074,7 +4074,7 @@ if(stmt->__anon1.forStmt.check) { if(stmt->__anon1.forStmt.check->__anon1.expressions) { -((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.forStmt.check->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); } ProcessStatement(stmt->__anon1.forStmt.check); } @@ -4101,12 +4101,12 @@ struct Expression * exp; if(stmt->__anon1.expressions) { -((struct Expression *)(*stmt->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(0x1)) << 0); +((struct Expression *)(*stmt->__anon1.expressions).last)->usage = (((struct Expression *)(*stmt->__anon1.expressions).last)->usage & ~0x1) | (((unsigned int)(1)) << 0); for(exp = (*stmt->__anon1.expressions).first; exp; exp = exp->next) { ProcessExpression(exp); if(!exp->next && exp->destType && exp->destType->byReference) -FixReference(exp, 0x1); +FixReference(exp, 1); } } break; diff --git a/compiler/bootstrap/libec/bootstrap/pass3.c b/compiler/bootstrap/libec/bootstrap/pass3.c index ea91f8d..7b3e70c 100644 --- a/compiler/bootstrap/libec/bootstrap/pass3.c +++ b/compiler/bootstrap/libec/bootstrap/pass3.c @@ -1140,7 +1140,7 @@ if(_class && _class->type == 1) char name[1024]; name[0] = (char)0; -FullClassNameCat(name, _class->fullName, 0x0); +FullClassNameCat(name, _class->fullName, 0); FreeSpecifierContents(spec); spec->type = 3; spec->__anon1.__anon2.baseSpecs = (((void *)0)); @@ -1148,20 +1148,20 @@ spec->__anon1.__anon2.id = MkIdentifier(name); spec->__anon1.__anon2.list = (((void *)0)); spec->__anon1.__anon2.definitions = (((void *)0)); spec->__anon1.__anon2.ctx = (((void *)0)); -spec->__anon1.__anon2.addNameSpace = 0x0; +spec->__anon1.__anon2.addNameSpace = 0; } else if(_class && _class->type == 5) { char name[1024] = ""; -FullClassNameCat(name, _class->fullName, 0x0); +FullClassNameCat(name, _class->fullName, 0); spec->type = 3; spec->__anon1.__anon2.baseSpecs = (((void *)0)); spec->__anon1.__anon2.id = MkIdentifier(name); spec->__anon1.__anon2.list = (((void *)0)); spec->__anon1.__anon2.definitions = (((void *)0)); spec->__anon1.__anon2.ctx = (((void *)0)); -spec->__anon1.__anon2.addNameSpace = 0x0; +spec->__anon1.__anon2.addNameSpace = 0; } else if(_class) { @@ -1172,7 +1172,7 @@ if(_class->dataTypeString) if(!strcmp(_class->dataTypeString, "uint64") || !strcmp(_class->dataTypeString, "uint32") || !strcmp(_class->dataTypeString, "uint16") || !strcmp(_class->dataTypeString, "uintptr") || !strcmp(_class->dataTypeString, "intptr") || !strcmp(_class->dataTypeString, "uintsize") || !strcmp(_class->dataTypeString, "intsize") || !strcmp(_class->dataTypeString, "uint") || !strcmp(_class->dataTypeString, "byte")) { if(!_class->dataType) -_class->dataType = ProcessTypeString(_class->dataTypeString, 0x0); +_class->dataType = ProcessTypeString(_class->dataTypeString, 0); if(_class->dataType && _class->dataType->kind == 8) classSym = _class->dataType->__anon1._class; else @@ -1203,7 +1203,7 @@ spec->__anon1.__anon2.list = (((void *)0)); spec->__anon1.__anon2.baseSpecs = (((void *)0)); spec->__anon1.__anon2.definitions = (((void *)0)); spec->__anon1.__anon2.ctx = (((void *)0)); -spec->__anon1.__anon2.addNameSpace = 0x0; +spec->__anon1.__anon2.addNameSpace = 0; } if(_class && _class->dataTypeString && !strcmp(_class->dataTypeString, "char *")) return 1; @@ -1390,16 +1390,16 @@ if(decl->declarator) InstDeclPassDeclarator(decl->declarator); for(type = (*decl->__anon1.function.parameters).first; type; type = type->next) { -unsigned int typedObject = 0x0; +unsigned int typedObject = 0; struct Specifier * spec = (((void *)0)); if(type->qualifiers) { spec = (struct Specifier *)(*type->qualifiers).first; if(spec && spec->type == 1 && !strcmp(spec->__anon1.__anon1.name, "class")) -typedObject = 0x1; +typedObject = 1; } -InstDeclPassTypeName(type, 0x1); +InstDeclPassTypeName(type, 1); if(typedObject) { struct TypeName * _class = (_class = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass_TypeName), _class->qualifiers = MkListOne(MkStructOrUnion(3, MkIdentifier("__ecereNameSpace__ecere__com__Class"), (((void *)0)))), _class->declarator = MkDeclaratorPointer(MkPointer((((void *)0)), (((void *)0))), MkDeclaratorIdentifier(MkIdentifier("class"))), _class); @@ -1495,7 +1495,7 @@ id->string = __ecereNameSpace__ecere__sys__CopyString(newID); static unsigned int IsVoidPtrCast(struct TypeName * typeName) { -unsigned int result = 0x0; +unsigned int result = 0; struct Declarator * d = typeName->declarator; if(d && d->type == 5 && d->__anon1.pointer.pointer == (((void *)0))) @@ -1507,7 +1507,7 @@ struct Specifier * s; for(s = (*typeName->qualifiers).first; s; s = s->next) { if(s->type == 0 && s->__anon1.specifier == VOID) -result = 0x1; +result = 1; } } } @@ -1591,7 +1591,7 @@ if(src->kind == 20 && src->__anon1.templateParameter && src->__anon1.templatePar struct Type * newType = (((void *)0)); if(src->__anon1.templateParameter->dataTypeString) -newType = ProcessTypeString(src->__anon1.templateParameter->dataTypeString, 0x0); +newType = ProcessTypeString(src->__anon1.templateParameter->dataTypeString, 0); else if(src->__anon1.templateParameter->__anon1.dataType) newType = ProcessType(src->__anon1.templateParameter->__anon1.dataType->specifiers, src->__anon1.templateParameter->__anon1.dataType->decl); if(newType) @@ -1617,7 +1617,7 @@ if(dest->kind == 20 && dest->__anon1.templateParameter && dest->__anon1.template struct Type * newType = (((void *)0)); if(dest->__anon1.templateParameter->dataTypeString) -newType = ProcessTypeString(dest->__anon1.templateParameter->dataTypeString, 0x0); +newType = ProcessTypeString(dest->__anon1.templateParameter->dataTypeString, 0); else if(dest->__anon1.templateParameter->__anon1.dataType) newType = ProcessType(dest->__anon1.templateParameter->__anon1.dataType->specifiers, dest->__anon1.templateParameter->__anon1.dataType->decl); if(newType) @@ -1665,7 +1665,7 @@ InstDeclPassExpression(exp->__anon1.member.exp); break; } case 10: -InstDeclPassTypeName(exp->__anon1.typeName, 0x0); +InstDeclPassTypeName(exp->__anon1.typeName, 0); break; case 11: { @@ -1716,7 +1716,7 @@ break; } case 33: { -InstDeclPassTypeName(exp->__anon1.initializer.typeName, 0x0); +InstDeclPassTypeName(exp->__anon1.initializer.typeName, 0); InstDeclPassInitializer(exp->__anon1.initializer.initializer); break; } @@ -1756,7 +1756,7 @@ for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next) { int type; -if((type = ReplaceClassSpec(decl->__anon1.__anon1.specifiers, spec, 0x0))) +if((type = ReplaceClassSpec(decl->__anon1.__anon1.specifiers, spec, 0))) { struct InitDeclarator * d; @@ -1766,7 +1766,7 @@ for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next) ReplaceByInstancePtr(spec, &d->declarator, type); } } -InstDeclPassSpecifier(spec, 0x0); +InstDeclPassSpecifier(spec, 0); } } if(decl->__anon1.__anon1.declarators) @@ -1792,7 +1792,7 @@ for(spec = (*decl->__anon1.__anon1.specifiers).first; spec; spec = spec->next) { int type; -if((type = ReplaceClassSpec(decl->__anon1.__anon1.specifiers, spec, 0x0))) +if((type = ReplaceClassSpec(decl->__anon1.__anon1.specifiers, spec, 0))) { if(decl->__anon1.__anon1.declarators) { @@ -1802,7 +1802,7 @@ for(d = (*decl->__anon1.__anon1.declarators).first; d; d = d->next) ReplaceByInstancePtr(spec, &d, type); } } -InstDeclPassSpecifier(spec, 0x0); +InstDeclPassSpecifier(spec, 0); } } if(decl->__anon1.__anon1.declarators) @@ -2007,9 +2007,9 @@ for(spec = (*func->specifiers).first; spec; spec = spec->next) { int type; -if((type = ReplaceClassSpec(func->specifiers, spec, 0x0))) +if((type = ReplaceClassSpec(func->specifiers, spec, 0))) ReplaceByInstancePtr(spec, &func->declarator, type); -InstDeclPassSpecifier(spec, 0x0); +InstDeclPassSpecifier(spec, 0); } } InstDeclPassDeclarator(func->declarator); diff --git a/compiler/bootstrap/libec/bootstrap/shortcuts.c b/compiler/bootstrap/libec/bootstrap/shortcuts.c index bcd0edd..50d613f 100644 --- a/compiler/bootstrap/libec/bootstrap/shortcuts.c +++ b/compiler/bootstrap/libec/bootstrap/shortcuts.c @@ -687,20 +687,20 @@ struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput __internal_ClassInst ? __internal_ClassInst->_vTbl : __ecereClass___ecereNameSpace__ecere__sys__File->_vTbl; })[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Seek])(fileInput, 0, 0); -echoOn = 0x0; -parseTypeError = 0x0; +echoOn = 0; +parseTypeError = 0; parsedType = (((void *)0)); declMode = structDeclMode = 0; resetScanner(); { unsigned int oldParsingType = parsingType; -parsingType = 0x1; +parsingType = 1; type_yyparse(); parsingType = oldParsingType; } declMode = structDeclMode = 2; -type_yydebug = 0x0; +type_yydebug = 0; (__ecereNameSpace__ecere__com__eInstance_DecRef(fileInput), fileInput = 0); if(parsedType) { diff --git a/compiler/bootstrap/libec/bootstrap/type.c b/compiler/bootstrap/libec/bootstrap/type.c index 915eef1..42abf93 100644 --- a/compiler/bootstrap/libec/bootstrap/type.c +++ b/compiler/bootstrap/libec/bootstrap/type.c @@ -2456,7 +2456,7 @@ break; case 13: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isConstructor = 0x1; +yyval.classFunction->isConstructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(1) - (3)].list, FreeSpecifier); @@ -2466,7 +2466,7 @@ break; case 14: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isDestructor = 0x1; +yyval.classFunction->isDestructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(2) - (4)].list, FreeSpecifier); @@ -2476,7 +2476,7 @@ break; case 15: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -2485,7 +2485,7 @@ break; case 16: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -2879,13 +2879,13 @@ break; case 78: { yyval.exp = yyvsp[(1) - (2)].exp; -skipErrors = 0x1; +skipErrors = 1; ; } break; case 80: { -skipErrors = 0x0; +skipErrors = 0; yyval.exp = MkExpOp(yyvsp[(1) - (2)].exp, '<', yyvsp[(2) - (2)].exp); yyval.exp->loc = (yyloc); ; diff --git a/compiler/ecp/ecp.ec b/compiler/ecp/ecp.ec index b05c5d9..efe099e 100644 --- a/compiler/ecp/ecp.ec +++ b/compiler/ecp/ecp.ec @@ -752,7 +752,7 @@ static void ProcessClassEnumValues(ClassType classType, OldList definitions, Sym { Type destType { - kind = intType; + kind = int64Type; refCount = 1; }; e.exp.destType = destType; @@ -773,7 +773,7 @@ static void ProcessClassEnumValues(ClassType classType, OldList definitions, Sym if(e.exp.type == identifierExp && e.exp.expType && e.exp.identifier && e.exp.identifier.string && e.exp.expType.kind == enumType) { // Resolve enums here - NamedLink l; + NamedLink64 l; char * string = e.exp.identifier.string; for(l = e.exp.expType.members.first; l; l = l.next) { @@ -783,9 +783,9 @@ static void ProcessClassEnumValues(ClassType classType, OldList definitions, Sym { FreeExpContents(e.exp); e.exp.type = constantExp; - e.exp.constant = PrintUInt((uint)l.data); + e.exp.constant = PrintInt64(l.data); FreeType(e.exp.expType); - e.exp.expType = ProcessTypeString("uint", false); + e.exp.expType = ProcessTypeString("int64", false); } break; } @@ -797,18 +797,22 @@ static void ProcessClassEnumValues(ClassType classType, OldList definitions, Sym if(e.exp.isConstant && e.exp.type == constantExp) { Operand op = GetOperand(e.exp); - int value; + int64 value; //value = strtol(e.exp.string, null, 0); switch(op.kind) { case charType: - value = op.type.isSigned ? (int)op.c : (int)op.uc; + value = op.type.isSigned ? (int64)op.c : (int64)op.uc; break; case shortType: - value = op.type.isSigned ? (int)op.s : (int) op.us; + value = op.type.isSigned ? (int64)op.s : (int64)op.us; break; + case int64Type: + value = op.type.isSigned ? (int64)op.i64 : (int64)op.ui64; + break; + case intType: default: - value = op.i; + value = op.type.isSigned ? (int64)op.i : (int)op.ui; } eEnum_AddFixedValue(regClass, e.id.string, value); } @@ -1267,14 +1271,19 @@ static void OutputSymbols(const char * fileName) if(_class.type == enumClass) { - NamedLink value; + NamedLink64 value; Class enumClass = eSystem_FindClass(privateModule, "enum"); EnumClassData e = ACCESS_CLASSDATA(_class, enumClass); f.Printf(" [Enum Values]\n"); for(value = e.values.first; value; value = value.next) { - f.Printf(" %s = %d\n", value.name, value.data); + f.Printf(" %s = ", value.name); + if(!strcmp(_class.dataTypeString, "uint64") && *(uint64 *)&value.data > MAXINT64) + f.Printf(FORMAT64HEX, *(uint64 *)&value.data); + else + f.Printf(FORMAT64D, value.data); + f.Printf("\n"); } f.Printf(" .\n"); } diff --git a/compiler/libec/precompiled/expression.c b/compiler/libec/precompiled/expression.c index 6c3a1cc..069a60a 100644 --- a/compiler/libec/precompiled/expression.c +++ b/compiler/libec/precompiled/expression.c @@ -4643,7 +4643,7 @@ break; case 401: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isConstructor = 0x1; +yyval.classFunction->isConstructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(1) - (3)].list, FreeSpecifier); @@ -4653,7 +4653,7 @@ break; case 402: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isDestructor = 0x1; +yyval.classFunction->isDestructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(2) - (4)].list, FreeSpecifier); @@ -4663,7 +4663,7 @@ break; case 403: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -4672,7 +4672,7 @@ break; case 404: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; diff --git a/compiler/libec/precompiled/grammar.c b/compiler/libec/precompiled/grammar.c index 89ff013..998a8eb 100644 --- a/compiler/libec/precompiled/grammar.c +++ b/compiler/libec/precompiled/grammar.c @@ -1072,7 +1072,7 @@ int yyerror(); unsigned int guess; -unsigned int deleteWatchable = 0x0; +unsigned int deleteWatchable = 0; int memberAccessStack[256]; @@ -3294,7 +3294,7 @@ break; case 13: { yyval.classFunction = MkClassFunction(yyvsp[(1) - (3)].list, (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isConstructor = 0x1; +yyval.classFunction->isConstructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3303,7 +3303,7 @@ break; case 14: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (4)].list, (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isDestructor = 0x1; +yyval.classFunction->isDestructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3312,7 +3312,7 @@ break; case 15: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3321,7 +3321,7 @@ break; case 16: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3346,7 +3346,7 @@ break; case 19: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -3355,7 +3355,7 @@ break; case 20: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -4386,7 +4386,7 @@ yyvsp[(1) - (3)].prop->issetStmt = yyvsp[(3) - (3)].stmt; break; case 132: { -yyvsp[(1) - (2)].prop->__anon1.isWatchable = 0x1; +yyvsp[(1) - (2)].prop->__anon1.isWatchable = 1; ; } break; @@ -4619,7 +4619,7 @@ break; case 168: { yyval.classDef = (((void *)0)); -deleteWatchable = 0x1; +deleteWatchable = 1; ; } break; @@ -5092,7 +5092,7 @@ yyval.symbol = DeclClassAddNameSpace(globalContext->nextID++, yyvsp[(3) - (3)].i FreeIdentifier(yyvsp[(1) - (3)].id); FreeIdentifier(yyvsp[(3) - (3)].id); yyval.symbol->nameLoc = (yylsp[(3) - (3)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; memberAccessStack[++defaultMemberAccess] = 2; ; } @@ -5103,7 +5103,7 @@ case 239: yyval.symbol = DeclClass(globalContext->nextID++, yyvsp[(3) - (3)].specifier->__anon1.__anon1.name); FreeIdentifier(yyvsp[(1) - (3)].id); yyval.symbol->nameLoc = (yylsp[(3) - (3)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; FreeSpecifier(yyvsp[(3) - (3)].specifier); memberAccessStack[++defaultMemberAccess] = 2; ; @@ -5140,7 +5140,7 @@ yyval.symbol->templateParams = yyvsp[(5) - (6)].list; FreeIdentifier(yyvsp[(1) - (6)].id); FreeIdentifier(yyvsp[(3) - (6)].id); yyval.symbol->nameLoc = (yylsp[(3) - (6)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; memberAccessStack[++defaultMemberAccess] = 2; ; } @@ -5152,7 +5152,7 @@ yyval.symbol = DeclClass(globalContext->nextID++, yyvsp[(3) - (6)].specifier->__ yyval.symbol->templateParams = yyvsp[(5) - (6)].list; FreeIdentifier(yyvsp[(1) - (6)].id); yyval.symbol->nameLoc = (yylsp[(3) - (6)]); -yyval.symbol->isRemote = 0x1; +yyval.symbol->isRemote = 1; FreeSpecifier(yyvsp[(3) - (6)].specifier); memberAccessStack[++defaultMemberAccess] = 2; ; @@ -5235,7 +5235,7 @@ case 251: { yyval._class = MkClass(yyvsp[(1) - (3)].symbol, (((void *)0)), yyvsp[(3) - (3)].list); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5252,7 +5252,7 @@ case 252: yyval._class = yyvsp[(1) - (3)]._class; yyval._class->definitions = yyvsp[(3) - (3)].list; yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5268,7 +5268,7 @@ case 253: { yyval._class = MkClass(yyvsp[(1) - (3)].symbol, (((void *)0)), yyvsp[(3) - (3)].list); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5285,7 +5285,7 @@ case 254: yyval._class = yyvsp[(1) - (3)]._class; yyval._class->definitions = yyvsp[(3) - (3)].list; yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5301,7 +5301,7 @@ case 255: { yyval._class = MkClass(yyvsp[(1) - (3)].symbol, (((void *)0)), MkList()); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -5318,7 +5318,7 @@ case 256: yyval._class = yyvsp[(1) - (3)]._class; yyval._class->definitions = MkList(); yyval._class->deleteWatchable = deleteWatchable; -deleteWatchable = 0x0; +deleteWatchable = 0; yyval._class->blockStart = (yylsp[(2) - (3)]); yyval._class->loc = (yyloc); yyval._class->loc.end.charPos++; @@ -6068,13 +6068,13 @@ break; case 371: { yyval.exp = yyvsp[(1) - (2)].exp; -skipErrors = 0x1; +skipErrors = 1; ; } break; case 373: { -skipErrors = 0x0; +skipErrors = 0; yyval.exp = MkExpOp(yyvsp[(1) - (2)].exp, '<', yyvsp[(2) - (2)].exp); yyval.exp->loc = (yyloc); ; @@ -6837,7 +6837,7 @@ _DeclClass(0, name); } else _DeclClass(0, yyvsp[(1) - (2)].exp->__anon1.__anon1.identifier->string); -skipErrors = 0x0; +skipErrors = 0; FreeExpression(yyvsp[(1) - (2)].exp); FreeExpression(yyvsp[(2) - (2)].exp); ((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({ @@ -6869,7 +6869,7 @@ else yyval.exp = MkExpOp(yyvsp[(1) - (2)].exp, '<', yyvsp[(2) - (2)].exp); yyval.exp->loc = (yyloc); } -skipErrors = 0x0; +skipErrors = 0; ; } break; @@ -8354,7 +8354,7 @@ break; case 720: { yyval.specifier = MkStructOrUnion(yyvsp[(1) - (2)].specifierType, yyvsp[(2) - (2)].id, (((void *)0))); -yyval.specifier->__anon1.__anon2.addNameSpace = 0x1; +yyval.specifier->__anon1.__anon2.addNameSpace = 1; yyval.specifier->__anon1.__anon2.ctx = PushContext(); ; } @@ -8371,7 +8371,7 @@ case 722: { yyval.specifier = MkStructOrUnion(yyvsp[(1) - (3)].specifierType, yyvsp[(3) - (3)].id, (((void *)0))); yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (3)].extDecl; -yyval.specifier->__anon1.__anon2.addNameSpace = 0x1; +yyval.specifier->__anon1.__anon2.addNameSpace = 1; yyval.specifier->__anon1.__anon2.ctx = PushContext(); ; } @@ -9543,7 +9543,7 @@ ListAdd(yyvsp[(1) - (3)].list, MkTypeName((((void *)0)), MkDeclaratorIdentifier( break; case 868: { -char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (1)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (1)].specifier->__anon1.__anon1.name; yyval.declarator = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9560,7 +9560,7 @@ break; case 870: { struct Declarator * decl; -char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (4)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9572,7 +9572,7 @@ break; case 871: { struct Declarator * decl; -char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (4)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9584,7 +9584,7 @@ break; case 872: { struct Declarator * decl; -char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (4)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (4)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -9596,7 +9596,7 @@ break; case 873: { struct Declarator * decl; -char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (3)].specifier->__anon1.__anon1.name; decl = MkDeclaratorIdentifier(MkIdentifier(s)); @@ -10564,7 +10564,7 @@ ListAdd(yyval.list, yyvsp[(3) - (3)].initDeclarator); break; case 1024: { -char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 0x1, 0x0); +char * colon = __ecereFunction___ecereNameSpace__ecere__sys__RSearchString(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name, "::", strlen(yyvsp[(1) - (3)].specifier->__anon1.__anon1.name), 1, 0); char * s = colon ? colon + 2 : yyvsp[(1) - (3)].specifier->__anon1.__anon1.name; yyval.list = MkList(); diff --git a/compiler/libec/precompiled/type.c b/compiler/libec/precompiled/type.c index 5cb43ba..2b5be2e 100644 --- a/compiler/libec/precompiled/type.c +++ b/compiler/libec/precompiled/type.c @@ -2454,7 +2454,7 @@ break; case 13: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isConstructor = 0x1; +yyval.classFunction->isConstructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(1) - (3)].list, FreeSpecifier); @@ -2464,7 +2464,7 @@ break; case 14: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), (((void *)0)), (((void *)0))); -yyval.classFunction->isDestructor = 0x1; +yyval.classFunction->isDestructor = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; FreeList(yyvsp[(2) - (4)].list, FreeSpecifier); @@ -2474,7 +2474,7 @@ break; case 15: { yyval.classFunction = MkClassFunction(yyvsp[(2) - (3)].list, (((void *)0)), yyvsp[(3) - (3)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -2483,7 +2483,7 @@ break; case 16: { yyval.classFunction = MkClassFunction((((void *)0)), (((void *)0)), yyvsp[(2) - (2)].declarator, (((void *)0))); -yyval.classFunction->isVirtual = 0x1; +yyval.classFunction->isVirtual = 1; yyval.classFunction->loc = (yyloc); yyval.classFunction->id = ++globalContext->nextID; ; @@ -2877,13 +2877,13 @@ break; case 78: { yyval.exp = yyvsp[(1) - (2)].exp; -skipErrors = 0x1; +skipErrors = 1; ; } break; case 80: { -skipErrors = 0x0; +skipErrors = 0; yyval.exp = MkExpOp(yyvsp[(1) - (2)].exp, '<', yyvsp[(2) - (2)].exp); yyval.exp->loc = (yyloc); ; diff --git a/compiler/libec/src/ast.ec b/compiler/libec/src/ast.ec index 4bc5e8e..2ebb573 100644 --- a/compiler/libec/src/ast.ec +++ b/compiler/libec/src/ast.ec @@ -2228,13 +2228,13 @@ void CopyTypeInto(Type type, Type src) if(src.kind == enumType) { - NamedLink member; + NamedLink64 member; type.members.Clear(); // This must have been a mistake: member = **type**.members.first for(member = src.members.first; member; member = member.next) { - type.members.Add(NamedLink { name = CopyString(member.name), data = member.data }); + type.members.Add(NamedLink64 { name = CopyString(member.name), data = member.data }); } type.enumName = CopyString(src.enumName); } @@ -2410,9 +2410,9 @@ static Type ProcessTypeSpecs(OldList specs, bool assumeEllipsis, bool keepTypeNa Enumerator e; for(e = spec.list->first; e; e = e.next) { - NamedLink i { name = CopyString(e.id.string) }; + NamedLink64 i { name = CopyString(e.id.string) }; if(e.exp && e.exp.type == constantExp && e.exp.constant) - i.data = (void *)strtol(e.exp.constant, null, 0); + i.data = strtoll(e.exp.constant, null, 0); specType.members.Add(i); } } @@ -2455,12 +2455,12 @@ static Type ProcessTypeSpecs(OldList specs, bool assumeEllipsis, bool keepTypeNa if(symbol.type.kind == enumType) { - NamedLink member; + NamedLink64 member; specType.members.Clear(); for(member = symbol.type.members.first; member; member = member.next) { - NamedLink item { name = CopyString(member.name), data = member.data }; + NamedLink64 item { name = CopyString(member.name), data = member.data }; specType.members.Add(item); } } diff --git a/compiler/libec/src/freeAst.ec b/compiler/libec/src/freeAst.ec index d206d21..d94fc4e 100644 --- a/compiler/libec/src/freeAst.ec +++ b/compiler/libec/src/freeAst.ec @@ -27,7 +27,7 @@ public void FreeType(Type type) { case enumType: { - NamedLink member, next; + NamedLink64 member, next; if(type.enumName) delete type.enumName; for(member = type.members.first; member; member = next) diff --git a/compiler/libec/src/loadSymbols.ec b/compiler/libec/src/loadSymbols.ec index 823d071..7601af6 100644 --- a/compiler/libec/src/loadSymbols.ec +++ b/compiler/libec/src/loadSymbols.ec @@ -310,7 +310,7 @@ public bool LoadSymbols(const char * fileName, ImportType importType, bool loadD name[equal - line] = '\0'; TrimLSpaces(name, name); TrimRSpaces(name, name); - eEnum_AddFixedValue(regClass, name, atoi(equal + 1)); + eEnum_AddFixedValue(regClass, name, strtoll(equal + 1, null, 0)); } else { diff --git a/compiler/libec/src/pass1.ec b/compiler/libec/src/pass1.ec index 374fca2..ca59dc4 100644 --- a/compiler/libec/src/pass1.ec +++ b/compiler/libec/src/pass1.ec @@ -908,7 +908,7 @@ static void ProcessClass(ClassType classType, OldList definitions, Symbol symbol { Type destType { - kind = intType; + kind = int64Type; refCount = 1; }; e.exp.destType = destType; @@ -927,7 +927,7 @@ static void ProcessClass(ClassType classType, OldList definitions, Symbol symbol if(e.exp.type == identifierExp && e.exp.expType && e.exp.identifier && e.exp.identifier.string && e.exp.expType.kind == enumType) { // Resolve enums here - NamedLink l; + NamedLink64 l; char * string = e.exp.identifier.string; for(l = e.exp.expType.members.first; l; l = l.next) { @@ -937,9 +937,9 @@ static void ProcessClass(ClassType classType, OldList definitions, Symbol symbol { FreeExpContents(e.exp); e.exp.type = constantExp; - e.exp.constant = PrintUInt((uint)l.data); + e.exp.constant = PrintInt64(l.data); FreeType(e.exp.expType); - e.exp.expType = ProcessTypeString("uint", false); + e.exp.expType = ProcessTypeString("int64", false); } break; } @@ -947,19 +947,26 @@ static void ProcessClass(ClassType classType, OldList definitions, Symbol symbol } else ComputeExpression(e.exp); - if(e.exp.isConstant && /*e.exp.expType.kind == intType*/ e.exp.type == constantExp) + if(e.exp.isConstant && e.exp.type == constantExp) { Operand op = GetOperand(e.exp); - int value; - // TODO: 64 BIT ENUM SUPPORT... + int64 value; switch(op.kind) { - case charType: value = op.c; break; - case shortType: value = op.s; break; - default: value = op.i; + case charType: + value = op.type.isSigned ? (int64)op.c : (int64)op.uc; + break; + case shortType: + value = op.type.isSigned ? (int64)op.s : (int64)op.us; + break; + case int64Type: + value = op.type.isSigned ? (int64)op.i64 : (int64)op.ui64; + break; + case intType: + default: + value = op.type.isSigned ? (int64)op.i : (int)op.ui; } - // value = op.i; //strtol(e.exp.string, null, 0); eEnum_AddFixedValue(regClass, e.id.string, value); } else @@ -1503,7 +1510,7 @@ static void ProcessClass(ClassType classType, OldList definitions, Symbol symbol // Add Enumeration Values if(classType == enumClass) { - NamedLink value; + NamedLink64 value; Class enumClass = eSystem_FindClass(privateModule, "enum"); EnumClassData e = ACCESS_CLASSDATA(regClass, enumClass); @@ -1519,12 +1526,15 @@ static void ProcessClass(ClassType classType, OldList definitions, Symbol symbol ListAdd(args, MkExpString(string)); delete string; } - // uint value + // int64 value { - char temp[1024]; - // TODO: Support 64 bit enums - sprintf(temp, "%d", (int)value.data); + char * temp; + if(!strcmp(regClass.dataTypeString, "uint64")) + temp = PrintUInt64(value.data); + else + temp = PrintInt64(value.data); ListAdd(args, MkExpConstant(temp)); + delete temp; } stmt = MkExpressionStmt(MkListOne( diff --git a/compiler/libec/src/pass15.ec b/compiler/libec/src/pass15.ec index 7421f54..d939412 100644 --- a/compiler/libec/src/pass15.ec +++ b/compiler/libec/src/pass15.ec @@ -218,7 +218,7 @@ public char * PrintUInt(uint64 result) { char temp[100]; if(result > MAXDWORD) - sprintf(temp, FORMAT64HEXLL /*"0x%I64XLL"*/, result); + sprintf(temp, FORMAT64HEXLL /*"0x%I64X"*/, result); else if(result > MAXINT) sprintf(temp, FORMAT64HEX /*"0x%I64X"*/, result); else @@ -226,20 +226,25 @@ public char * PrintUInt(uint64 result) return CopyString(temp); } -public char * PrintInt64(int64 result) +public char * PrintInt64(int64 result) { char temp[100]; - sprintf(temp, FORMAT64DLL /*"%I64d"*/, result); + if(result > MAXINT || result < MININT) + sprintf(temp, FORMAT64DLL /*"%I64d"*/, result); + else + sprintf(temp, FORMAT64D /*"%I64d"*/, result); return CopyString(temp); } public char * PrintUInt64(uint64 result) { char temp[100]; - if(result > MAXINT64) + if(result > MAXDWORD) sprintf(temp, FORMAT64HEXLL /*"0x%I64XLL"*/, result); + else if(result > MAXINT) + sprintf(temp, FORMAT64HEX /*"0x%I64XLL"*/, result); else - sprintf(temp, FORMAT64DLL /*"%I64d"*/, result); + sprintf(temp, FORMAT64D /*"%I64d"*/, result); return CopyString(temp); } @@ -379,7 +384,7 @@ public char * PrintDouble(double result) return GetOp##name(op2, value2); \ } -// To help the deubugger currently not preprocessing... +// To help the debugger currently not preprocessing... #define HELP(x) x GETVALUE(Int, HELP(int)); @@ -3556,7 +3561,7 @@ bool MatchWithEnums_NameSpace(NameSpace nameSpace, Expression sourceExp, Type de if(MatchTypes(type, dest, &converts, null, null, true, false, false, false, false)) { - NamedLink value; + NamedLink64 value; Class enumClass = eSystem_FindClass(privateModule, "enum"); if(enumClass) { @@ -3580,10 +3585,10 @@ bool MatchWithEnums_NameSpace(NameSpace nameSpace, Expression sourceExp, Type de { char constant[256]; sourceExp.type = constantExp; - if(!strcmp(baseClass.dataTypeString, "int")) - sprintf(constant, "%d",(int)value.data); + if(!strcmp(baseClass.dataTypeString, "int") || !strcmp(baseClass.dataTypeString, "int64") || !strcmp(baseClass.dataTypeString, "short") || !strcmp(baseClass.dataTypeString, "char")) + sprintf(constant, FORMAT64D, value.data); else - sprintf(constant, "0x%X",(int)value.data); + sprintf(constant, FORMAT64HEXLL, value.data); sourceExp.constant = CopyString(constant); //for(;baseClass.base && baseClass.base.type != systemClass; baseClass = baseClass.base); } @@ -4159,7 +4164,7 @@ bool MatchTypeExpression(Expression sourceExp, Type dest, OldList conversions, b { for( ; _class && _class.type == ClassType::enumClass; _class = _class.base) { - NamedLink value; + NamedLink64 value; EnumClassData e = ACCESS_CLASSDATA(_class, enumClass); for(value = e.values.first; value; value = value.next) { @@ -4175,13 +4180,11 @@ bool MatchTypeExpression(Expression sourceExp, Type dest, OldList conversions, b sourceExp.expType = MkClassType(_class.fullName); //if(inCompiler) { - char constant[256]; sourceExp.type = constantExp; - if(/*_class && */_class.dataTypeString && !strcmp(_class.dataTypeString, "int")) // _class cannot be null here! - sprintf(constant, "%d", (int) value.data); + if(_class.dataTypeString && (!strcmp(_class.dataTypeString, "int") || !strcmp(_class.dataTypeString, "int64") || !strcmp(_class.dataTypeString, "short") || !strcmp(_class.dataTypeString, "char"))) // _class cannot be null here! + sourceExp.constant = PrintInt64(value.data); else - sprintf(constant, "0x%X", (int) value.data); - sourceExp.constant = CopyString(constant); + sourceExp.constant = PrintUInt64(value.data); //for(;_class.base && _class.base.type != systemClass; _class = _class.base); } FreeType(dest); @@ -4508,7 +4511,7 @@ public Operand GetOperand(Expression exp) else if(exp.isConstant && exp.type == constantExp) { op.kind = type.kind; - op.type = exp.expType; + op.type = type; switch(op.kind) { @@ -4632,6 +4635,39 @@ public Operand GetOperand(Expression exp) return op; } +static int64 GetEnumValue(Class _class, void * ptr) +{ + int64 v = 0; + switch(_class.typeSize) + { + case 8: + if(!strcmp(_class.dataTypeString, "uint64")) + v = (int64)*(uint64 *)ptr; + else + v = (int64)*(int64 *)ptr; + break; + case 4: + if(!strcmp(_class.dataTypeString, "uint")) + v = (int64)*(uint *)ptr; + else + v = (int64)*(int *)ptr; + break; + case 2: + if(!strcmp(_class.dataTypeString, "uint16")) + v = (int64)*(uint16 *)ptr; + else + v = (int64)*(short *)ptr; + break; + case 1: + if(!strcmp(_class.dataTypeString, "byte")) + v = (int64)*(byte *)ptr; + else + v = (int64)*(char *)ptr; + break; + } + return v; +} + static __attribute__((unused)) void UnusedFunction() { int a; @@ -4670,10 +4706,10 @@ static void PopulateInstanceProcessMember(Instantiation inst, OldList * memberLi if(enumClass) { EnumClassData e = ACCESS_CLASSDATA(_class, enumClass); - NamedLink item; + NamedLink64 item; for(item = e.values.first; item; item = item.next) { - if((int)item.data == *(int *)ptr) + if(item.data == GetEnumValue(_class, ptr)) { result = item.name; break; @@ -4799,10 +4835,10 @@ void PopulateInstance(Instantiation inst) if(enumClass) { EnumClassData e = ACCESS_CLASSDATA(_class, enumClass); - NamedLink item; + NamedLink64 item; for(item = e.values.first; item; item = item.next) { - if((int)item.data == *(int *)ptr) + if(item.data == GetEnumValue(_class, ptr)) { result = item.name; break; @@ -5224,7 +5260,7 @@ void ComputeInstantiation(Expression exp) { BitMember bitMember = (BitMember) dataMember; Type type; - uint64 part; + uint64 part = 0; bits = (bits & ~bitMember.mask); if(!bitMember.dataType) bitMember.dataType = ProcessTypeString(bitMember.dataTypeString, false); @@ -5466,9 +5502,9 @@ void CallOperator(Expression exp, Expression exp1, Expression exp2, Operand op1, void ComputeExpression(Expression exp) { +#ifdef _DEBUG char expString[10240]; expString[0] = '\0'; -#ifdef _DEBUG PrintExpression(exp, expString); #endif @@ -7195,7 +7231,7 @@ static bool ResolveIdWithClass(Expression exp, Class _class, bool skipIDClassChe if(_class && _class.type == enumClass) { - NamedLink value = null; + NamedLink64 value = null; Class enumClass = eSystem_FindClass(privateModule, "enum"); if(enumClass) { @@ -7216,10 +7252,10 @@ static bool ResolveIdWithClass(Expression exp, Class _class, bool skipIDClassChe exp.type = constantExp; exp.isConstant = true; - if(!strcmp(baseClass.dataTypeString, "int")) - sprintf(constant, "%d",(int)value.data); + if(!strcmp(baseClass.dataTypeString, "int") || !strcmp(baseClass.dataTypeString, "int64") || !strcmp(baseClass.dataTypeString, "char") || !strcmp(baseClass.dataTypeString, "short")) + sprintf(constant, FORMAT64D, value.data); else - sprintf(constant, "0x%X",(int)value.data); + sprintf(constant, FORMAT64HEX, value.data); exp.constant = CopyString(constant); //for(;_class.base && _class.base.type != systemClass; _class = _class.base); exp.expType = MkClassType(baseClass.fullName); @@ -11028,10 +11064,10 @@ void ProcessExpressionType(Expression exp) } else { - NamedLink member; + NamedLink64 member; for(member = symbol.type.members.first; member; member = member.next) { - NamedLink value { name = CopyString(member.name) }; + NamedLink64 value { name = CopyString(member.name) }; exp.expType.members.Add(value); } } @@ -12692,7 +12728,7 @@ static void ProcessFunction(FunctionDefinition function) // WAS TRYING THIS FOR CONVERSION PROPERTIES ON NOHEAD CLASSES: if((_class.type == structClass) || function != (FunctionDefinition)symbol.externalSet) if(!function.propertyNoThis) { - TypeName thisParam; + TypeName thisParam = null; if(type.classObjectType != classPointer) { diff --git a/ecere/src/com/dataTypes.ec b/ecere/src/com/dataTypes.ec index cfc0920..1d0553d 100644 --- a/ecere/src/com/dataTypes.ec +++ b/ecere/src/com/dataTypes.ec @@ -193,15 +193,31 @@ public: } }; -/*static */const char * Enum_OnGetString(Class _class, int * data, char * tempString, void * fieldData, bool * needClass) +/*static */const char * Enum_OnGetString(Class _class, void * data, char * tempString, void * fieldData, bool * needClass) { - NamedLink item = null; + NamedLink64 item = null; Class b; + int64 i64Data; + switch(_class.typeSize) + { + case 1: + i64Data = !strcmp(_class.dataTypeString, "byte") ? *(byte *)data : *(char *)data; + break; + case 2: + i64Data = !strcmp(_class.dataTypeString, "uint16") ? *(uint16 *)data : *(short *)data; + break; + case 4: + i64Data = !strcmp(_class.dataTypeString, "uint") ? *(uint *)data : *(int *)data; + break; + case 8: + i64Data = !strcmp(_class.dataTypeString, "uint64") ? *(int64 *)data : *(int64 *)data; + break; + } for(b = _class; !item && b && b.type == enumClass; b = b.base) { EnumClassData enumeration = (EnumClassData)b.data; for(item = enumeration.values.first; item; item = item.next) - if((int)item.data == *data) + if(item.data == i64Data) break; } if(item) @@ -216,9 +232,9 @@ public: return null; } -static bool Enum_OnGetDataFromString(Class _class, int * data, const char * string) +static bool Enum_OnGetDataFromString(Class _class, void * data, const char * string) { - NamedLink item = null; + NamedLink64 item = null; Class b; for(b = _class; !item && b && b.type == enumClass; b = b.base) { @@ -231,11 +247,37 @@ static bool Enum_OnGetDataFromString(Class _class, int * data, const char * stri } if(item) { - *data = (int)item.data; + switch(_class.typeSize) + { + case 1: + if(!strcmp(_class.dataTypeString, "byte")) + *(byte *)data = (byte)item.data; + else + *(char *)data = (char)item.data; + break; + case 2: + if(!strcmp(_class.dataTypeString, "uint16")) + *(uint16 *)data = (uint16)item.data; + else + *(short *)data = (short)item.data; + break; + case 4: + if(!strcmp(_class.dataTypeString, "uint")) + *(uint *)data = (uint)item.data; + else + *(int *)data = (int)item.data; + break; + case 8: + if(!strcmp(_class.dataTypeString, "uint64")) + *(uint64 *)data = *(uint64 *)&item.data; + else + *(int64 *)data = item.data; + break; + } return true; } else - return Integer_OnGetDataFromString(_class, data, string); + return Int64_OnGetDataFromString(_class, data, string); return false; } @@ -776,7 +818,7 @@ static bool OnGetDataFromString(Class _class, void ** data, const char * string) bool result; Module module = _class.module; if(_class.type == enumClass) - result = Enum_OnGetDataFromString(_class, (int *)data, string); + result = Enum_OnGetDataFromString(_class, (int64 *)data, string); else if(_class.type == unitClass) { Class dataType; diff --git a/ecere/src/com/instance.ec b/ecere/src/com/instance.ec index a64d80a..de33aea 100644 --- a/ecere/src/com/instance.ec +++ b/ecere/src/com/instance.ec @@ -601,7 +601,7 @@ public class EnumClassData : struct public: class_fixed OldList values; - int largest; + int64 largest; }; class Watcher : struct @@ -2668,6 +2668,7 @@ public dllexport Class eSystem_RegisterClass(ClassType type, const char * name, else if(!strcmp(name, "ecere::sys::OldList")) size = 0; // 32 else if(!strcmp(name, "ecere::sys::Item")) size = 0; else if(!strcmp(name, "ecere::sys::NamedLink")) size = 0; + else if(!strcmp(name, "ecere::sys::NamedLink64")) size = 0; else if(!strcmp(name, "ecere::sys::OldLink")) size = 0; else if(!strcmp(name, "ecere::sys::NamedItem")) size = 0; else if(!strcmp(name, "ecere::sys::NamedItem64")) size = 0; @@ -2787,7 +2788,7 @@ static void DataMember_Free(DataMember parentMember) } } -static void FreeEnumValue(NamedLink value) +static void FreeEnumValue(NamedLink64 value) { delete value.name; } @@ -5456,38 +5457,38 @@ public dllexport void eModule_Unload(Module fromModule, Module module) } } -public dllexport void eEnum_AddFixedValue(Class _class, const char * string, int value) +public dllexport void eEnum_AddFixedValue(Class _class, const char * string, int64 value) { if(_class && _class.type == enumClass) { EnumClassData data = (EnumClassData)_class.data; - NamedLink item; + NamedLink64 item; for(item = data.values.first; item; item = item.next) if(!strcmp(item.name, string)) break; if(!item) { - data.values.Add(NamedLink { data = (void *)value, name = CopyString(string) }); + data.values.Add(NamedLink64 { data = value, name = CopyString(string) }); if(value > data.largest) data.largest = value; } } } -public dllexport int eEnum_AddValue(Class _class, const char * string) +public dllexport int64 eEnum_AddValue(Class _class, const char * string) { if(_class && _class.type == enumClass) { EnumClassData data = (EnumClassData)_class.data; - int value = ((int) data.largest) + 1; - NamedLink item; + int64 value = data.largest + 1; + NamedLink64 item; for(item = data.values.first; item; item = item.next) if(!strcmp(item.name, string)) break; if(!item) { - data.values.Add(NamedLink { data = (void *)value, name = CopyString(string) }); + data.values.Add(NamedLink64 { data = value, name = CopyString(string) }); if(value > data.largest) data.largest = value; return value; @@ -6199,6 +6200,9 @@ static void LoadCOM(Module module) eSystem_RegisterFunction("qsort", "void qsort(void *, uintsize, uintsize, int (*)(void *, void *))", qsort, module, baseSystemAccess); eSystem_RegisterFunction("strtod", "double strtod(const char*, char**)", strtod, module, baseSystemAccess); eSystem_RegisterFunction("strtol", "int strtol(const char*, char**, int base)", strtol, module, baseSystemAccess); + eSystem_RegisterFunction("strtoul", "unsigned long strtoul(const char * nptr, char ** endptr, int base)", strtoul, module, baseSystemAccess); + eSystem_RegisterFunction("strtoll", "int64 strtoll(const char * nptr, char ** endptr, int base)", strtoll, module, baseSystemAccess); + eSystem_RegisterFunction("strtoull", "uint64 strtoull(const char * nptr, char ** endptr, int base)", strtoull, module, baseSystemAccess); eSystem_RegisterFunction("system", "int system(const char*)", system, module, baseSystemAccess); eSystem_RegisterFunction("atoi", "int atoi(const char*)", atoi, module, baseSystemAccess); eSystem_RegisterFunction("atof", "double atof(const char*)", atof, module, baseSystemAccess); @@ -6261,9 +6265,6 @@ static void LoadCOM(Module module) eSystem_RegisterFunction("islower", "int islower(int c)", islower, module, baseSystemAccess); eSystem_RegisterFunction("isupper", "int isupper(int c)", isupper, module, baseSystemAccess); eSystem_RegisterFunction("isprint", "int isprint(int c)", isprint, module, baseSystemAccess); - eSystem_RegisterFunction("strtoul", "unsigned long strtoul(const char * nptr, char ** endptr, int base)", strtoul, module, baseSystemAccess); - eSystem_RegisterFunction("strtoll", "int64 strtoll(const char * nptr, char ** endptr, int base)", strtoul, module, baseSystemAccess); - eSystem_RegisterFunction("strtoull", "uint64 strtoull(const char * nptr, char ** endptr, int base)", strtoul, module, baseSystemAccess); } diff --git a/ecere/src/gfx/Color.ec b/ecere/src/gfx/Color.ec index dd09af8..6b1deee 100644 --- a/ecere/src/gfx/Color.ec +++ b/ecere/src/gfx/Color.ec @@ -778,7 +778,7 @@ private class ColorValue : Color pullDown.Create(); { - NamedLink item; + NamedLink64 item; bool found = false; DataRow currentRow = null; @@ -802,7 +802,7 @@ private class ColorValue : Color } { bool found = false; - NamedLink item; + NamedLink64 item; DataRow currentRow = null; system.Clear(); diff --git a/ecere/src/gui/typeEdit.ec b/ecere/src/gui/typeEdit.ec index 4275254..7451639 100644 --- a/ecere/src/gui/typeEdit.ec +++ b/ecere/src/gui/typeEdit.ec @@ -38,7 +38,7 @@ private: int x, int y, int w, int h, void * userData) { Enumeration enumeration = _class.data; - NamedLink item; + NamedLink64 item; DropBox dropBox { window, master = master, @@ -68,8 +68,8 @@ private: for(item = enumeration.values.first; item; item = item.next) { DataRow row = dropBox.AddRow(); - row.SetData(null, (uint)item.data); //name); - if(data && (int)item.data == *data) + row.SetData(null, item.data); //name); + if(data && item.data == *data) dropBox.currentRow = row; } } diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec index eed9c61..6feb9e0 100644 --- a/ide/src/debugger/Debugger.ec +++ b/ide/src/debugger/Debugger.ec @@ -3126,12 +3126,21 @@ class Debugger else if(wh.type && wh.type.kind == classType && wh.type._class && wh.type._class.registered && wh.type._class.registered.type == enumClass) { - uint64 value = strtoul(exp.constant, null, 0); Class enumClass = eSystem_FindClass(GetPrivateModule(), wh.type._class.registered.name); EnumClassData enumeration = (EnumClassData)enumClass.data; - NamedLink item; + NamedLink64 item; + int64 value; + + if(!strcmp(enumClass.dataTypeString, "uint64")) + { + uint64 v = strtoull(exp.constant, null, 0); + value = *(int64*)&v; + } + else + value = strtoll(exp.constant, null, 0); + for(item = enumeration.values.first; item; item = item.next) - if((int)item.data == value) + if(item.data == value) break; if(item) wh.value = CopyString(item.name); diff --git a/ide/src/designer/CodeEditor.ec b/ide/src/designer/CodeEditor.ec index 6cd1c20..ae6b37c 100644 --- a/ide/src/designer/CodeEditor.ec +++ b/ide/src/designer/CodeEditor.ec @@ -387,6 +387,39 @@ void GetLocText(EditBox editBox, File f, int position, Location loc, char ** tex f.Printf(""); // Make the stream point to where the editbox is } +static int64 GetI64EnumValue(Class dataType, DataValue dataForm) +{ + int64 i64Value = 0; + switch(dataType.typeSize) + { + case 1: + if(!strcmp(dataType.dataTypeString, "byte")) + i64Value = dataForm.uc; + else + i64Value = dataForm.c; + break; + case 2: + if(!strcmp(dataType.dataTypeString, "uint16")) + i64Value = dataForm.us; + else + i64Value = dataForm.s; + break; + case 4: + if(!strcmp(dataType.dataTypeString, "uint")) + i64Value = dataForm.ui; + else + i64Value = dataForm.i; + break; + case 8: + if(!strcmp(dataType.dataTypeString, "uint64")) + i64Value = *(int64 *)&dataForm.ui64; + else + i64Value = dataForm.i64; + break; + } + return i64Value; +} + void Code_FixProperty(Property prop, Instance object) { Designer::FixProperty(prop, object); @@ -3810,13 +3843,14 @@ class CodeEditor : Window if(dataType.type == enumClass) { - NamedLink value; + NamedLink64 value; Class enumClass = eSystem_FindClass(privateModule, "enum"); EnumClassData e = ACCESS_CLASSDATA(dataType, enumClass); + int64 i64Value = GetI64EnumValue(dataType, dataForm); for(value = e.values.first; value; value = value.next) { - if((int)value.data == dataForm.i) + if(value.data == i64Value) { string = value.name; break; @@ -4536,13 +4570,14 @@ class CodeEditor : Window bool needClass = true; if(dataType.type == enumClass) { - NamedLink value; + NamedLink64 value; Class enumClass = eSystem_FindClass(privateModule, "enum"); EnumClassData e = ACCESS_CLASSDATA(dataType, enumClass); + int64 i64Value = GetI64EnumValue(dataType, dataForm); for(value = e.values.first; value; value = value.next) { - if((int)value.data == dataForm.i) + if(value.data == i64Value) { string = value.name; break; -- 1.8.3.1