comparison dmd/mars.c @ 1630:44b145be2ef5

Merge dmd 1.056.
author Robert Clipsham <robert@octarineparrot.com>
date Sat, 06 Feb 2010 15:53:52 +0000
parents 6c36e3f49b28
children 9bf06e02070b
comparison
equal deleted inserted replaced
1629:b07d683ba4d0 1630:44b145be2ef5
1 1
2 // Compiler implementation of the D programming language 2 // Compiler implementation of the D programming language
3 // Copyright (c) 1999-2009 by Digital Mars 3 // Copyright (c) 1999-2010 by Digital Mars
4 // All Rights Reserved 4 // All Rights Reserved
5 // written by Walter Bright 5 // written by Walter Bright
6 // http://www.digitalmars.com 6 // http://www.digitalmars.com
7 // License for redistribution is by either the Artistic License 7 // License for redistribution is by either the Artistic License
8 // in artistic.txt, or the GNU General Public License in gnu.txt. 8 // in artistic.txt, or the GNU General Public License in gnu.txt.
11 #include <stdio.h> 11 #include <stdio.h>
12 #include <stdlib.h> 12 #include <stdlib.h>
13 #include <ctype.h> 13 #include <ctype.h>
14 #include <assert.h> 14 #include <assert.h>
15 #include <limits.h> 15 #include <limits.h>
16 #if IN_LLVM
16 #include <string> 17 #include <string>
17 #include <cstdarg> 18 #include <cstdarg>
19 #endif
18 20
19 #if POSIX 21 #if POSIX
20 #include <errno.h> 22 #include <errno.h>
21 #elif _WIN32 23 #elif _WIN32
22 #include <windows.h> 24 #include <windows.h>
32 #include "cond.h" 34 #include "cond.h"
33 #include "expression.h" 35 #include "expression.h"
34 #include "lexer.h" 36 #include "lexer.h"
35 #include "json.h" 37 #include "json.h"
36 38
39 #if IN_LLVM
37 #include "gen/revisions.h" 40 #include "gen/revisions.h"
41 #endif
38 42
39 Global global; 43 Global global;
40 44
41 Global::Global() 45 Global::Global()
42 { 46 {
44 sym_ext = "d"; 48 sym_ext = "d";
45 hdr_ext = "di"; 49 hdr_ext = "di";
46 doc_ext = "html"; 50 doc_ext = "html";
47 ddoc_ext = "ddoc"; 51 ddoc_ext = "ddoc";
48 json_ext = "json"; 52 json_ext = "json";
53 map_ext = "map";
49 54
50 // LDC 55 // LDC
51 ll_ext = "ll"; 56 ll_ext = "ll";
52 bc_ext = "bc"; 57 bc_ext = "bc";
53 s_ext = "s"; 58 s_ext = "s";
56 obj_ext_alt = "obj"; 61 obj_ext_alt = "obj";
57 #endif 62 #endif
58 63
59 copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen"; 64 copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen";
60 written = "written by Walter Bright and Tomas Lindquist Olsen"; 65 written = "written by Walter Bright and Tomas Lindquist Olsen";
61 version = "v1.055"; 66 version = "v1.056";
62 ldc_version = LDC_REV; 67 ldc_version = LDC_REV;
63 llvm_version = LLVM_REV_STR; 68 llvm_version = LLVM_REV_STR;
64 global.structalign = 8; 69 global.structalign = 8;
65 70
66 // This should only be used as a global, so the other fields are 71 // This should only be used as a global, so the other fields are