projects/ldc: dmd2/root/root.c annotate

annotate dmd2/root/root.c @ 1650:40bd4a0d4870

Update to work with LLVM 2.7. Removed use of dyn_cast, llvm no compiles without exceptions and rtti by default. We do need exceptions for the libconfig stuff, but rtti isn't necessary (anymore). Debug info needs to be rewritten, as in LLVM 2.7 the format has completely changed. To have something to look at while rewriting, the old code has been wrapped inside #ifndef DISABLE_DEBUG_INFO , this means that you have to define this to compile at the moment. Updated tango 0.99.9 patch to include updated EH runtime code, which is needed for LLVM 2.7 as well.

author	Tomas Lindquist Olsen
date	Wed, 19 May 2010 12:42:32 +0200
parents	e4f7b5d9c68a
children

rev	line source
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	2 // Copyright (c) 1999-2009 by Digital Mars
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	3 // All Rights Reserved
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	4 // written by Walter Bright
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	5 // www.digitalmars.com
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	6 // License for redistribution is by either the Artistic License
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	7 // in artistic.txt, or the GNU General Public License in gnu.txt.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	8 // See the included readme.txt for details.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	9
1460 a1666b613c15 * Fix some gcc warnings in the D2 frontend code. Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	10 #ifndef POSIX
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	11 #define POSIX (linux \|\| __APPLE__ \|\| __FreeBSD__ \|\| __sun&&__SVR4)
1460 a1666b613c15 * Fix some gcc warnings in the D2 frontend code. Frits van Bommel <fvbommel wxs.nl> parents: 1452 diff changeset	12 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	13
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	14 #include <stdio.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	15 #include <stdlib.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	16 #include <stdarg.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	17 #include <string.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	18 #include <stdint.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	19 #include <assert.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	20
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	21 #if (defined (__SVR4) && defined (__sun))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	22 #include <alloca.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	23 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	24
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	25 #if _MSC_VER \|\|__MINGW32__
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	26 #include <malloc.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	27 #include <string>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	28 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	29
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	30 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	31 #include <windows.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	32 #include <direct.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	33 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	34
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	35 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	36 #include <sys/types.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	37 #include <sys/stat.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	38 #include <fcntl.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	39 #include <errno.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	40 #include <unistd.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	41 #include <utime.h>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	42 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	43
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	44 #include "port.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	45 #include "root.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	46 #include "dchar.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	47 #include "rmem.h"
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	48
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	49 #if 0 //__SC__ //def DEBUG
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	50 extern "C" void __cdecl _assert(void e, void f, unsigned line)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	51 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	52 printf("Assert('%s','%s',%d)\n",e,f,line);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	53 fflush(stdout);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	54 (char )0 = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	55 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	56 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	57
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	58
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	59 /*************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	60 * Convert wchar string to ascii string.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	61 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	62
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	63 char wchar2ascii(wchar_t us)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	64 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	65 return wchar2ascii(us, wcslen(us));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	66 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	67
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	68 char wchar2ascii(wchar_t us, unsigned len)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	69 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	70 unsigned i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	71 char *p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	72
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	73 p = (char *)mem.malloc(len + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	74 for (i = 0; i <= len; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	75 p[i] = (char) us[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	76 return p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	77 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	78
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	79 int wcharIsAscii(wchar_t *us)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	80 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	81 return wcharIsAscii(us, wcslen(us));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	82 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	83
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	84 int wcharIsAscii(wchar_t *us, unsigned len)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	85 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	86 unsigned i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	87
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	88 for (i = 0; i <= len; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	89 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	90 if (us[i] & ~0xFF) // if high bits set
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	91 return 0; // it's not ascii
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	92 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	93 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	94 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	95
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	96
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	97 /***********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	98 * Compare length-prefixed strings (bstr).
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	99 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	100
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	101 int bstrcmp(unsigned char b1, unsigned char b2)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	102 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	103 return (b1 == b2 && memcmp(b1 + 1, b2 + 1, *b2) == 0) ? 0 : 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	104 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	105
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	106 /***************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	107 * Convert bstr into a malloc'd string.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	108 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	109
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	110 char bstr2str(unsigned char b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	111 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	112 char *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	113 unsigned len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	114
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	115 len = *b;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	116 s = (char *) mem.malloc(len + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	117 s[len] = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	118 return (char *)memcpy(s,b + 1,len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	119 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	120
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	121 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	122 * Print error message and exit.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	123 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	124
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	125 void error(const char *format, ...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	126 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	127 va_list ap;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	128
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	129 va_start(ap, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	130 printf("Error: ");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	131 vprintf(format, ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	132 va_end( ap );
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	133 printf("\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	134 fflush(stdout);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	135
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	136 exit(EXIT_FAILURE);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	137 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	138
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	139 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	140 void error(const dchar *format, ...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	141 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	142 va_list ap;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	143
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	144 va_start(ap, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	145 printf("Error: ");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	146 vwprintf(format, ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	147 va_end( ap );
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	148 printf("\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	149 fflush(stdout);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	150
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	151 exit(EXIT_FAILURE);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	152 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	153 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	154
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	155 void error_mem()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	156 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	157 error("out of memory");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	158 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	159
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	160 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	161 * Print warning message.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	162 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	163
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	164 void warning(const char *format, ...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	165 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	166 va_list ap;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	167
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	168 va_start(ap, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	169 printf("Warning: ");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	170 vprintf(format, ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	171 va_end( ap );
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	172 printf("\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	173 fflush(stdout);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	174 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	175
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	176 /**************************** Object ******************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	177
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	178 int Object::equals(Object *o)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	179 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	180 return o == this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	181 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	182
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	183 hash_t Object::hashCode()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	184 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	185 return (hash_t) this;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	186 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	187
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	188 int Object::compare(Object *obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	189 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	190 return this - obj;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	191 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	192
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	193 void Object::print()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	194 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	195 printf("%s %p\n", toChars(), this);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	196 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	197
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	198 char *Object::toChars()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	199 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	200 return (char *)"Object";
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	201 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	202
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	203 dchar *Object::toDchars()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	204 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	205 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	206 return L"Object";
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	207 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	208 return toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	209 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	210 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	211
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	212 int Object::dyncast()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	213 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	214 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	215 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	216
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	217 void Object::toBuffer(OutBuffer *b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	218 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	219 b->writestring("Object");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	220 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	221
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	222 void Object::mark()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	223 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	224 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	225
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	226 /**************************** String ******************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	227
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	228 String::String(char *str, int ref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	229 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	230 this->str = ref ? str : mem.strdup(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	231 this->ref = ref;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	232 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	233
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	234 String::~String()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	235 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	236 mem.free(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	237 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	238
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	239 void String::mark()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	240 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	241 mem.mark(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	242 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	243
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	244 hash_t String::calcHash(const char *str, size_t len)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	245 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	246 hash_t hash = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	247
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	248 for (;;)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	249 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	250 switch (len)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	251 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	252 case 0:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	253 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	254
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	255 case 1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	256 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	257 hash += (uint8_t )str;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	258 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	259
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	260 case 2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	261 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	262 hash += (uint16_t )str;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	263 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	264
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	265 case 3:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	266 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	267 hash += ((uint16_t )str << 8) +
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	268 ((uint8_t *)str)[2];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	269 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	270
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	271 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	272 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	273 hash += (uint32_t )str;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	274 str += 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	275 len -= 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	276 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	277 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	278 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	279 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	280
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	281 hash_t String::calcHash(const char *str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	282 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	283 return calcHash(str, strlen(str));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	284 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	285
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	286 hash_t String::hashCode()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	287 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	288 return calcHash(str, strlen(str));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	289 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	290
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	291 unsigned String::len()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	292 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	293 return strlen(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	294 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	295
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	296 int String::equals(Object *obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	297 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	298 return strcmp(str,((String *)obj)->str) == 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	299 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	300
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	301 int String::compare(Object *obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	302 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	303 return strcmp(str,((String *)obj)->str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	304 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	305
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	306 char *String::toChars()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	307 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	308 return str;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	309 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	310
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	311 void String::print()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	312 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	313 printf("String '%s'\n",str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	314 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	315
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	316
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	317 /**************************** FileName ******************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	318
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	319 FileName::FileName(char *str, int ref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	320 : String(str,ref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	321 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	322 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	323
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	324 char FileName::combine(const char path, const char *name)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	325 { char *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	326 size_t pathlen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	327 size_t namelen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	328
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	329 if (!path \|\| !*path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	330 return (char *)name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	331 pathlen = strlen(path);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	332 namelen = strlen(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	333 f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	334 memcpy(f, path, pathlen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	335 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	336 if (path[pathlen - 1] != '/')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	337 { f[pathlen] = '/';
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	338 pathlen++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	339 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	340 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	341 if (path[pathlen - 1] != '\\' &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	342 path[pathlen - 1] != '/' &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	343 path[pathlen - 1] != ':')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	344 { f[pathlen] = '\\';
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	345 pathlen++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	346 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	347 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	348 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	349 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	350 memcpy(f + pathlen, name, namelen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	351 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	352 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	353
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	354 FileName::FileName(char path, char name)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	355 : String(combine(path,name),1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	356 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	357 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	358
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	359 // Split a path into an Array of paths
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	360 Array FileName::splitPath(const char path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	361 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	362 char c = 0; // unnecessary initializer is for VC /W4
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	363 const char *p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	364 OutBuffer buf;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	365 Array *array;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	366
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	367 array = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	368 if (path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	369 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	370 p = path;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	371 do
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	372 { char instring = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	373
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	374 while (isspace(*p)) // skip leading whitespace
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	375 p++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	376 buf.reserve(strlen(p) + 1); // guess size of path
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	377 for (; ; p++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	378 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	379 c = *p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	380 switch (c)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	381 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	382 case '"':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	383 instring ^= 1; // toggle inside/outside of string
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	384 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	385
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	386 #if MACINTOSH
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	387 case ',':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	388 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	389 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	390 case ';':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	391 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	392 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	393 case ':':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	394 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	395 p++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	396 break; // note that ; cannot appear as part
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	397 // of a path, quotes won't protect it
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	398
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	399 case 0x1A: // ^Z means end of file
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	400 case 0:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	401 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	402
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	403 case '\r':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	404 continue; // ignore carriage returns
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	405
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	406 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	407 case '~':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	408 buf.writestring(getenv("HOME"));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	409 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	410 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	411
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1460 diff changeset	412 #if 0
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	413 case ' ':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	414 case '\t': // tabs in filenames?
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	415 if (!instring) // if not in string
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	416 break; // treat as end of path
1577 e4f7b5d9c68a DMD 2.032 Merge. Robert Clipsham <robert@octarineparrot.com> parents: 1460 diff changeset	417 #endif
1452 638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	418 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	419 buf.writeByte(c);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	420 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	421 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	422 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	423 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	424 if (buf.offset) // if path is not empty
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	425 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	426 buf.writeByte(0); // to asciiz
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	427 array->push(buf.extractData());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	428 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	429 } while (c);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	430 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	431 return array;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	432 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	433
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	434 hash_t FileName::hashCode()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	435 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	436 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	437 // We need a different hashCode because it must be case-insensitive
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	438 size_t len = strlen(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	439 hash_t hash = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	440 unsigned char s = (unsigned char )str;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	441
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	442 for (;;)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	443 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	444 switch (len)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	445 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	446 case 0:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	447 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	448
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	449 case 1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	450 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	451 hash += (uint8_t )s \| 0x20;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	452 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	453
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	454 case 2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	455 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	456 hash += (uint16_t )s \| 0x2020;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	457 return hash;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	458
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	459 case 3:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	460 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	461 hash += (((uint16_t )s << 8) +
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	462 ((uint8_t *)s)[2]) \| 0x202020;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	463 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	464
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	465 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	466 hash *= 37;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	467 hash += (uint32_t )s \| 0x20202020;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	468 s += 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	469 len -= 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	470 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	471 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	472 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	473 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	474 // darwin HFS is case insensitive, though...
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	475 return String::hashCode();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	476 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	477 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	478
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	479 int FileName::compare(Object *obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	480 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	481 return compare(str, ((FileName *)obj)->str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	482 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	483
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	484 int FileName::compare(const char name1, const char name2)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	485 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	486 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	487 return stricmp(name1, name2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	488 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	489 return strcmp(name1, name2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	490 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	491 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	492
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	493 int FileName::equals(Object *obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	494 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	495 return compare(obj) == 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	496 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	497
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	498 int FileName::equals(const char name1, const char name2)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	499 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	500 return compare(name1, name2) == 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	501 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	502
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	503 /************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	504 * Return !=0 if absolute path name.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	505 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	506
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	507 int FileName::absolute(const char *name)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	508 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	509 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	510 return (*name == '\\') \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	511 (*name == '/') \|\|
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	512 (*name && name[1] == ':');
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	513 #elif POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	514 return (*name == '/');
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	515 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	516 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	517 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	518 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	519
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	520 /********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	521 * Return filename extension (read-only).
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	522 * Points past '.' of extension.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	523 * If there isn't one, return NULL.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	524 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	525
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	526 char FileName::ext(const char str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	527 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	528 char *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	529 size_t len = strlen(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	530
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	531 e = (char *)str + len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	532 for (;;)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	533 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	534 switch (*e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	535 { case '.':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	536 return e + 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	537 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	538 case '/':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	539 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	540 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	541 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	542 case '\\':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	543 case ':':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	544 case '/':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	545 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	546 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	547 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	548 if (e == str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	549 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	550 e--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	551 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	552 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	553 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	554 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	555 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	556
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	557 char *FileName::ext()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	558 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	559 return ext(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	560 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	561
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	562 /********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	563 * Return mem.malloc'd filename with extension removed.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	564 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	565
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	566 char FileName::removeExt(const char str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	567 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	568 const char *e = ext(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	569 if (e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	570 { size_t len = (e - str) - 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	571 char n = (char )mem.malloc(len + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	572 memcpy(n, str, len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	573 n[len] = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	574 return n;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	575 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	576 return mem.strdup(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	577 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	578
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	579 /********************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	580 * Return filename name excluding path (read-only).
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	581 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	582
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	583 char FileName::name(const char str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	584 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	585 char *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	586 size_t len = strlen(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	587
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	588 e = (char *)str + len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	589 for (;;)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	590 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	591 switch (*e)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	592 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	593 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	594 case '/':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	595 return e + 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	596 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	597 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	598 case '/':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	599 case '\\':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	600 return e + 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	601 case ':':
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	602 /* The ':' is a drive letter only if it is the second
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	603 * character or the last character,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	604 * otherwise it is an ADS (Alternate Data Stream) separator.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	605 * Consider ADS separators as part of the file name.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	606 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	607 if (e == str + 1 \|\| e == str + len - 1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	608 return e + 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	609 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	610 default:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	611 if (e == str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	612 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	613 e--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	614 continue;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	615 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	616 return e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	617 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	618 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	619
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	620 char *FileName::name()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	621 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	622 return name(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	623 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	624
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	625 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	626 * Return path portion of str.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	627 * Path will does not include trailing path separator.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	628 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	629
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	630 char FileName::path(const char str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	631 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	632 char *n = name(str);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	633 char *path;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	634 size_t pathlen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	635
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	636 if (n > str)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	637 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	638 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	639 if (n[-1] == '/')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	640 n--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	641 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	642 if (n[-1] == '\\' \|\| n[-1] == '/')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	643 n--;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	644 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	645 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	646 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	647 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	648 pathlen = n - str;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	649 path = (char *)mem.malloc(pathlen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	650 memcpy(path, str, pathlen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	651 path[pathlen] = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	652 return path;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	653 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	654
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	655 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	656 * Replace filename portion of path.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	657 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	658
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	659 const char FileName::replaceName(const char path, const char *name)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	660 { char *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	661 char *n;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	662 size_t pathlen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	663 size_t namelen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	664
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	665 if (absolute(name))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	666 return name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	667
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	668 n = FileName::name(path);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	669 if (n == path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	670 return name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	671 pathlen = n - path;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	672 namelen = strlen(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	673 f = (char *)mem.malloc(pathlen + 1 + namelen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	674 memcpy(f, path, pathlen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	675 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	676 if (path[pathlen - 1] != '/')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	677 { f[pathlen] = '/';
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	678 pathlen++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	679 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	680 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	681 if (path[pathlen - 1] != '\\' &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	682 path[pathlen - 1] != '/' &&
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	683 path[pathlen - 1] != ':')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	684 { f[pathlen] = '\\';
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	685 pathlen++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	686 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	687 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	688 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	689 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	690 memcpy(f + pathlen, name, namelen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	691 return f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	692 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	693
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	694 /***************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	695 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	696
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	697 FileName FileName::defaultExt(const char name, const char *ext)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	698 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	699 char *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	700 char *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	701 size_t len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	702 size_t extlen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	703
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	704 e = FileName::ext(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	705 if (e) // if already has an extension
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	706 return new FileName((char *)name, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	707
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	708 len = strlen(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	709 extlen = strlen(ext);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	710 s = (char *)alloca(len + 1 + extlen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	711 memcpy(s,name,len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	712 s[len] = '.';
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	713 memcpy(s + len + 1, ext, extlen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	714 return new FileName(s, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	715 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	716
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	717 /***************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	718 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	719
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	720 FileName FileName::forceExt(const char name, const char *ext)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	721 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	722 char *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	723 char *s;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	724 size_t len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	725 size_t extlen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	726
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	727 e = FileName::ext(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	728 if (e) // if already has an extension
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	729 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	730 len = e - name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	731 extlen = strlen(ext);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	732
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	733 s = (char *)alloca(len + extlen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	734 memcpy(s,name,len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	735 memcpy(s + len, ext, extlen + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	736 return new FileName(s, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	737 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	738 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	739 return defaultExt(name, ext); // doesn't have one
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	740 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	741
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	742 /******************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	743 * Return !=0 if extensions match.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	744 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	745
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	746 int FileName::equalsExt(const char *ext)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	747 { const char *e;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	748
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	749 e = FileName::ext();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	750 if (!e && !ext)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	751 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	752 if (!e \|\| !ext)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	753 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	754 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	755 return strcmp(e,ext) == 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	756 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	757 return stricmp(e,ext) == 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	758 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	759 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	760 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	761 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	762
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	763 /*************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	764 * Copy file from this to to.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	765 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	766
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	767 void FileName::CopyTo(FileName *to)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	768 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	769 File file(this);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	770
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	771 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	772 file.touchtime = mem.malloc(sizeof(WIN32_FIND_DATAA)); // keep same file time
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	773 #elif POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	774 file.touchtime = mem.malloc(sizeof(struct stat)); // keep same file time
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	775 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	776 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	777 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	778 file.readv();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	779 file.name = to;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	780 file.writev();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	781 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	782
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	783 /*************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	784 * Search Path for file.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	785 * Input:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	786 * cwd if !=0, search current directory before searching path
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	787 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	788
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	789 char FileName::searchPath(Array path, const char *name, int cwd)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	790 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	791 if (absolute(name))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	792 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	793 return exists(name) ? (char *)name : NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	794 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	795 if (cwd)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	796 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	797 if (exists(name))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	798 return (char *)name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	799 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	800 if (path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	801 { unsigned i;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	802
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	803 for (i = 0; i < path->dim; i++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	804 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	805 char p = (char )path->data[i];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	806 char *n = combine(p, name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	807
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	808 if (exists(n))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	809 return n;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	810 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	811 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	812 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	813 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	814
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	815 int FileName::exists(const char *name)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	816 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	817 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	818 struct stat st;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	819
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	820 if (stat(name, &st) < 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	821 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	822 if (S_ISDIR(st.st_mode))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	823 return 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	824 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	825 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	826 DWORD dw;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	827 int result;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	828
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	829 dw = GetFileAttributesA(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	830 if (dw == -1L)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	831 result = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	832 else if (dw & FILE_ATTRIBUTE_DIRECTORY)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	833 result = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	834 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	835 result = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	836 return result;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	837 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	838 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	839 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	840 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	841
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	842 void FileName::ensurePathExists(const char *path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	843 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	844 //printf("FileName::ensurePathExists(%s)\n", path ? path : "");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	845 if (path && *path)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	846 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	847 if (!exists(path))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	848 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	849 char *p = FileName::path(path);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	850 if (*p)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	851 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	852 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	853 size_t len = strlen(path);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	854 if (len > 2 && p[-1] == ':' && path + 2 == p)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	855 { mem.free(p);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	856 return;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	857 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	858 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	859 ensurePathExists(p);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	860 mem.free(p);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	861 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	862 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	863 if (path[strlen(path) - 1] != '\\')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	864 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	865 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	866 if (path[strlen(path) - 1] != '\\')
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	867 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	868 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	869 //printf("mkdir(%s)\n", path);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	870 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	871 if (mkdir(path))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	872 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	873 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	874 if (mkdir(path, 0777))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	875 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	876 error("cannot create directory %s", path);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	877 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	878 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	879 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	880 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	881
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	882 /**************************** File ******************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	883
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	884 File::File(FileName *n)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	885 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	886 ref = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	887 buffer = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	888 len = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	889 touchtime = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	890 name = n;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	891 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	892
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	893 File::File(char *n)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	894 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	895 ref = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	896 buffer = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	897 len = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	898 touchtime = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	899 name = new FileName(n, 0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	900 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	901
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	902 File::~File()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	903 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	904 if (buffer)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	905 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	906 if (ref == 0)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	907 mem.free(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	908 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	909 else if (ref == 2)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	910 UnmapViewOfFile(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	911 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	912 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	913 if (touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	914 mem.free(touchtime);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	915 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	916
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	917 void File::mark()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	918 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	919 mem.mark(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	920 mem.mark(touchtime);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	921 mem.mark(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	922 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	923
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	924 /*************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	925 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	926
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	927 int File::read()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	928 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	929 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	930 off_t size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	931 ssize_t numread;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	932 int fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	933 struct stat buf;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	934 int result = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	935 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	936
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	937 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	938 //printf("File::read('%s')\n",name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	939 fd = open(name, O_RDONLY);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	940 if (fd == -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	941 { result = errno;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	942 //printf("\topen error, errno = %d\n",errno);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	943 goto err1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	944 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	945
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	946 if (!ref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	947 mem.free(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	948 ref = 0; // we own the buffer now
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	949
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	950 //printf("\tfile opened\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	951 if (fstat(fd, &buf))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	952 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	953 printf("\tfstat error, errno = %d\n",errno);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	954 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	955 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	956 size = buf.st_size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	957 buffer = (unsigned char *) mem.malloc(size + 2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	958 if (!buffer)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	959 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	960 printf("\tmalloc error, errno = %d\n",errno);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	961 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	962 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	963
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	964 numread = ::read(fd, buffer, size);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	965 if (numread != size)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	966 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	967 printf("\tread error, errno = %d\n",errno);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	968 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	969 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	970
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	971 if (touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	972 memcpy(touchtime, &buf, sizeof(buf));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	973
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	974 if (close(fd) == -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	975 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	976 printf("\tclose error, errno = %d\n",errno);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	977 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	978 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	979
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	980 len = size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	981
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	982 // Always store a wchar ^Z past end of buffer so scanner has a sentinel
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	983 buffer[size] = 0; // ^Z is obsolete, use 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	984 buffer[size + 1] = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	985 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	986
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	987 err2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	988 close(fd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	989 err:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	990 mem.free(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	991 buffer = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	992 len = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	993
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	994 err1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	995 result = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	996 return result;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	997 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	998 DWORD size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	999 DWORD numread;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1000 HANDLE h;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1001 int result = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1002 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1003
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1004 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1005 h = CreateFileA(name,GENERIC_READ,FILE_SHARE_READ,NULL,OPEN_EXISTING,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1006 FILE_ATTRIBUTE_NORMAL \| FILE_FLAG_SEQUENTIAL_SCAN,0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1007 if (h == INVALID_HANDLE_VALUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1008 goto err1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1009
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1010 if (!ref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1011 mem.free(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1012 ref = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1013
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1014 size = GetFileSize(h,NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1015 buffer = (unsigned char *) mem.malloc(size + 2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1016 if (!buffer)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1017 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1018
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1019 if (ReadFile(h,buffer,size,&numread,NULL) != TRUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1020 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1021
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1022 if (numread != size)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1023 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1024
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1025 if (touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1026 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1027 if (!GetFileTime(h, NULL, NULL, &((WIN32_FIND_DATAA *)touchtime)->ftLastWriteTime))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1028 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1029 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1030
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1031 if (!CloseHandle(h))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1032 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1033
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1034 len = size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1035
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1036 // Always store a wchar ^Z past end of buffer so scanner has a sentinel
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1037 buffer[size] = 0; // ^Z is obsolete, use 0
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1038 buffer[size + 1] = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1039 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1040
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1041 err2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1042 CloseHandle(h);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1043 err:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1044 mem.free(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1045 buffer = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1046 len = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1047
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1048 err1:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1049 result = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1050 return result;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1051 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1052 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1053 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1054 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1055
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1056 /*****************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1057 * Read a file with memory mapped file I/O.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1058 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1059
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1060 int File::mmread()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1061 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1062 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1063 return read();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1064 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1065 HANDLE hFile;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1066 HANDLE hFileMap;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1067 DWORD size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1068 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1069
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1070 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1071 hFile = CreateFile(name, GENERIC_READ,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1072 FILE_SHARE_READ, NULL,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1073 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1074 if (hFile == INVALID_HANDLE_VALUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1075 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1076 size = GetFileSize(hFile, NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1077 //printf(" file created, size %d\n", size);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1078
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1079 hFileMap = CreateFileMapping(hFile,NULL,PAGE_READONLY,0,size,NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1080 if (CloseHandle(hFile) != TRUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1081 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1082
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1083 if (hFileMap == NULL)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1084 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1085
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1086 //printf(" mapping created\n");
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1087
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1088 if (!ref)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1089 mem.free(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1090 ref = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1091 buffer = (unsigned char *)MapViewOfFileEx(hFileMap, FILE_MAP_READ,0,0,size,NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1092 if (CloseHandle(hFileMap) != TRUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1093 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1094 if (buffer == NULL) // mapping view failed
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1095 goto Lerr;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1096
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1097 len = size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1098 //printf(" buffer = %p\n", buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1099
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1100 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1101
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1102 Lerr:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1103 return GetLastError(); // failure
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1104 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1105 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1106 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1107 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1108
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1109 /*********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1110 * Write a file.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1111 * Returns:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1112 * 0 success
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1113 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1114
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1115 int File::write()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1116 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1117 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1118 int fd;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1119 ssize_t numwritten;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1120 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1121
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1122 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1123 fd = open(name, O_CREAT \| O_WRONLY \| O_TRUNC, 0644);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1124 if (fd == -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1125 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1126
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1127 numwritten = ::write(fd, buffer, len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1128 if (len != numwritten)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1129 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1130
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1131 if (close(fd) == -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1132 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1133
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1134 if (touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1135 { struct utimbuf ubuf;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1136
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1137 ubuf.actime = ((struct stat *)touchtime)->st_atime;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1138 ubuf.modtime = ((struct stat *)touchtime)->st_mtime;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1139 if (utime(name, &ubuf))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1140 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1141 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1142 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1143
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1144 err2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1145 close(fd);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1146 ::remove(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1147 err:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1148 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1149 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1150 HANDLE h;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1151 DWORD numwritten;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1152 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1153
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1154 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1155 h = CreateFileA(name,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1156 FILE_ATTRIBUTE_NORMAL \| FILE_FLAG_SEQUENTIAL_SCAN,NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1157 if (h == INVALID_HANDLE_VALUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1158 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1159
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1160 if (WriteFile(h,buffer,len,&numwritten,NULL) != TRUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1161 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1162
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1163 if (len != numwritten)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1164 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1165
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1166 if (touchtime) {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1167 SetFileTime(h, NULL, NULL, &((WIN32_FIND_DATAA *)touchtime)->ftLastWriteTime);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1168 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1169 if (!CloseHandle(h))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1170 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1171 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1172
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1173 err2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1174 CloseHandle(h);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1175 DeleteFileA(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1176 err:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1177 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1178 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1179 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1180 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1181 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1182
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1183 /*********************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1184 * Append to a file.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1185 * Returns:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1186 * 0 success
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1187 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1188
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1189 int File::append()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1190 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1191 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1192 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1193 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1194 HANDLE h;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1195 DWORD numwritten;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1196 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1197
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1198 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1199 h = CreateFileA(name,GENERIC_WRITE,0,NULL,OPEN_ALWAYS,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1200 FILE_ATTRIBUTE_NORMAL \| FILE_FLAG_SEQUENTIAL_SCAN,NULL);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1201 if (h == INVALID_HANDLE_VALUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1202 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1203
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1204 #if 1
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1205 SetFilePointer(h, 0, NULL, FILE_END);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1206 #else // INVALID_SET_FILE_POINTER doesn't seem to have a definition
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1207 if (SetFilePointer(h, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1208 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1209 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1210
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1211 if (WriteFile(h,buffer,len,&numwritten,NULL) != TRUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1212 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1213
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1214 if (len != numwritten)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1215 goto err2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1216
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1217 if (touchtime) {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1218 SetFileTime(h, NULL, NULL, &((WIN32_FIND_DATAA *)touchtime)->ftLastWriteTime);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1219 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1220 if (!CloseHandle(h))
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1221 goto err;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1222 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1223
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1224 err2:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1225 CloseHandle(h);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1226 err:
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1227 return 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1228 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1229 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1230 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1231 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1232
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1233 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1234 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1235
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1236 void File::readv()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1237 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1238 if (read())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1239 error("Error reading file '%s'\n",name->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1240 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1241
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1242 /**************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1243 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1244
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1245 void File::mmreadv()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1246 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1247 if (mmread())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1248 readv();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1249 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1250
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1251 void File::writev()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1252 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1253 if (write())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1254 error("Error writing file '%s'\n",name->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1255 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1256
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1257 void File::appendv()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1258 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1259 if (write())
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1260 error("Error appending to file '%s'\n",name->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1261 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1262
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1263 /*******************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1264 * Return !=0 if file exists.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1265 * 0: file doesn't exist
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1266 * 1: normal file
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1267 * 2: directory
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1268 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1269
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1270 int File::exists()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1271 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1272 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1273 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1274 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1275 DWORD dw;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1276 int result;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1277 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1278
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1279 name = this->name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1280 if (touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1281 dw = ((WIN32_FIND_DATAA *)touchtime)->dwFileAttributes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1282 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1283 dw = GetFileAttributesA(name);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1284 if (dw == -1L)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1285 result = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1286 else if (dw & FILE_ATTRIBUTE_DIRECTORY)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1287 result = 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1288 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1289 result = 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1290 return result;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1291 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1292 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1293 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1294 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1295
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1296 void File::remove()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1297 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1298 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1299 ::remove(this->name->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1300 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1301 DeleteFileA(this->name->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1302 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1303 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1304 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1305 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1306
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1307 Array File::match(char n)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1308 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1309 return match(new FileName(n, 0));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1310 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1311
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1312 Array File::match(FileName n)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1313 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1314 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1315 return NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1316 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1317 HANDLE h;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1318 WIN32_FIND_DATAA fileinfo;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1319 Array *a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1320 char *c;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1321 char *name;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1322
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1323 a = new Array();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1324 c = n->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1325 name = n->name();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1326 h = FindFirstFileA(c,&fileinfo);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1327 if (h != INVALID_HANDLE_VALUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1328 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1329 do
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1330 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1331 // Glue path together with name
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1332 char *fn;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1333 File *f;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1334
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1335 fn = (char *)mem.malloc(name - c + strlen(fileinfo.cFileName) + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1336 memcpy(fn, c, name - c);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1337 strcpy(fn + (name - c), fileinfo.cFileName);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1338 f = new File(fn);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1339 f->touchtime = mem.malloc(sizeof(WIN32_FIND_DATAA));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1340 memcpy(f->touchtime, &fileinfo, sizeof(fileinfo));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1341 a->push(f);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1342 } while (FindNextFileA(h,&fileinfo) != FALSE);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1343 FindClose(h);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1344 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1345 return a;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1346 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1347 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1348 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1349 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1350
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1351 int File::compareTime(File *f)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1352 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1353 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1354 return 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1355 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1356 if (!touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1357 stat();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1358 if (!f->touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1359 f->stat();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1360 return CompareFileTime(&((WIN32_FIND_DATAA )touchtime)->ftLastWriteTime, &((WIN32_FIND_DATAA )f->touchtime)->ftLastWriteTime);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1361 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1362 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1363 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1364 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1365
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1366 void File::stat()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1367 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1368 #if POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1369 if (!touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1370 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1371 touchtime = mem.calloc(1, sizeof(struct stat));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1372 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1373 #elif _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1374 HANDLE h;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1375
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1376 if (!touchtime)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1377 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1378 touchtime = mem.calloc(1, sizeof(WIN32_FIND_DATAA));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1379 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1380 h = FindFirstFileA(name->toChars(),(WIN32_FIND_DATAA *)touchtime);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1381 if (h != INVALID_HANDLE_VALUE)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1382 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1383 FindClose(h);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1384 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1385 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1386 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1387 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1388 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1389
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1390 void File::checkoffset(size_t offset, size_t nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1391 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1392 if (offset > len \|\| offset + nbytes > len)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1393 error("Corrupt file '%s': offset x%zx off end of file",toChars(),offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1394 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1395
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1396 char *File::toChars()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1397 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1398 return name->toChars();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1399 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1400
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1401
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1402 /*********************** OutBuffer ***********************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1403
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1404 OutBuffer::OutBuffer()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1405 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1406 data = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1407 offset = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1408 size = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1409 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1410
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1411 OutBuffer::~OutBuffer()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1412 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1413 mem.free(data);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1414 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1415
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1416 void *OutBuffer::extractData()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1417 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1418 void *p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1419
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1420 p = (void *)data;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1421 data = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1422 offset = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1423 size = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1424 return p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1425 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1426
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1427 void OutBuffer::mark()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1428 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1429 mem.mark(data);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1430 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1431
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1432 void OutBuffer::reserve(unsigned nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1433 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1434 //printf("OutBuffer::reserve: size = %d, offset = %d, nbytes = %d\n", size, offset, nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1435 if (size - offset < nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1436 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1437 size = (offset + nbytes) * 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1438 data = (unsigned char *)mem.realloc(data, size);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1439 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1440 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1441
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1442 void OutBuffer::reset()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1443 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1444 offset = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1445 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1446
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1447 void OutBuffer::setsize(unsigned size)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1448 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1449 offset = size;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1450 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1451
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1452 void OutBuffer::write(const void *data, unsigned nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1453 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1454 reserve(nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1455 memcpy(this->data + offset, data, nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1456 offset += nbytes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1457 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1458
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1459 void OutBuffer::writebstring(unsigned char *string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1460 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1461 write(string,*string + 1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1462 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1463
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1464 void OutBuffer::writestring(const char *string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1465 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1466 write(string,strlen(string));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1467 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1468
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1469 void OutBuffer::writedstring(const char *string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1470 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1471 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1472 for (; *string; string++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1473 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1474 writedchar(*string);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1475 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1476 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1477 write(string,strlen(string));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1478 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1479 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1480
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1481 void OutBuffer::writedstring(const wchar_t *string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1482 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1483 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1484 write(string,wcslen(string) * sizeof(wchar_t));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1485 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1486 for (; *string; string++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1487 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1488 writedchar(*string);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1489 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1490 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1491 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1492
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1493 void OutBuffer::prependstring(const char *string)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1494 { unsigned len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1495
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1496 len = strlen(string);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1497 reserve(len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1498 memmove(data + len, data, offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1499 memcpy(data, string, len);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1500 offset += len;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1501 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1502
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1503 void OutBuffer::writenl()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1504 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1505 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1506 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1507 write4(0x000A000D); // newline is CR,LF on Microsoft OS's
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1508 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1509 writeword(0x0A0D); // newline is CR,LF on Microsoft OS's
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1510 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1511 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1512 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1513 writeword('\n');
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1514 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1515 writeByte('\n');
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1516 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1517 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1518 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1519
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1520 void OutBuffer::writeByte(unsigned b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1521 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1522 reserve(1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1523 this->data[offset] = (unsigned char)b;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1524 offset++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1525 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1526
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1527 void OutBuffer::writeUTF8(unsigned b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1528 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1529 reserve(6);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1530 if (b <= 0x7F)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1531 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1532 this->data[offset] = (unsigned char)b;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1533 offset++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1534 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1535 else if (b <= 0x7FF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1536 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1537 this->data[offset + 0] = (unsigned char)((b >> 6) \| 0xC0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1538 this->data[offset + 1] = (unsigned char)((b & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1539 offset += 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1540 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1541 else if (b <= 0xFFFF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1542 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1543 this->data[offset + 0] = (unsigned char)((b >> 12) \| 0xE0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1544 this->data[offset + 1] = (unsigned char)(((b >> 6) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1545 this->data[offset + 2] = (unsigned char)((b & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1546 offset += 3;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1547 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1548 else if (b <= 0x1FFFFF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1549 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1550 this->data[offset + 0] = (unsigned char)((b >> 18) \| 0xF0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1551 this->data[offset + 1] = (unsigned char)(((b >> 12) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1552 this->data[offset + 2] = (unsigned char)(((b >> 6) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1553 this->data[offset + 3] = (unsigned char)((b & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1554 offset += 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1555 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1556 else if (b <= 0x3FFFFFF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1557 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1558 this->data[offset + 0] = (unsigned char)((b >> 24) \| 0xF8);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1559 this->data[offset + 1] = (unsigned char)(((b >> 18) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1560 this->data[offset + 2] = (unsigned char)(((b >> 12) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1561 this->data[offset + 3] = (unsigned char)(((b >> 6) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1562 this->data[offset + 4] = (unsigned char)((b & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1563 offset += 5;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1564 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1565 else if (b <= 0x7FFFFFFF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1566 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1567 this->data[offset + 0] = (unsigned char)((b >> 30) \| 0xFC);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1568 this->data[offset + 1] = (unsigned char)(((b >> 24) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1569 this->data[offset + 2] = (unsigned char)(((b >> 18) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1570 this->data[offset + 3] = (unsigned char)(((b >> 12) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1571 this->data[offset + 4] = (unsigned char)(((b >> 6) & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1572 this->data[offset + 5] = (unsigned char)((b & 0x3F) \| 0x80);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1573 offset += 6;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1574 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1575 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1576 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1577 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1578
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1579 void OutBuffer::writedchar(unsigned b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1580 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1581 reserve(Dchar_mbmax * sizeof(dchar));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1582 offset = (unsigned char )Dchar::put((dchar )(this->data + offset), (dchar)b) -
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1583 this->data;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1584 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1585
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1586 void OutBuffer::prependbyte(unsigned b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1587 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1588 reserve(1);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1589 memmove(data + 1, data, offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1590 data[0] = (unsigned char)b;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1591 offset++;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1592 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1593
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1594 void OutBuffer::writeword(unsigned w)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1595 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1596 reserve(2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1597 (unsigned short )(this->data + offset) = (unsigned short)w;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1598 offset += 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1599 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1600
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1601 void OutBuffer::writeUTF16(unsigned w)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1602 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1603 reserve(4);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1604 if (w <= 0xFFFF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1605 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1606 (unsigned short )(this->data + offset) = (unsigned short)w;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1607 offset += 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1608 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1609 else if (w <= 0x10FFFF)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1610 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1611 (unsigned short )(this->data + offset) = (unsigned short)((w >> 10) + 0xD7C0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1612 (unsigned short )(this->data + offset + 2) = (unsigned short)((w & 0x3FF) \| 0xDC00);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1613 offset += 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1614 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1615 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1616 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1617 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1618
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1619 void OutBuffer::write4(unsigned w)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1620 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1621 reserve(4);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1622 (unsigned long )(this->data + offset) = w;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1623 offset += 4;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1624 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1625
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1626 void OutBuffer::write(OutBuffer *buf)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1627 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1628 if (buf)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1629 { reserve(buf->offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1630 memcpy(data + offset, buf->data, buf->offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1631 offset += buf->offset;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1632 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1633 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1634
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1635 void OutBuffer::write(Object *obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1636 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1637 if (obj)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1638 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1639 writestring(obj->toChars());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1640 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1641 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1642
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1643 void OutBuffer::fill0(unsigned nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1644 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1645 reserve(nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1646 memset(data + offset,0,nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1647 offset += nbytes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1648 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1649
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1650 void OutBuffer::align(unsigned size)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1651 { unsigned nbytes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1652
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1653 nbytes = ((offset + size - 1) & ~(size - 1)) - offset;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1654 fill0(nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1655 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1656
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1657
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1658 ////////////////////////////////////////////////////////////////
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1659 // The compiler shipped with Visual Studio 2005 (and possible
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1660 // other versions) does not support C99 printf format specfiers
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1661 // such as %z and %j
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1662 #if _MSC_VER
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1663 using std::string;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1664 using std::wstring;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1665
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1666 template<typename S>
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1667 inline void
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1668 search_and_replace(S& str, const S& what, const S& replacement)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1669 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1670 assert(!what.empty());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1671 size_t pos = str.find(what);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1672 while (pos != S::npos)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1673 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1674 str.replace(pos, what.size(), replacement);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1675 pos = str.find(what, pos + replacement.size());
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1676 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1677 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1678 #define WORKAROUND_C99_SPECIFIERS_BUG(S,tmp,f) \
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1679 S tmp = f; \
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1680 search_and_replace(fmt, S("%z"), S("%l")); \
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1681 search_and_replace(fmt, S("%j"), S("%i")); \
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1682 f = tmp.c_str();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1683 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1684 #define WORKAROUND_C99_SPECIFIERS_BUG(S,tmp,f)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1685 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1686
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1687 void OutBuffer::vprintf(const char *format, va_list args)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1688 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1689 char buffer[128];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1690 char *p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1691 unsigned psize;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1692 int count;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1693
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1694 WORKAROUND_C99_SPECIFIERS_BUG(string, fmt, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1695
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1696 p = buffer;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1697 psize = sizeof(buffer);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1698 for (;;)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1699 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1700 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1701 count = _vsnprintf(p,psize,format,args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1702 if (count != -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1703 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1704 psize *= 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1705 #elif POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1706 va_list va;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1707 va_copy(va, args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1708 /*
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1709 The functions vprintf(), vfprintf(), vsprintf(), vsnprintf()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1710 are equivalent to the functions printf(), fprintf(), sprintf(),
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1711 snprintf(), respectively, except that they are called with a
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1712 va_list instead of a variable number of arguments. These
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1713 functions do not call the va_end macro. Consequently, the value
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1714 of ap is undefined after the call. The application should call
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1715 va_end(ap) itself afterwards.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1716 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1717 count = vsnprintf(p,psize,format,va);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1718 va_end(va);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1719 if (count == -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1720 psize *= 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1721 else if (count >= psize)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1722 psize = count + 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1723 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1724 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1725 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1726 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1727 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1728 p = (char *) alloca(psize); // buffer too small, try again with larger size
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1729 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1730 write(p,count);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1731 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1732
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1733 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1734 void OutBuffer::vprintf(const wchar_t *format, va_list args)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1735 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1736 dchar buffer[128];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1737 dchar *p;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1738 unsigned psize;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1739 int count;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1740
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1741 WORKAROUND_C99_SPECIFIERS_BUG(wstring, fmt, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1742
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1743 p = buffer;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1744 psize = sizeof(buffer) / sizeof(buffer[0]);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1745 for (;;)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1746 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1747 #if _WIN32
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1748 count = _vsnwprintf(p,psize,format,args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1749 if (count != -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1750 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1751 psize *= 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1752 #elif POSIX
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1753 va_list va;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1754 va_copy(va, args);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1755 count = vsnwprintf(p,psize,format,va);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1756 va_end(va);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1757
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1758 if (count == -1)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1759 psize *= 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1760 else if (count >= psize)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1761 psize = count + 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1762 else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1763 break;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1764 #else
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1765 assert(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1766 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1767 p = (dchar ) alloca(psize 2); // buffer too small, try again with larger size
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1768 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1769 write(p,count * 2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1770 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1771 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1772
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1773 void OutBuffer::printf(const char *format, ...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1774 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1775 va_list ap;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1776 va_start(ap, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1777 vprintf(format,ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1778 va_end(ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1779 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1780
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1781 #if M_UNICODE
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1782 void OutBuffer::printf(const wchar_t *format, ...)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1783 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1784 va_list ap;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1785 va_start(ap, format);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1786 vprintf(format,ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1787 va_end(ap);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1788 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1789 #endif
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1790
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1791 void OutBuffer::bracket(char left, char right)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1792 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1793 reserve(2);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1794 memmove(data + 1, data, offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1795 data[0] = left;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1796 data[offset + 1] = right;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1797 offset += 2;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1798 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1799
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1800 /******************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1801 * Insert left at i, and right at j.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1802 * Return index just past right.
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1803 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1804
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1805 unsigned OutBuffer::bracket(unsigned i, const char left, unsigned j, const char right)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1806 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1807 size_t leftlen = strlen(left);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1808 size_t rightlen = strlen(right);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1809 reserve(leftlen + rightlen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1810 insert(i, left, leftlen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1811 insert(j + leftlen, right, rightlen);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1812 return j + leftlen + rightlen;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1813 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1814
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1815 void OutBuffer::spread(unsigned offset, unsigned nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1816 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1817 reserve(nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1818 memmove(data + offset + nbytes, data + offset,
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1819 this->offset - offset);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1820 this->offset += nbytes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1821 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1822
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1823 /****************************************
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1824 * Returns: offset + nbytes
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1825 */
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1826
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1827 unsigned OutBuffer::insert(unsigned offset, const void *p, unsigned nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1828 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1829 spread(offset, nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1830 memmove(data + offset, p, nbytes);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1831 return offset + nbytes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1832 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1833
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1834 void OutBuffer::remove(unsigned offset, unsigned nbytes)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1835 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1836 memmove(data + offset, data + offset + nbytes, this->offset - (offset + nbytes));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1837 this->offset -= nbytes;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1838 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1839
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1840 char *OutBuffer::toChars()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1841 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1842 writeByte(0);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1843 return (char *)data;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1844 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1845
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1846 /******************************* Bits **************************/
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1847
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1848 Bits::Bits()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1849 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1850 data = NULL;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1851 bitdim = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1852 allocdim = 0;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1853 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1854
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1855 Bits::~Bits()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1856 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1857 mem.free(data);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1858 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1859
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1860 void Bits::mark()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1861 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1862 mem.mark(data);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1863 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1864
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1865 void Bits::resize(unsigned bitdim)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1866 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1867 unsigned allocdim;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1868 unsigned mask;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1869
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1870 allocdim = (bitdim + 31) / 32;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1871 data = (unsigned )mem.realloc(data, allocdim sizeof(data[0]));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1872 if (this->allocdim < allocdim)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1873 memset(data + this->allocdim, 0, (allocdim - this->allocdim) * sizeof(data[0]));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1874
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1875 // Clear other bits in last word
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1876 mask = (1 << (bitdim & 31)) - 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1877 if (mask)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1878 data[allocdim - 1] &= ~mask;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1879
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1880 this->bitdim = bitdim;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1881 this->allocdim = allocdim;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1882 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1883
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1884 void Bits::set(unsigned bitnum)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1885 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1886 data[bitnum / 32] \|= 1 << (bitnum & 31);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1887 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1888
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1889 void Bits::clear(unsigned bitnum)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1890 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1891 data[bitnum / 32] &= ~(1 << (bitnum & 31));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1892 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1893
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1894 int Bits::test(unsigned bitnum)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1895 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1896 return data[bitnum / 32] & (1 << (bitnum & 31));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1897 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1898
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1899 void Bits::set()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1900 { unsigned mask;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1901
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1902 memset(data, ~0, allocdim * sizeof(data[0]));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1903
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1904 // Clear other bits in last word
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1905 mask = (1 << (bitdim & 31)) - 1;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1906 if (mask)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1907 data[allocdim - 1] &= mask;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1908 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1909
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1910 void Bits::clear()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1911 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1912 memset(data, 0, allocdim * sizeof(data[0]));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1913 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1914
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1915 void Bits::copy(Bits *from)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1916 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1917 assert(bitdim == from->bitdim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1918 memcpy(data, from->data, allocdim * sizeof(data[0]));
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1919 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1920
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1921 Bits *Bits::clone()
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1922 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1923 Bits *b;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1924
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1925 b = new Bits();
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1926 b->resize(bitdim);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1927 b->copy(this);
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1928 return b;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1929 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1930
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1931 void Bits::sub(Bits *b)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1932 {
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1933 unsigned u;
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1934
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1935 for (u = 0; u < allocdim; u++)
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1936 data[u] &= ~b->data[u];
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1937 }
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1938
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1939
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1940
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1941
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1942
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1943
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1944
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1945
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1946
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1947
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1948
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1949
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1950
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1951
638d16625da2 LDC 2 compiles again. Robert Clipsham <robert@octarineparrot.com> parents: diff changeset	1952

Mercurial > projects > ldc

annotate dmd2/root/root.c @ 1650:40bd4a0d4870