annotate dmd/module.c @ 1578:1dee66f6ec0b

Removed a chunk of code in favour of a shorter and more portable method
author Robert Clipsham <robert@octarineparrot.com>
date Tue, 08 Sep 2009 11:21:30 +0100
parents 68dea5bae9e9
children def7a1d494fd
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"
1564
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
49 #include <map>
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
50
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
51 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
52 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
53 llvm::cl::ZeroOrMore);
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
54
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
55 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
56 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
57 llvm::cl::ZeroOrMore);
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
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
60
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
61 ClassDeclaration *Module::moduleinfo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
62
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
63 Module *Module::rootModule;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
64 DsymbolTable *Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
65 Array Module::amodules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
66
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
67 Array Module::deferred; // deferred Dsymbol's needing semantic() run on them
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
68 unsigned Module::dprogress;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
69
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
70 void Module::init()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
71 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
72 modules = new DsymbolTable();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
75 Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
76 : Package(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
77 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
78 FileName *srcfilename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
79
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
80 // printf("Module::Module(filename = '%s', ident = '%s')\n", filename, ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
81 this->arg = filename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
82 md = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
83 errors = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
84 numlines = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
85 members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
86 isHtml = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
87 isDocFile = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
88 needmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
89 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
90 strictlyneedmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
91 #endif
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
92 selfimports = 0;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
93 insearch = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
94 searchCacheIdent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
95 searchCacheSymbol = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
96 searchCacheFlags = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
97 semanticstarted = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
98 semanticdone = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
99 decldefs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
100 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
101 #if IN_DMD
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
102 massert = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
103 marray = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
104 sictor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
105 sctor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
106 sdtor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
107 stest = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
108 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
109 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
110 root = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
111 importedFrom = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
112 srcfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
113 objfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
114 docfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
115 hdrfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
116
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
117 debuglevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
118 debugids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
119 debugidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
120 versionlevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
121 versionids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
122 versionidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
123
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
124 macrotable = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
125 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
126 #if IN_DMD
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
127 doppelganger = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
128 cov = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
129 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
130 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
131
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
132 srcfilename = FileName::defaultExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
133 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
134 !srcfilename->equalsExt(global.hdr_ext) &&
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
135 !srcfilename->equalsExt("dd"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
136 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
137 if (srcfilename->equalsExt("html") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
138 srcfilename->equalsExt("htm") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
139 srcfilename->equalsExt("xhtml"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
140 isHtml = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
141 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
142 { 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
143 fatal();
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
146 srcfile = new File(srcfilename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
147
664
eef8ac26c66c Some missed LLVMDC -> LDC.
Christian Kamm <kamm incasoftware de>
parents: 643
diff changeset
148 // 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
149 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
150 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
151 this->doHdrGen = doHdrGen;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
152 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
153
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
154 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
155 {
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
156 const char *argobj;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
157 if (forcename)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
158 argobj = forcename;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
159 else
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
160 {
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
161 if (preservePaths)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
162 argobj = (char*)this->arg;
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
163 else
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
164 argobj = FileName::name((char*)this->arg);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
165
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
166 if (fqnNames)
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
167 {
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
168 if(md)
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
169 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
170 else
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
171 argobj = FileName::replaceName((char*)argobj, toChars());
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
172
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
173 // 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
174 size_t len = strlen(argobj);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
175 size_t extlen = strlen(ext);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
176 char* s = (char *)alloca(len + 1 + extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
177 memcpy(s, argobj, len);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
178 s[len] = '.';
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
179 memcpy(s + len + 1, ext, extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
180 s[len+1+extlen] = 0;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
181 argobj = s;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
182 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
183 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
184
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
185 if (!FileName::absolute(argobj))
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
186 {
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
187 argobj = FileName::combine(path, argobj);
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
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
190 FileName::ensurePathExists(FileName::path(argobj));
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
191
708
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
192 // 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
193 // if (forcename)
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
194 // 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
195 // else
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
196 // 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
197 #if _WIN32
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
198 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
199 && 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
200 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
201 #endif
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
202 return new File(FileName::forceExt(argobj, ext));
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
203 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
204
1564
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
205 // LDC
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
206 static void check_and_add_output_file(Module* NewMod, const std::string& str)
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
207 {
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
208 typedef std::map<std::string, Module*> map_t;
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
209 static map_t files;
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
210
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
211 map_t::iterator i = files.find(str);
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
212 if (i != files.end())
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
213 {
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
214 Module* ThisMod = i->second;
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
215 error("Output file '%s' for module '%s' collides with previous module '%s'. See the -oq option",
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
216 str.c_str(), NewMod->toPrettyChars(), ThisMod->toPrettyChars());
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
217 fatal();
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
218 }
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
219 files.insert(std::make_pair(str, NewMod));
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
220 }
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
221
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
222 void Module::buildTargetFiles()
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
223 {
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
224 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
225 (!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
226 (!doHdrGen || hdrfile))
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
227 return;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
228
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
229 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
230 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
231 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
232 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
233 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
234 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
235
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
236 // 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
237 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
238 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
239 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
240 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
241 }
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(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
243 {
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
244 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
245 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
246 }
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
247 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
248 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
249 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
250 fatal();
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
251 }
1564
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
252
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
253 // LDC
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
254 // another safety check to make sure we don't overwrite previous output files
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
255 check_and_add_output_file(this, objfile->name->str);
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
256 if (docfile)
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
257 check_and_add_output_file(this, docfile->name->str);
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
258 if (hdrfile)
68dea5bae9e9 Added check and error in case two same named modules - with different packages and compiled at once - would overwrite each other's output files.
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1257
diff changeset
259 check_and_add_output_file(this, hdrfile->name->str);
336
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
262 void Module::deleteObjFile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
263 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
264 if (global.params.obj)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
265 objfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
266 //if (global.params.llvmBC)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
267 //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
268 if (doDocComment && docfile)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
269 docfile->remove();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
272 Module::~Module()
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
275
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
276 const char *Module::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
277 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
278 return "module";
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
279 }
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 Module *Module::load(Loc loc, Array *packages, Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
282 { Module *m;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
283 char *filename;
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 //printf("Module::load(ident = '%s')\n", ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
286
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
287 // Build module filename by turning:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
288 // foo.bar.baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
289 // into:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
290 // foo\bar\baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
291 filename = ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
292 if (packages && packages->dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
293 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
294 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
295 int i;
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 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
298 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
299
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
300 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
301 #if _WIN32
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
302 buf.writeByte('\\');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
303 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
304 buf.writeByte('/');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
305 #endif
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 buf.writestring(filename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
308 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
309 filename = (char *)buf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
310 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
311
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
312 m = new Module(filename, ident, 0, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
313 m->loc = loc;
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 /* Search along global.path for .di file, then .d file.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
316 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
317 char *result = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
318 FileName *fdi = FileName::forceExt(filename, global.hdr_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
319 FileName *fd = FileName::forceExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
320 char *sdi = fdi->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
321 char *sd = fd->toChars();
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 if (FileName::exists(sdi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
324 result = sdi;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
325 else if (FileName::exists(sd))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
326 result = sd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
327 else if (FileName::absolute(filename))
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 else if (!global.path)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
330 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
331 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
332 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
333 for (size_t i = 0; i < global.path->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
334 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
335 char *p = (char *)global.path->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
336 char *n = FileName::combine(p, sdi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
337 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
338 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
339 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
340 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
341 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
342 n = FileName::combine(p, sd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
343 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
344 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
345 break;
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 mem.free(n);
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 if (result)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
351 m->srcfile = new File(result);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
352
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
353 if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
354 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
355 printf("import ");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
356 if (packages)
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 for (size_t i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
359 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
360 printf("%s.", pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
361 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
362 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
363 printf("%s\t(%s)\n", ident->toChars(), m->srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
364 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
365
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
366 m->read(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
367 m->parse();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
368
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
369 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
370 d_gcc_magic_module(m);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
371 #endif
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 return m;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
376 void Module::read(Loc loc)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
377 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
378 //printf("Module::read('%s') file '%s'\n", toChars(), srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
379 if (srcfile->read())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
380 { error(loc, "cannot read file '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
381 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
382 }
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 readwordLE(unsigned short *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 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
388 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
389 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
390 return (((unsigned char *)p)[1] << 8) | ((unsigned char *)p)[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
391 #endif
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
394 inline unsigned readwordBE(unsigned short *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
395 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
396 return (((unsigned char *)p)[0] << 8) | ((unsigned char *)p)[1];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
397 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
398
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
399 inline unsigned readlongLE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
400 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
401 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
402 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
403 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
404 return ((unsigned char *)p)[0] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
405 (((unsigned char *)p)[1] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
406 (((unsigned char *)p)[2] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
407 (((unsigned char *)p)[3] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
408 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
409 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
410
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
411 inline unsigned readlongBE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
412 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
413 return ((unsigned char *)p)[3] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
414 (((unsigned char *)p)[2] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
415 (((unsigned char *)p)[1] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
416 (((unsigned char *)p)[0] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
417 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
418
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
419 #if IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
420 void Module::parse(bool dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
421 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
422 void Module::parse()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
423 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
424 { char *srcname;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
425 unsigned char *buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
426 unsigned buflen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
427 unsigned le;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
428 unsigned bom;
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 //printf("Module::parse()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
431
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
432 srcname = srcfile->name->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
433 //printf("Module::parse(srcname = '%s')\n", srcname);
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 buf = srcfile->buffer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
436 buflen = srcfile->len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
437
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
438 if (buflen >= 2)
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 /* Convert all non-UTF-8 formats to UTF-8.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
441 * BOM : http://www.unicode.org/faq/utf_bom.html
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
442 * 00 00 FE FF UTF-32BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
443 * FF FE 00 00 UTF-32LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
444 * FE FF UTF-16BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
445 * FF FE UTF-16LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
446 * EF BB BF UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
447 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
448
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
449 bom = 1; // assume there's a BOM
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
450 if (buf[0] == 0xFF && buf[1] == 0xFE)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
451 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
452 if (buflen >= 4 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
453 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
454 le = 1;
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 Lutf32:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
457 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
458 unsigned *pu = (unsigned *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
459 unsigned *pumax = &pu[buflen / 4];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
460
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
461 if (buflen & 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
462 { error("odd length of UTF-32 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
463 fatal();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
466 dbuf.reserve(buflen / 4);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
467 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
468 { unsigned u;
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 u = le ? readlongLE(pu) : readlongBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
471 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
472 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
473 if (u > 0x10FFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
474 { error("UTF-32 value %08x greater than 0x10FFFF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
475 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
476 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
477 dbuf.writeUTF8(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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
480 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
481 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
482 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
483 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
484 buf = (unsigned char *) dbuf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
485 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
486 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
487 { // UTF-16LE (X86)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
488 // Convert it to UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
489 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
490
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
491 Lutf16:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
492 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
493 unsigned short *pu = (unsigned short *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
494 unsigned short *pumax = &pu[buflen / 2];
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 if (buflen & 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
497 { error("odd length of UTF-16 char source %u", buflen);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
501 dbuf.reserve(buflen / 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
502 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
503 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
504
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
505 u = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
506 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
507 { if (u >= 0xD800 && u <= 0xDBFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
508 { unsigned u2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
509
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
510 if (++pu > pumax)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
511 { error("surrogate UTF-16 high value %04x at EOF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
512 fatal();
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 u2 = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
515 if (u2 < 0xDC00 || u2 > 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
516 { error("surrogate UTF-16 low value %04x out of range", u2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
517 fatal();
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 u = (u - 0xD7C0) << 10;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
520 u |= (u2 - 0xDC00);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
521 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
522 else if (u >= 0xDC00 && u <= 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
523 { error("unpaired surrogate UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
524 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
525 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
526 else if (u == 0xFFFE || u == 0xFFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
527 { error("illegal UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
528 fatal();
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 dbuf.writeUTF8(u);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
533 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
534 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
535 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
536 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
537 buf = (unsigned char *) dbuf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
538 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
539 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
540 else if (buf[0] == 0xFE && buf[1] == 0xFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
541 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
542 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
543 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
544 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
545 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
546 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
547 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
548 goto Lutf32;
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 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
551 { // UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
552
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
553 buf += 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
554 buflen -= 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
555 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
556 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
557 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
558 /* There is no BOM. Make use of Arcane Jill's insight that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
559 * the first char of D source must be ASCII to
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
560 * figure out the encoding.
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 bom = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
564 if (buflen >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
565 { if (buf[1] == 0 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
566 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
567 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
568 goto Lutf32;
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 else if (buf[0] == 0 && buf[1] == 0 && buf[2] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
571 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
572 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
573 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
574 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
575 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
576 if (buflen >= 2)
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 if (buf[1] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
579 { // UTF-16LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
580 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
581 goto Lutf16;
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 else if (buf[0] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
584 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
585 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
586 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
587 }
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
590 // It's UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
591 if (buf[0] >= 0x80)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
592 { 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
593 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
594 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
595 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
596 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
597
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
598 #ifdef IN_GCC
1133
eeb8b95ea92e Cleanup DMD 1.041 merge.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1103
diff changeset
599 // dump utf-8 encoded source
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
600 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
601 { // %% srcname could contain a path ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
602 d_gcc_dump_source(srcname, "utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
603 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
604 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
605
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
606 /* If it starts with the string "Ddoc", then it's a documentation
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
607 * source file.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
608 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
609 if (buflen >= 4 && memcmp(buf, "Ddoc", 4) == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
610 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
611 comment = buf + 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
612 isDocFile = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
613 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
614 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
615 if (isHtml)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
616 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
617 OutBuffer *dbuf = new OutBuffer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
618 Html h(srcname, buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
619 h.extractCode(dbuf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
620 buf = dbuf->data;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
621 buflen = dbuf->offset;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
622 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
623 // dump extracted source
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
624 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
625 d_gcc_dump_source(srcname, "d.utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
626 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
627 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
628 Parser p(this, buf, buflen, docfile != NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
629 p.nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
630 members = p.parseModule();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
631 md = p.md;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
632 numlines = p.loc.linnum;
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 DsymbolTable *dst;
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 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
637 { this->ident = md->id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
638 dst = Package::resolve(md->packages, &this->parent, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
639 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
640 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
641 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
642 dst = modules;
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 /* Check to see if module name is a valid identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
645 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
646 if (!Lexer::isValidIdentifier(this->ident->toChars()))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
647 error("has non-identifier characters in filename, use module declaration instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
648 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
649
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
650 // Update global list of modules
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
651 if (!dst->insert(this))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
652 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
653 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
654 error(loc, "is in multiple packages %s", md->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
655 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
656 error(loc, "is in multiple defined");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
657 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
658 else
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 amodules.push(this);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
661 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
662 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
663
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
664 void Module::semantic(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
665 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
666
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
667 if (semanticstarted)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
668 return;
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 //printf("+Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
671 semanticstarted = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
672
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
673 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
674 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
675 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
676 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
677
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
678 //printf("Module = %p, linkage = %d\n", sc->scopesym, sc->linkage);
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 // Add import of "object" if this module isn't "object"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
681 if (ident != Id::object)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
682 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
683 Import *im = new Import(0, NULL, Id::object, NULL, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
684 members->shift(im);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
685 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
686
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
687 // Add all symbols into module's symbol table
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
688 symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
689 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
690 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
691
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
692 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
693 s->addMember(NULL, sc->scopesym, 1);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
696 // Pass 1 semantic routines: do public side of the definition
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
697 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
698 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
699
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
700 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
701 //printf("\tModule('%s'): '%s'.semantic()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
702 s->semantic(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
703 runDeferredSemantic();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
706 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
707 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
708 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
709 //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
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
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
712 void Module::semantic2(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
713 { int i;
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 if (deferred.dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
716 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
717 for (int i = 0; i < deferred.dim; i++)
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 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
720
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
721 sd->error("unable to resolve forward reference in definition");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
722 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
723 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
724 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
725 //printf("Module::semantic2('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
726 if (semanticstarted >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
727 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
728 assert(semanticstarted == 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
729 semanticstarted = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
730
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
731 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
732 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
733 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
734 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
735 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
736
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
737 // Pass 2 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
738 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
739 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
740
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
741 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
742 s->semantic2(sc);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
745 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
746 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
747 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
748 //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
749 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
750
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
751 void Module::semantic3(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
752 { int i;
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 //printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
755 if (semanticstarted >= 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
756 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
757 assert(semanticstarted == 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
758 semanticstarted = 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
759
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
760 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
761 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
762 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
763 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
764 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
765
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
766 // Pass 3 semantic routines: do initializers and function bodies
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 //printf("Module %s: %s.semantic3()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
772 s->semantic3(sc);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
775 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
776 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
777 semanticdone = semanticstarted;
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 void Module::inlineScan()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
781 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
782
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
783 if (semanticstarted >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
784 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
785 assert(semanticstarted == 3);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
786 semanticstarted = 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
787
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
788 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
789 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
790 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
791 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
792
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
793 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
794 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
795
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
796 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
797 //if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
798 //printf("inline scan symbol %s\n", s->toChars());
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 s->inlineScan();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
801 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
802 semanticdone = semanticstarted;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
805 /****************************************************
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
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
808 // is this used anywhere?
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
809 /*
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
810 void Module::gensymfile()
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 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
813 HdrGenState hgs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
814
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
815 //printf("Module::gensymfile()\n");
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 buf.printf("// Sym file generated from '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
818 buf.writenl();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
819
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
820 for (int i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
821 { Dsymbol *s = (Dsymbol *)members->data[i];
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 s->toCBuffer(&buf, &hgs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
824 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
825
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
826 // Transfer image to file
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
827 symfile->setbuffer(buf.data, buf.offset);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
828 buf.data = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
829
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
830 symfile->writev();
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
831 }*/
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
832
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
833 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
834 * Determine if we need to generate an instance of ModuleInfo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
835 * for this Module.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
836 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
837
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
838 int Module::needModuleInfo()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
839 {
550
cbe08531430f Removed unimplemented switches.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 510
diff changeset
840 return needmoduleinfo;
336
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 Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
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 /* Since modules can be circularly referenced,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
846 * need to stop infinite recursive searches.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
849 //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
850 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
851 if (insearch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
852 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
853 else if (searchCacheIdent == ident && searchCacheFlags == flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
854 s = searchCacheSymbol;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
855 else
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 insearch = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
858 s = ScopeDsymbol::search(loc, ident, flags);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
859 insearch = 0;
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 searchCacheIdent = ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
862 searchCacheSymbol = s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
863 searchCacheFlags = flags;
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 return s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
866 }
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 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
869 * Can't run semantic on s now, try again later.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
870 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
871
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
872 void Module::addDeferredSemantic(Dsymbol *s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
873 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
874 // Don't add it if it is already there
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
875 for (int i = 0; i < deferred.dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
876 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
877 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
878
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
879 if (sd == s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
880 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
881 }
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 //printf("Module::addDeferredSemantic('%s')\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
884 deferred.push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
885 }
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
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 * Run semantic() on deferred symbols.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
892 void Module::runDeferredSemantic()
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 size_t len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
895
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
896 static int nested;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
897 if (nested)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
898 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
899 //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
900 nested++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
901
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
902 do
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 dprogress = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
905 len = deferred.dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
906 if (!len)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
907 break;
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 Dsymbol **todo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
910 Dsymbol *tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
911 if (len == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
912 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
913 todo = &tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
914 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
915 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
916 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
917 todo = (Dsymbol **)alloca(len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
918 assert(todo);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
919 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
920 memcpy(todo, deferred.data, len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
921 deferred.setDim(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
922
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
923 for (int i = 0; i < len; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
924 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
925 Dsymbol *s = todo[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
926
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
927 s->semantic(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
928 //printf("deferred: %s, parent = %s\n", s->toChars(), s->parent->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
929 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
930 //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
931 } while (deferred.dim < len || dprogress); // while making progress
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
932 nested--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
933 //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
934 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
935
875
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 * 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
938 * return TRUE if it imports m.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
939 * Can be used to detect circular imports.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
940 */
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
941
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
942 int Module::imports(Module *m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
943 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
944 //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
945 int aimports_dim = aimports.dim;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
946 #if 0
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
947 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
948 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
949 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
950 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
951 #endif
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
952 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
953 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
954 if (mi == m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
955 return TRUE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
956 if (!mi->insearch)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
957 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
958 mi->insearch = 1;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
959 int r = mi->imports(m);
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
960 if (r)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
961 return r;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
962 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
963 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
964 return FALSE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
965 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
966
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
967 /*************************************
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
968 * 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
969 */
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
970
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
971 int Module::selfImports()
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
972 {
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
973 //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
974 if (!selfimports)
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
975 {
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
976 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
977 { 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
978 //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
979 mi->insearch = 0;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
980 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
981
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
982 selfimports = imports(this) + 1;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
983
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
984 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
985 { 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
986 //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
987 mi->insearch = 0;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
988 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
989 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
990 return selfimports - 1;
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
991 }
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
992
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 986
diff changeset
993
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
994 /* =========================== ModuleDeclaration ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
995
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
996 ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
997 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
998 this->packages = packages;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
999 this->id = id;
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 char *ModuleDeclaration::toChars()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1003 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1004 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1005 int i;
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 if (packages && packages->dim)
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 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1010 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1011
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1012 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1013 buf.writeByte('.');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1014 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1015 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1016 buf.writestring(id->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1017 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1018 return (char *)buf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1019 }
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 /* =========================== Package ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1022
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1023 Package::Package(Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1024 : ScopeDsymbol(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1025 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1026 }
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1029 const char *Package::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1030 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1031 return "package";
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
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 DsymbolTable *Package::resolve(Array *packages, Dsymbol **pparent, Package **ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1036 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1037 DsymbolTable *dst = Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1038 Dsymbol *parent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1039
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1040 //printf("Package::resolve()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1041 if (ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1042 *ppkg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1043
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1044 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1045 { int i;
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 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1048 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1049 Dsymbol *p;
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 p = dst->lookup(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1052 if (!p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1053 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1054 p = new Package(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1055 dst->insert(p);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1056 p->parent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1057 ((ScopeDsymbol *)p)->symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1058 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1059 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1060 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1061 assert(p->isPackage());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1062 if (p->isModule())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1063 { p->error("module and package have the same name");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1064 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1065 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1066 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1067 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1068 parent = p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1069 dst = ((Package *)p)->symtab;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1070 if (ppkg && !*ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1071 *ppkg = (Package *)p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1072 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1073 if (pparent)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1074 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1075 *pparent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1076 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1077 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1078 return dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1079 }