annotate dmd/module.c @ 1257:7af860e4f403

Changes for mingw to compile properly
author Kelly Wilson <wilsonk cpsc.ucalgary.ca>
date Wed, 22 Apr 2009 14:49:49 -0600
parents e961851fb8be
children 68dea5bae9e9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
2 // Compiler implementation of the D programming language
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1146
diff changeset
3 // Copyright (c) 1999-2009 by Digital Mars
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
4 // All Rights Reserved
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
5 // written by Walter Bright
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
6 // http://www.digitalmars.com
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
7 // License for redistribution is by either the Artistic License
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
8 // in artistic.txt, or the GNU General Public License in gnu.txt.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
9 // See the included readme.txt for details.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
10
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
11 #include <stdio.h>
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
12 #include <stdlib.h>
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
13 #include <assert.h>
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
14
872
aa953cc960b6 Apply BlueZeniX's patch for OpenSolaris compatibility. Fixes #158.
Christian Kamm <kamm incasoftware de>
parents: 751
diff changeset
15 #if (defined (__SVR4) && defined (__sun))
aa953cc960b6 Apply BlueZeniX's patch for OpenSolaris compatibility. Fixes #158.
Christian Kamm <kamm incasoftware de>
parents: 751
diff changeset
16 #include <alloca.h>
aa953cc960b6 Apply BlueZeniX's patch for OpenSolaris compatibility. Fixes #158.
Christian Kamm <kamm incasoftware de>
parents: 751
diff changeset
17 #endif
aa953cc960b6 Apply BlueZeniX's patch for OpenSolaris compatibility. Fixes #158.
Christian Kamm <kamm incasoftware de>
parents: 751
diff changeset
18
1133
eeb8b95ea92e Cleanup DMD 1.041 merge.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1103
diff changeset
19 #if defined(_MSC_VER) || defined(__MINGW32__)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
20 #include <malloc.h>
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
21 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
22
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
23 #if IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
24 #include "gdc_alloca.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
25 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
26
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
27 #include "rmem.h"
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
28
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
29 #include "mars.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
30 #include "module.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
31 #include "parse.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
32 #include "scope.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
33 #include "identifier.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
34 #include "id.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
35 #include "import.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
36 #include "dsymbol.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
37 #include "hdrgen.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
38 #include "lexer.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
39
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
40 #define MARS 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
41 #include "html.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
42
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
43 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
44 #include "d-dmd-gcc.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
45 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
46
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
47
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
48 #include "llvm/Support/CommandLine.h"
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
49
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
50 static llvm::cl::opt<bool> preservePaths("op",
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
51 llvm::cl::desc("Do not strip paths from source file"),
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
52 llvm::cl::ZeroOrMore);
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
53
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
54 static llvm::cl::opt<bool> fqnNames("oq",
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
55 llvm::cl::desc("Write object files with fully qualified names"),
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
56 llvm::cl::ZeroOrMore);
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
57
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
58
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
59
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
60 ClassDeclaration *Module::moduleinfo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
61
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
62 Module *Module::rootModule;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
63 DsymbolTable *Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
64 Array Module::amodules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
65
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
66 Array Module::deferred; // deferred Dsymbol's needing semantic() run on them
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
67 unsigned Module::dprogress;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
68
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
69 void Module::init()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
70 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
71 modules = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
72 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
73
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
74 Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
75 : Package(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
76 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
77 FileName *srcfilename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
78
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
79 // printf("Module::Module(filename = '%s', ident = '%s')\n", filename, ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
80 this->arg = filename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
81 md = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
82 errors = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
83 numlines = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
84 members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
85 isHtml = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
86 isDocFile = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
87 needmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
88 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
89 strictlyneedmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
90 #endif
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
91 selfimports = 0;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
92 insearch = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
93 searchCacheIdent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
94 searchCacheSymbol = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
95 searchCacheFlags = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
96 semanticstarted = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
97 semanticdone = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
98 decldefs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
99 vmoduleinfo = NULL;
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1133
diff changeset
100 #if IN_DMD
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
101 massert = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
102 marray = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
103 sictor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
104 sctor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
105 sdtor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
106 stest = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
107 sfilename = NULL;
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1133
diff changeset
108 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
109 root = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
110 importedFrom = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
111 srcfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
112 objfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
113 docfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
114 hdrfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
115
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
116 debuglevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
117 debugids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
118 debugidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
119 versionlevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
120 versionids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
121 versionidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
122
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
123 macrotable = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
124 escapetable = NULL;
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1133
diff changeset
125 #if IN_DMD
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
126 doppelganger = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
127 cov = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
128 covb = NULL;
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1133
diff changeset
129 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
130
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
131 srcfilename = FileName::defaultExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
132 if (!srcfilename->equalsExt(global.mars_ext) &&
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 486
diff changeset
133 !srcfilename->equalsExt(global.hdr_ext) &&
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
134 !srcfilename->equalsExt("dd"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
135 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
136 if (srcfilename->equalsExt("html") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
137 srcfilename->equalsExt("htm") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
138 srcfilename->equalsExt("xhtml"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
139 isHtml = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
140 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
141 { error("source file name '%s' must have .%s extension", srcfilename->toChars(), global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
142 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
143 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
144 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
145 srcfile = new File(srcfilename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
146
664
eef8ac26c66c Some missed LLVMDC -> LDC.
Christian Kamm <kamm incasoftware de>
parents: 643
diff changeset
147 // LDC
486
a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
148 llvmForceLogging = false;
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
149 this->doDocComment = doDocComment;
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
150 this->doHdrGen = doHdrGen;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
151 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
152
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
153 File* Module::buildFilePath(const char* forcename, const char* path, const char* ext)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
154 {
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
155 const char *argobj;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
156 if (forcename)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
157 argobj = forcename;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
158 else
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
159 {
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
160 if (preservePaths)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
161 argobj = (char*)this->arg;
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
162 else
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
163 argobj = FileName::name((char*)this->arg);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
164
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
165 if (fqnNames)
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
166 {
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
167 if(md)
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
168 argobj = FileName::replaceName((char*)argobj, md->toChars());
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
169 else
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
170 argobj = FileName::replaceName((char*)argobj, toChars());
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
171
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
172 // add ext, otherwise forceExt will make nested.module into nested.bc
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
173 size_t len = strlen(argobj);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
174 size_t extlen = strlen(ext);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
175 char* s = (char *)alloca(len + 1 + extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
176 memcpy(s, argobj, len);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
177 s[len] = '.';
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
178 memcpy(s + len + 1, ext, extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
179 s[len+1+extlen] = 0;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
180 argobj = s;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
181 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
182 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
183
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
184 if (!FileName::absolute(argobj))
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
185 {
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
186 argobj = FileName::combine(path, argobj);
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
187 }
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
188
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
189 FileName::ensurePathExists(FileName::path(argobj));
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
190
708
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
191 // always append the extension! otherwise hard to make output switches consistent
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
192 // if (forcename)
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
193 // return new File(argobj);
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
194 // else
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
195 // allow for .o and .obj on windows
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
196 #if _WIN32
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
197 if (ext == global.params.objdir && FileName::ext(argobj)
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
198 && stricmp(FileName::ext(argobj), global.obj_ext_alt) == 0)
1257
7af860e4f403 Changes for mingw to compile properly
Kelly Wilson <wilsonk cpsc.ucalgary.ca>
parents: 1195
diff changeset
199 return new File((char*)argobj);
708
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
200 #endif
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
201 return new File(FileName::forceExt(argobj, ext));
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
202 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
203
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
204 void Module::buildTargetFiles()
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
205 {
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
206 if(objfile &&
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
207 (!doDocComment || docfile) &&
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
208 (!doHdrGen || hdrfile))
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
209 return;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
210
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
211 if(!objfile)
675
bfe5229f9d8e Disable bc output by default. Remove -dis. Add -output-bc, -output-ll, -output-s.
Christian Kamm <kamm incasoftware de>
parents: 664
diff changeset
212 objfile = Module::buildFilePath(global.params.objname, global.params.objdir, global.obj_ext);
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
213 if(doDocComment && !docfile)
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
214 docfile = Module::buildFilePath(global.params.docname, global.params.docdir, global.doc_ext);
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
215 if(doHdrGen && !hdrfile)
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
216 hdrfile = Module::buildFilePath(global.params.hdrname, global.params.hdrdir, global.hdr_ext);
598
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
217
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
218 // safety check: never allow obj, doc or hdr file to have the source file's name
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
219 if(stricmp(FileName::name(objfile->name->str), FileName::name((char*)this->arg)) == 0)
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
220 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
221 error("Output object files with the same name as the source file are forbidden");
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
222 fatal();
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
223 }
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
224 if(docfile && stricmp(FileName::name(docfile->name->str), FileName::name((char*)this->arg)) == 0)
598
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
225 {
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
226 error("Output doc files with the same name as the source file are forbidden");
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
227 fatal();
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
228 }
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
229 if(hdrfile && stricmp(FileName::name(hdrfile->name->str), FileName::name((char*)this->arg)) == 0)
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
230 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
231 error("Output header files with the same name as the source file are forbidden");
598
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
232 fatal();
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
233 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
234 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
235
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
236 void Module::deleteObjFile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
237 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
238 if (global.params.obj)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
239 objfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
240 //if (global.params.llvmBC)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
241 //bcfile->remove();
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
242 if (doDocComment && docfile)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
243 docfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
244 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
245
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
246 Module::~Module()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
247 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
248 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
249
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
250 const char *Module::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
251 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
252 return "module";
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
253 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
254
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
255 Module *Module::load(Loc loc, Array *packages, Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
256 { Module *m;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
257 char *filename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
258
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
259 //printf("Module::load(ident = '%s')\n", ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
260
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
261 // Build module filename by turning:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
262 // foo.bar.baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
263 // into:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
264 // foo\bar\baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
265 filename = ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
266 if (packages && packages->dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
267 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
268 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
269 int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
270
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
271 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
272 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
273
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
274 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
275 #if _WIN32
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
276 buf.writeByte('\\');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
277 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
278 buf.writeByte('/');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
279 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
280 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
281 buf.writestring(filename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
282 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
283 filename = (char *)buf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
284 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
285
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
286 m = new Module(filename, ident, 0, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
287 m->loc = loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
288
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
289 /* Search along global.path for .di file, then .d file.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
290 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
291 char *result = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
292 FileName *fdi = FileName::forceExt(filename, global.hdr_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
293 FileName *fd = FileName::forceExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
294 char *sdi = fdi->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
295 char *sd = fd->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
296
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
297 if (FileName::exists(sdi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
298 result = sdi;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
299 else if (FileName::exists(sd))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
300 result = sd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
301 else if (FileName::absolute(filename))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
302 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
303 else if (!global.path)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
304 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
305 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
306 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
307 for (size_t i = 0; i < global.path->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
308 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
309 char *p = (char *)global.path->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
310 char *n = FileName::combine(p, sdi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
311 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
312 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
313 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
314 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
315 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
316 n = FileName::combine(p, sd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
317 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
318 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
319 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
320 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
321 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
322 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
323 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
324 if (result)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
325 m->srcfile = new File(result);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
326
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
327 if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
328 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
329 printf("import ");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
330 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
331 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
332 for (size_t i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
333 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
334 printf("%s.", pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
335 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
336 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
337 printf("%s\t(%s)\n", ident->toChars(), m->srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
338 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
339
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
340 m->read(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
341 m->parse();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
342
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
343 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
344 d_gcc_magic_module(m);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
345 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
346
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
347 return m;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
348 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
349
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
350 void Module::read(Loc loc)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
351 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
352 //printf("Module::read('%s') file '%s'\n", toChars(), srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
353 if (srcfile->read())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
354 { error(loc, "cannot read file '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
355 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
356 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
357 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
358
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
359 inline unsigned readwordLE(unsigned short *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
360 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
361 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
362 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
363 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
364 return (((unsigned char *)p)[1] << 8) | ((unsigned char *)p)[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
365 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
366 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
367
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
368 inline unsigned readwordBE(unsigned short *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
369 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
370 return (((unsigned char *)p)[0] << 8) | ((unsigned char *)p)[1];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
371 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
372
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
373 inline unsigned readlongLE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
374 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
375 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
376 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
377 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
378 return ((unsigned char *)p)[0] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
379 (((unsigned char *)p)[1] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
380 (((unsigned char *)p)[2] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
381 (((unsigned char *)p)[3] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
382 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
383 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
384
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
385 inline unsigned readlongBE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
386 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
387 return ((unsigned char *)p)[3] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
388 (((unsigned char *)p)[2] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
389 (((unsigned char *)p)[1] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
390 (((unsigned char *)p)[0] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
391 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
392
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
393 #if IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
394 void Module::parse(bool dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
395 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
396 void Module::parse()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
397 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
398 { char *srcname;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
399 unsigned char *buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
400 unsigned buflen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
401 unsigned le;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
402 unsigned bom;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
403
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
404 //printf("Module::parse()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
405
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
406 srcname = srcfile->name->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
407 //printf("Module::parse(srcname = '%s')\n", srcname);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
408
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
409 buf = srcfile->buffer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
410 buflen = srcfile->len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
411
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
412 if (buflen >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
413 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
414 /* Convert all non-UTF-8 formats to UTF-8.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
415 * BOM : http://www.unicode.org/faq/utf_bom.html
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
416 * 00 00 FE FF UTF-32BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
417 * FF FE 00 00 UTF-32LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
418 * FE FF UTF-16BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
419 * FF FE UTF-16LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
420 * EF BB BF UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
421 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
422
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
423 bom = 1; // assume there's a BOM
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
424 if (buf[0] == 0xFF && buf[1] == 0xFE)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
425 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
426 if (buflen >= 4 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
427 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
428 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
429
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
430 Lutf32:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
431 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
432 unsigned *pu = (unsigned *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
433 unsigned *pumax = &pu[buflen / 4];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
434
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
435 if (buflen & 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
436 { error("odd length of UTF-32 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
437 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
438 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
439
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
440 dbuf.reserve(buflen / 4);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
441 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
442 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
443
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
444 u = le ? readlongLE(pu) : readlongBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
445 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
446 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
447 if (u > 0x10FFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
448 { error("UTF-32 value %08x greater than 0x10FFFF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
449 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
450 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
451 dbuf.writeUTF8(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
452 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
453 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
454 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
455 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
456 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
457 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
458 buf = (unsigned char *) dbuf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
459 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
460 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
461 { // UTF-16LE (X86)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
462 // Convert it to UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
463 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
464
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
465 Lutf16:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
466 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
467 unsigned short *pu = (unsigned short *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
468 unsigned short *pumax = &pu[buflen / 2];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
469
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
470 if (buflen & 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
471 { error("odd length of UTF-16 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
472 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
473 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
474
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
475 dbuf.reserve(buflen / 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
476 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
477 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
478
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
479 u = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
480 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
481 { if (u >= 0xD800 && u <= 0xDBFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
482 { unsigned u2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
483
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
484 if (++pu > pumax)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
485 { error("surrogate UTF-16 high value %04x at EOF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
486 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
487 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
488 u2 = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
489 if (u2 < 0xDC00 || u2 > 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
490 { error("surrogate UTF-16 low value %04x out of range", u2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
491 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
492 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
493 u = (u - 0xD7C0) << 10;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
494 u |= (u2 - 0xDC00);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
495 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
496 else if (u >= 0xDC00 && u <= 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
497 { error("unpaired surrogate UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
498 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
499 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
500 else if (u == 0xFFFE || u == 0xFFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
501 { error("illegal UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
502 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
503 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
504 dbuf.writeUTF8(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
505 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
506 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
507 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
508 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
509 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
510 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
511 buf = (unsigned char *) dbuf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
512 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
513 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
514 else if (buf[0] == 0xFE && buf[1] == 0xFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
515 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
516 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
517 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
518 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
519 else if (buflen >= 4 && buf[0] == 0 && buf[1] == 0 && buf[2] == 0xFE && buf[3] == 0xFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
520 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
521 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
522 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
523 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
524 else if (buflen >= 3 && buf[0] == 0xEF && buf[1] == 0xBB && buf[2] == 0xBF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
525 { // UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
526
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
527 buf += 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
528 buflen -= 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
529 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
530 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
531 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
532 /* There is no BOM. Make use of Arcane Jill's insight that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
533 * the first char of D source must be ASCII to
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
534 * figure out the encoding.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
535 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
536
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
537 bom = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
538 if (buflen >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
539 { if (buf[1] == 0 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
540 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
541 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
542 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
543 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
544 else if (buf[0] == 0 && buf[1] == 0 && buf[2] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
545 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
546 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
547 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
548 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
549 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
550 if (buflen >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
551 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
552 if (buf[1] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
553 { // UTF-16LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
554 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
555 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
556 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
557 else if (buf[0] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
558 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
559 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
560 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
561 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
562 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
563
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
564 // It's UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
565 if (buf[0] >= 0x80)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
566 { error("source file must start with BOM or ASCII character, not \\x%02X", buf[0]);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
567 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
568 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
569 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
570 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
571
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
572 #ifdef IN_GCC
1133
eeb8b95ea92e Cleanup DMD 1.041 merge.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1103
diff changeset
573 // dump utf-8 encoded source
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
574 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
575 { // %% srcname could contain a path ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
576 d_gcc_dump_source(srcname, "utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
577 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
578 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
579
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
580 /* If it starts with the string "Ddoc", then it's a documentation
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
581 * source file.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
582 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
583 if (buflen >= 4 && memcmp(buf, "Ddoc", 4) == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
584 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
585 comment = buf + 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
586 isDocFile = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
587 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
588 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
589 if (isHtml)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
590 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
591 OutBuffer *dbuf = new OutBuffer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
592 Html h(srcname, buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
593 h.extractCode(dbuf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
594 buf = dbuf->data;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
595 buflen = dbuf->offset;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
596 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
597 // dump extracted source
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
598 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
599 d_gcc_dump_source(srcname, "d.utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
600 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
601 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
602 Parser p(this, buf, buflen, docfile != NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
603 p.nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
604 members = p.parseModule();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
605 md = p.md;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
606 numlines = p.loc.linnum;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
607
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
608 DsymbolTable *dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
609
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
610 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
611 { this->ident = md->id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
612 dst = Package::resolve(md->packages, &this->parent, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
613 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
614 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
615 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
616 dst = modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
617
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
618 /* Check to see if module name is a valid identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
619 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
620 if (!Lexer::isValidIdentifier(this->ident->toChars()))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
621 error("has non-identifier characters in filename, use module declaration instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
622 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
623
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
624 // Update global list of modules
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
625 if (!dst->insert(this))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
626 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
627 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
628 error(loc, "is in multiple packages %s", md->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
629 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
630 error(loc, "is in multiple defined");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
631 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
632 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
633 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
634 amodules.push(this);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
635 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
636 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
637
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
638 void Module::semantic(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
639 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
640
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
641 if (semanticstarted)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
642 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
643
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
644 //printf("+Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
645 semanticstarted = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
646
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
647 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
648 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
649 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
650 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
651
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
652 //printf("Module = %p, linkage = %d\n", sc->scopesym, sc->linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
653
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
654 // Add import of "object" if this module isn't "object"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
655 if (ident != Id::object)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
656 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
657 Import *im = new Import(0, NULL, Id::object, NULL, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
658 members->shift(im);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
659 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
660
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
661 // Add all symbols into module's symbol table
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
662 symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
663 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
664 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
665
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
666 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
667 s->addMember(NULL, sc->scopesym, 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
668 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
669
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
670 // Pass 1 semantic routines: do public side of the definition
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
671 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
672 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
673
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
674 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
675 //printf("\tModule('%s'): '%s'.semantic()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
676 s->semantic(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
677 runDeferredSemantic();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
678 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
679
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
680 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
681 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
682 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
683 //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
684 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
685
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
686 void Module::semantic2(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
687 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
688
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
689 if (deferred.dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
690 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
691 for (int i = 0; i < deferred.dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
692 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
693 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
694
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
695 sd->error("unable to resolve forward reference in definition");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
696 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
697 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
698 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
699 //printf("Module::semantic2('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
700 if (semanticstarted >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
701 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
702 assert(semanticstarted == 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
703 semanticstarted = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
704
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
705 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
706 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
707 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
708 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
709 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
710
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
711 // Pass 2 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
712 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
713 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
714
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
715 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
716 s->semantic2(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
717 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
718
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
719 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
720 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
721 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
722 //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
723 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
724
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
725 void Module::semantic3(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
726 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
727
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
728 //printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
729 if (semanticstarted >= 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
730 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
731 assert(semanticstarted == 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
732 semanticstarted = 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
733
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
734 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
735 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
736 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
737 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
738 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
739
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
740 // Pass 3 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
741 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
742 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
743
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
744 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
745 //printf("Module %s: %s.semantic3()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
746 s->semantic3(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
747 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
748
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
749 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
750 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
751 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
752 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
753
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
754 void Module::inlineScan()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
755 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
756
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
757 if (semanticstarted >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
758 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
759 assert(semanticstarted == 3);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
760 semanticstarted = 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
761
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
762 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
763 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
764 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
765 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
766
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
767 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
768 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
769
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
770 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
771 //if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
772 //printf("inline scan symbol %s\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
773
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
774 s->inlineScan();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
775 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
776 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
777 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
778
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
779 /****************************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
780 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
781
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
782 // is this used anywhere?
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
783 /*
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
784 void Module::gensymfile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
785 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
786 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
787 HdrGenState hgs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
788
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
789 //printf("Module::gensymfile()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
790
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
791 buf.printf("// Sym file generated from '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
792 buf.writenl();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
793
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
794 for (int i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
795 { Dsymbol *s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
796
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
797 s->toCBuffer(&buf, &hgs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
798 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
799
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
800 // Transfer image to file
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
801 symfile->setbuffer(buf.data, buf.offset);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
802 buf.data = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
803
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
804 symfile->writev();
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
805 }*/
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
806
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
807 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
808 * Determine if we need to generate an instance of ModuleInfo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
809 * for this Module.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
810 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
811
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
812 int Module::needModuleInfo()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
813 {
550
cbe08531430f Removed unimplemented switches.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 510
diff changeset
814 return needmoduleinfo;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
815 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
816
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
817 Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
818 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
819 /* Since modules can be circularly referenced,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
820 * need to stop infinite recursive searches.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
821 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
822
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
823 //printf("%s Module::search('%s', flags = %d) insearch = %d\n", toChars(), ident->toChars(), flags, insearch);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
824 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
825 if (insearch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
826 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
827 else if (searchCacheIdent == ident && searchCacheFlags == flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
828 s = searchCacheSymbol;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
829 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
830 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
831 insearch = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
832 s = ScopeDsymbol::search(loc, ident, flags);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
833 insearch = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
834
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
835 searchCacheIdent = ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
836 searchCacheSymbol = s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
837 searchCacheFlags = flags;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
838 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
839 return s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
840 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
841
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
842 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
843 * Can't run semantic on s now, try again later.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
844 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
845
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
846 void Module::addDeferredSemantic(Dsymbol *s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
847 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
848 // Don't add it if it is already there
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
849 for (int i = 0; i < deferred.dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
850 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
851 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
852
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
853 if (sd == s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
854 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
855 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
856
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
857 //printf("Module::addDeferredSemantic('%s')\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
858 deferred.push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
859 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
860
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
861
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
862 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
863 * Run semantic() on deferred symbols.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
864 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
865
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
866 void Module::runDeferredSemantic()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
867 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
868 size_t len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
869
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
870 static int nested;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
871 if (nested)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
872 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
873 //if (deferred.dim) printf("+Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
874 nested++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
875
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
876 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
877 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
878 dprogress = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
879 len = deferred.dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
880 if (!len)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
881 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
882
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
883 Dsymbol **todo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
884 Dsymbol *tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
885 if (len == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
886 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
887 todo = &tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
888 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
889 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
890 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
891 todo = (Dsymbol **)alloca(len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
892 assert(todo);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
893 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
894 memcpy(todo, deferred.data, len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
895 deferred.setDim(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
896
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
897 for (int i = 0; i < len; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
898 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
899 Dsymbol *s = todo[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
900
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
901 s->semantic(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
902 //printf("deferred: %s, parent = %s\n", s->toChars(), s->parent->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
903 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
904 //printf("\tdeferred.dim = %d, len = %d, dprogress = %d\n", deferred.dim, len, dprogress);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
905 } while (deferred.dim < len || dprogress); // while making progress
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
906 nested--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
907 //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
908 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
909
875
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
910 /************************************
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
911 * Recursively look at every module this module imports,
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
912 * return TRUE if it imports m.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
913 * Can be used to detect circular imports.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
914 */
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
915
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
916 int Module::imports(Module *m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
917 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
918 //printf("%s Module::imports(%s)\n", toChars(), m->toChars());
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
919 int aimports_dim = aimports.dim;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
920 #if 0
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
921 for (int i = 0; i < aimports.dim; i++)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
922 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
923 printf("\t[%d] %s\n", i, mi->toChars());
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
924 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
925 #endif
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
926 for (int i = 0; i < aimports.dim; i++)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
927 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
928 if (mi == m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
929 return TRUE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
930 if (!mi->insearch)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
931 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
932 mi->insearch = 1;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
933 int r = mi->imports(m);
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
934 if (r)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
935 return r;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
936 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
937 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
938 return FALSE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
939 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
940
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
941 /*************************************
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
942 * Return !=0 if module imports itself.
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
943 */
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
944
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
945 int Module::selfImports()
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
946 {
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
947 //printf("Module::selfImports() %s\n", toChars());
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
948 if (!selfimports)
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
949 {
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
950 for (int i = 0; i < amodules.dim; i++)
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
951 { Module *mi = (Module *)amodules.data[i];
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
952 //printf("\t[%d] %s\n", i, mi->toChars());
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
953 mi->insearch = 0;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
954 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
955
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
956 selfimports = imports(this) + 1;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
957
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
958 for (int i = 0; i < amodules.dim; i++)
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
959 { Module *mi = (Module *)amodules.data[i];
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
960 //printf("\t[%d] %s\n", i, mi->toChars());
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
961 mi->insearch = 0;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
962 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
963 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
964 return selfimports - 1;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
965 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
966
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
967
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
968 /* =========================== ModuleDeclaration ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
969
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
970 ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
971 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
972 this->packages = packages;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
973 this->id = id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
974 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
975
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
976 char *ModuleDeclaration::toChars()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
977 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
978 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
979 int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
980
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
981 if (packages && packages->dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
982 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
983 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
984 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
985
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
986 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
987 buf.writeByte('.');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
988 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
989 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
990 buf.writestring(id->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
991 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
992 return (char *)buf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
993 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
994
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
995 /* =========================== Package ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
996
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
997 Package::Package(Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
998 : ScopeDsymbol(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
999 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1000 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1001
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1002
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1003 const char *Package::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1004 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1005 return "package";
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1006 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1007
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1008
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1009 DsymbolTable *Package::resolve(Array *packages, Dsymbol **pparent, Package **ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1010 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1011 DsymbolTable *dst = Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1012 Dsymbol *parent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1013
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1014 //printf("Package::resolve()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1015 if (ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1016 *ppkg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1017
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1018 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1019 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1020
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1021 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1022 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1023 Dsymbol *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1024
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1025 p = dst->lookup(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1026 if (!p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1027 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1028 p = new Package(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1029 dst->insert(p);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1030 p->parent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1031 ((ScopeDsymbol *)p)->symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1032 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1033 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1034 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1035 assert(p->isPackage());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1036 if (p->isModule())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1037 { p->error("module and package have the same name");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1038 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1039 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1040 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1041 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1042 parent = p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1043 dst = ((Package *)p)->symtab;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1044 if (ppkg && !*ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1045 *ppkg = (Package *)p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1046 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1047 if (pparent)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1048 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1049 *pparent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1050 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1051 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1052 return dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1053 }