ecere: Resolved error codes conflicts

diff --git a/compiler/bootstrap/ecere/bootstrap/System.c b/compiler/bootstrap/ecere/bootstrap/System.c
index cbe45a3..28efb44 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/System.c
+++ b/compiler/bootstrap/ecere/bootstrap/System.c
@@ -369,10 +369,10 @@ static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpac
 
 static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__ErrorCode;
 
-static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__GuiErrorCode;
-
 static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__SysErrorCode;
 
+static struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__sys__GuiErrorCode;
+
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__Array;
 
@@ -744,13 +744,6 @@ if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize
 __ecereClass___ecereNameSpace__ecere__sys__ErrorCode = class;
 __ecereNameSpace__ecere__com__eClass_AddBitMember(class, "level", "ecere::sys::ErrorLevel", 2, 12, 1);
 __ecereNameSpace__ecere__com__eClass_AddBitMember(class, "code", "uint", 12, 0, 1);
-class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(4, "ecere::sys::GuiErrorCode", "ecere::sys::ErrorCode", 0, 0, 0, 0, module, 1, 1);
-if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
-__ecereClass___ecereNameSpace__ecere__sys__GuiErrorCode = class;
-__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "driverNotSupported", 1);
-__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "windowCreationFailed", 2);
-__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "graphicsLoadingFailed", 3);
-__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "modeSwitchFailed", 4);
 class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(4, "ecere::sys::SysErrorCode", "ecere::sys::ErrorCode", 0, 0, 0, 0, module, 1, 1);
 if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
 __ecereClass___ecereNameSpace__ecere__sys__SysErrorCode = class;
@@ -760,6 +753,13 @@ __ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "nameExists", 4099);
 __ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "missingLibrary", 4100);
 __ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "fileNotFound", 12293);
 __ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "writeFailed", 8198);
+class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(4, "ecere::sys::GuiErrorCode", "ecere::sys::ErrorCode", 0, 0, 0, 0, module, 1, 1);
+if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + structSize_Instance)))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + structSize_Instance)))->application && class)
+__ecereClass___ecereNameSpace__ecere__sys__GuiErrorCode = class;
+__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "driverNotSupported", 4097);
+__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "windowCreationFailed", 4098);
+__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "graphicsLoadingFailed", 4099);
+__ecereNameSpace__ecere__com__eEnum_AddFixedValue(class, "modeSwitchFailed", 4100);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::MoveFile", "bool ecere::sys::MoveFile(char * source, char * dest)", __ecereNameSpace__ecere__sys__MoveFile, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::RenameFile", "bool ecere::sys::RenameFile(char * oldName, char * newName)", __ecereNameSpace__ecere__sys__RenameFile, module, 1);
 __ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::DeleteFile", "bool ecere::sys::DeleteFile(char * fileName)", __ecereNameSpace__ecere__sys__DeleteFile, module, 1);

diff --git a/ecere/src/sys/System.ec b/ecere/src/sys/System.ec
index d90fc90..879ec18 100644 (file)
--- a/ecere/src/sys/System.ec
+++ b/ecere/src/sys/System.ec
@@ -96,22 +96,22 @@ public:
 };
 
 // TODO: Support enums resolved in compiling pass to allow moving this to GuiApplication.ec
-public enum GuiErrorCode : ErrorCode
+public enum SysErrorCode : ErrorCode
 {
-   driverNotSupported      = ErrorCode { veryFatal, 1 },
-   windowCreationFailed    = ErrorCode { veryFatal, 2 },
-   graphicsLoadingFailed   = ErrorCode { veryFatal, 3 },
-   modeSwitchFailed        = ErrorCode { veryFatal, 4 }
+   allocationFailed = ErrorCode { fatal, 0x0001 },
+   nameInexistant   = ErrorCode { fatal, 0x0002 },
+   nameExists       = ErrorCode { fatal, 0x0003 },
+   missingLibrary   = ErrorCode { fatal, 0x0004 },
+   fileNotFound     = ErrorCode { minor, 0x0005 },
+   writeFailed      = ErrorCode { major, 0x0006 }
 };
 
-public enum SysErrorCode : ErrorCode
+public enum GuiErrorCode : ErrorCode
 {
-   allocationFailed = ErrorCode { fatal, 1 },
-   nameInexistant   = ErrorCode { fatal, 2 },
-   nameExists       = ErrorCode { fatal, 3 },
-   missingLibrary   = ErrorCode { fatal, 4 },
-   fileNotFound     = ErrorCode { minor, 5 },
-   writeFailed      = ErrorCode { major, 6 }
+   driverNotSupported      = ErrorCode { veryFatal, 0x1001 },
+   windowCreationFailed    = ErrorCode { veryFatal, 0x1002 },
+   graphicsLoadingFailed   = ErrorCode { veryFatal, 0x1003 },
+   modeSwitchFailed        = ErrorCode { veryFatal, 0x1004 }
 };
 
 static define DEFAULT_BUFFER_SIZE = 100 * MAX_F_STRING;