wip II

[sdk] / compiler / bootstrap / ecere / bootstrap / File.c

diff --git a/compiler/bootstrap/ecere/bootstrap/File.c b/compiler/bootstrap/ecere/bootstrap/File.c
index 77834e6..bc85713 100644 (file)
--- a/compiler/bootstrap/ecere/bootstrap/File.c
+++ b/compiler/bootstrap/ecere/bootstrap/File.c
@@ -1,3 +1,4 @@
+/* Code generated from eC source file: File.ec */
 #if defined(__GNUC__)
 typedef long long int64;
 typedef unsigned long long uint64;
@@ -30,7 +31,7 @@ typedef unsigned __int64 uint64;
 #include <stdint.h>
 #include <sys/types.h>
 
-#if defined(_W64) || (defined(__WORDSIZE) && __WORDSIZE == 8) || defined(__x86_64__)
+#if /*defined(_W64) || */(defined(__WORDSIZE) && __WORDSIZE == 8) || defined(__x86_64__)
 #define _64BIT 1
 #else
 #define _64BIT 0
@@ -128,6 +129,8 @@ struct __ecereNameSpace__ecere__com__ClassTemplateArgument *  templateArgs;
 struct __ecereNameSpace__ecere__com__Class * templateClass;
 struct __ecereNameSpace__ecere__sys__OldList templatized;
 int numParams;
+unsigned int isInstanceClass;
+unsigned int byValueSystemClass;
 } __attribute__ ((gcc_struct));
 
 extern long long __ecereNameSpace__ecere__com__eClass_GetProperty(struct __ecereNameSpace__ecere__com__Class * _class, char *  name);
@@ -352,11 +355,11 @@ int __ecereMethod___ecereNameSpace__ecere__sys__FileSize_OnCompare(struct __ecer
 {
 int result = 0;
 
-if(&(*(this)) && &(*(data2)))
+if(&(*this) && &(*data2))
 {
-if((*(this)) > (*(data2)))
+if((*this) > (*data2))
 result = 1;
-else if((*(this)) < (*(data2)))
+else if((*this) < (*data2))
 result = -1;
 }
 return result;
@@ -386,7 +389,7 @@ else if(strstr(end, "MB") || strstr(end, "mb"))
 multiplier = (unsigned int)1024 * 1024;
 else if(strstr(end, "KB") || strstr(end, "kb"))
 multiplier = 1024;
-(*(this)) = (unsigned int)((double)multiplier * value);
+(*this) = (unsigned int)((double)multiplier * value);
 return 0x1;
 }
 
@@ -396,11 +399,11 @@ int __ecereMethod___ecereNameSpace__ecere__sys__FileSize64_OnCompare(struct __ec
 {
 int result = 0;
 
-if(&(*(this)) && &(*(data2)))
+if(&(*this) && &(*data2))
 {
-if((*(this)) > (*(data2)))
+if((*this) > (*data2))
 result = 1;
-else if((*(this)) < (*(data2)))
+else if((*this) < (*data2))
 result = -1;
 }
 return result;
@@ -430,7 +433,7 @@ else if(strstr(end, "MB") || strstr(end, "mb"))
 multiplier = (uint64)1024 * 1024;
 else if(strstr(end, "KB") || strstr(end, "kb"))
 multiplier = 1024;
-(*(this)) = (uint64)((double)multiplier * value);
+(*this) = (uint64)((double)multiplier * value);
 return 0x1;
 }
 
@@ -523,7 +526,7 @@ struct __ecereNameSpace__ecere__sys__File * __ecerePointer___ecereNameSpace__ece
 
 if(!string[0])
 {
-(*(this)) = (((void *)0));
+(*this) = (((void *)0));
 return 0x1;
 }
 else
@@ -532,13 +535,13 @@ struct __ecereNameSpace__ecere__com__Instance * f = __ecereNameSpace__ecere__sys
 
 if(f)
 {
-(*(this)) = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
+(*this) = __ecereNameSpace__ecere__com__eInstance_New(__ecereClass___ecereNameSpace__ecere__sys__TempFile);
 while(!((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *))f->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Eof])(f))
 {
 unsigned char buffer[4096];
 unsigned int read = ((int (*)(struct __ecereNameSpace__ecere__com__Instance *, void *  buffer, unsigned int size, unsigned int count))f->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Read])(f, buffer, 1, sizeof buffer);
 
-((int (*)(struct __ecereNameSpace__ecere__com__Instance *, void *  buffer, unsigned int size, unsigned int count))((*(this)))->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write])((*(this)), buffer, 1, read);
+((int (*)(struct __ecereNameSpace__ecere__com__Instance *, void *  buffer, unsigned int size, unsigned int count))((*this))->_vTbl[__ecereVMethodID___ecereNameSpace__ecere__sys__File_Write])((*this), buffer, 1, read);
 }
 (__ecereNameSpace__ecere__com__eInstance_DecRef(f), f = 0);
 return 0x1;
@@ -585,7 +588,7 @@ unsigned int __ecereMethod___ecereNameSpace__ecere__sys__File_Tell(struct __ecer
 {
 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 ? ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->input) : ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->output);
+return (unsigned int)(__ecerePointer___ecereNameSpace__ecere__sys__File->input ? ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->input) : ftell(__ecerePointer___ecereNameSpace__ecere__sys__File->output));
 }
 
 int __ecereMethod___ecereNameSpace__ecere__sys__File_Read(struct __ecereNameSpace__ecere__com__Instance * this, void * buffer, unsigned int size, unsigned int count)
@@ -1046,7 +1049,7 @@ char archiveName[797], * archiveFile;
 
 if(strstr(fileName, "File://") == fileName)
 {
-result = (struct __ecereNameSpace__ecere__com__Instance *)strtoul(fileName + 7, (((void *)0)), 16);
+result = (struct __ecereNameSpace__ecere__com__Instance *)(uintptr_t)strtoull(fileName + 7, (((void *)0)), 16);
 if(result)
 {
 if(((struct __ecereNameSpace__ecere__com__Instance *)(char *)result)->_class && __ecereNameSpace__ecere__com__eClass_IsDerived(((struct __ecereNameSpace__ecere__com__Instance *)(char *)result)->_class, __ecereClass___ecereNameSpace__ecere__sys__File))
@@ -1202,7 +1205,7 @@ int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Unlock;
 
 int __ecereVMethodID___ecereNameSpace__ecere__sys__File_Close;
 
-extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_RegisterClass(int type, char *  name, char *  baseName, int size, int sizeClass, unsigned int (* )(void * ), void (* )(void * ), struct __ecereNameSpace__ecere__com__Instance * module, int declMode, int inheritanceAccess);
+extern struct __ecereNameSpace__ecere__com__Class * __ecereNameSpace__ecere__com__eSystem_RegisterClass(int type, char *  name, char *  baseName, int size, int sizeClass, unsigned int (*  Constructor)(void * ), void (*  Destructor)(void * ), struct __ecereNameSpace__ecere__com__Instance * module, int declMode, int inheritanceAccess);
 
 extern struct __ecereNameSpace__ecere__com__Class * __ecereClass___ecereNameSpace__ecere__com__NameSpace;