annotate dmd/module.c @ 986:a8cb25d478c4

Use LLVM-style command line (instead of DMD-style) Note: For a backward compatible interface, use the new bin/ldmd script. It supports all old options while passing on anything it doesn't recognize. Some changes caused by this: * -debug and -version are now -d-debug and -d-version due to a conflict with standard LLVM options. * All "flag" options now allow an optional =true/=1/=false/=0 suffix. * Some "hidden debug switches" starting with "--" were renamed because LLVM doesn't care about the number of dashes, so they were conflicting with other options (such as -c). The new versions start with "-hidden-debug-" instead of "--" * --help works, but has a non-zero exit code. This breaks some Tango scripts which use it to test for compiler existence. See tango.patch. Some changes not (directly) caused by this; * (-enable/-disable)-FOO options are now available for pre- and postconditions. * -march is used instead of -m (like other LLVM programs), but -m is an alias for it. * -defaultlib, -debuglib, -d-debug and -d-version allow comma-separated values. The effect should be identical to specifying the same option multiple times. I decided against allowing these for some other options because paths might contain commas on some systems. * -fPIC is removed in favor of the standard LLVM option -relocation-model=pic Bug: * If -run is specified as the last argument in DFLAGS, no error is generated. (Not very serious IMHO)
author Frits van Bommel <fvbommel wxs.nl>
date Wed, 25 Feb 2009 17:34:51 +0100
parents 31bbc7f3b817
children b30fe7e1dbb9
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
3 // Copyright (c) 1999-2007 by Digital Mars
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
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
19 #if _MSC_VER || __MINGW32__
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
27 #include "mem.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
28
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
29 #include "mars.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
30 #include "module.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
31 #include "parse.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
32 #include "scope.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
33 #include "identifier.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
34 #include "id.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
35 #include "import.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
36 #include "dsymbol.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
37 #include "hdrgen.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
38 #include "lexer.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
39
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
40 #define MARS 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
41 #include "html.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
42
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
43 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
44 #include "d-dmd-gcc.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
45 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
46
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
47
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
48 #include "llvm/Support/CommandLine.h"
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
49
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
50 static llvm::cl::opt<bool> preservePaths("op",
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
51 llvm::cl::desc("Do not strip paths from source file"),
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
52 llvm::cl::ZeroOrMore);
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
53
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
54 static llvm::cl::opt<bool> fqnNames("oq",
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
55 llvm::cl::desc("Write object files with fully qualified names"),
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
56 llvm::cl::ZeroOrMore);
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
57
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
58
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
59
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
60 ClassDeclaration *Module::moduleinfo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
61
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
62 Module *Module::rootModule;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
63 DsymbolTable *Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
64 Array Module::amodules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
65
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
66 Array Module::deferred; // deferred Dsymbol's needing semantic() run on them
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
67 unsigned Module::dprogress;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
68
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
69 void Module::init()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
70 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
71 modules = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
72 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
73
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
74 Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
75 : Package(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
76 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
77 FileName *srcfilename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
78
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
79 // printf("Module::Module(filename = '%s', ident = '%s')\n", filename, ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
80 this->arg = filename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
81 md = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
82 errors = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
83 numlines = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
84 members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
85 isHtml = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
86 isDocFile = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
87 needmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
88 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
89 strictlyneedmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
90 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
91 insearch = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
92 searchCacheIdent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
93 searchCacheSymbol = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
94 searchCacheFlags = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
95 semanticstarted = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
96 semanticdone = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
97 decldefs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
98 vmoduleinfo = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
99 massert = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
100 marray = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
101 sictor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
102 sctor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
103 sdtor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
104 stest = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
105 sfilename = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
106 root = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
107 importedFrom = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
108 srcfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
109 objfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
110 docfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
111 hdrfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
112
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
113 debuglevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
114 debugids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
115 debugidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
116 versionlevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
117 versionids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
118 versionidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
119
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
120 macrotable = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
121 escapetable = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
122 doppelganger = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
123 cov = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
124 covb = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
125
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
126 srcfilename = FileName::defaultExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
127 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
128 !srcfilename->equalsExt(global.hdr_ext) &&
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
129 !srcfilename->equalsExt("dd"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
130 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
131 if (srcfilename->equalsExt("html") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
132 srcfilename->equalsExt("htm") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
133 srcfilename->equalsExt("xhtml"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
134 isHtml = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
135 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
136 { 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
137 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
138 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
139 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
140 srcfile = new File(srcfilename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
141
664
eef8ac26c66c Some missed LLVMDC -> LDC.
Christian Kamm <kamm incasoftware de>
parents: 643
diff changeset
142 // 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
143 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
144 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
145 this->doHdrGen = doHdrGen;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
146 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
147
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
148 File* Module::buildFilePath(char* forcename, char* path, char* ext)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
149 {
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
150 char *argobj;
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
151 if (forcename)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
152 argobj = forcename;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
153 else
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
154 {
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
155 if (preservePaths)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
156 argobj = (char*)this->arg;
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
157 else
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
158 argobj = FileName::name((char*)this->arg);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
159
986
a8cb25d478c4 Use LLVM-style command line (instead of DMD-style)
Frits van Bommel <fvbommel wxs.nl>
parents: 957
diff changeset
160 if (fqnNames)
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
161 {
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
162 if(md)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
163 argobj = FileName::replaceName(argobj, md->toChars());
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
164 else
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
165 argobj = FileName::replaceName(argobj, toChars());
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
166
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
167 // 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
168 size_t len = strlen(argobj);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
169 size_t extlen = strlen(ext);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
170 char* s = (char *)alloca(len + 1 + extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
171 memcpy(s, argobj, len);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
172 s[len] = '.';
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
173 memcpy(s + len + 1, ext, extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
174 s[len+1+extlen] = 0;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
175 argobj = s;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
176 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
177 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
178
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
179 if (!FileName::absolute(argobj))
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
180 {
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
181 argobj = FileName::combine(path, argobj);
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
182 }
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
183
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
184 FileName::ensurePathExists(FileName::path(argobj));
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
185
708
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
186 // 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
187 // if (forcename)
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
188 // 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
189 // else
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
190 // 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
191 #if _WIN32
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
192 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
193 && stricmp(FileName::ext(argobj), global.obj_ext_alt) == 0)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
194 return new File(argobj);
708
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
195 #endif
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
196 return new File(FileName::forceExt(argobj, ext));
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
197 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
198
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
199 void Module::buildTargetFiles()
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
200 {
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
201 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
202 (!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
203 (!doHdrGen || hdrfile))
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
204 return;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
205
604
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
206 if(!objfile)
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
207 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
208 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
209 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
210 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
211 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
212
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
213 // 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
214 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
215 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
216 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
217 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
218 }
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
219 if(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
220 {
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
221 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
222 fatal();
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
223 }
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
224 if(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
225 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
226 error("Output 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
227 fatal();
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
228 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
229 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
230
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
231 void Module::deleteObjFile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
232 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
233 if (global.params.obj)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
234 objfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
235 //if (global.params.llvmBC)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
236 //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
237 if (doDocComment && docfile)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
238 docfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
239 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
240
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
241 Module::~Module()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
242 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
243 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
244
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
245 const char *Module::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
246 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
247 return "module";
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
248 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
249
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
250 Module *Module::load(Loc loc, Array *packages, Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
251 { Module *m;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
252 char *filename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
253
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
254 //printf("Module::load(ident = '%s')\n", ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
255
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
256 // Build module filename by turning:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
257 // foo.bar.baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
258 // into:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
259 // foo\bar\baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
260 filename = ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
261 if (packages && packages->dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
262 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
263 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
264 int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
265
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
266 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
267 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
268
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
269 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
270 #if _WIN32
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
271 buf.writeByte('\\');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
272 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
273 buf.writeByte('/');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
274 #endif
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 buf.writestring(filename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
277 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
278 filename = (char *)buf.extractData();
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 m = new Module(filename, ident, 0, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
282 m->loc = loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
283
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
284 /* Search along global.path for .di file, then .d file.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
285 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
286 char *result = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
287 FileName *fdi = FileName::forceExt(filename, global.hdr_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
288 FileName *fd = FileName::forceExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
289 char *sdi = fdi->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
290 char *sd = fd->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
291
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
292 if (FileName::exists(sdi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
293 result = sdi;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
294 else if (FileName::exists(sd))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
295 result = sd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
296 else if (FileName::absolute(filename))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
297 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
298 else if (!global.path)
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
301 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
302 for (size_t i = 0; i < global.path->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
303 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
304 char *p = (char *)global.path->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
305 char *n = FileName::combine(p, sdi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
306 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
307 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
308 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
309 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
310 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
311 n = FileName::combine(p, sd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
312 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
313 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
314 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
315 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
316 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
317 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
318 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
319 if (result)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
320 m->srcfile = new File(result);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
321
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
322 if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
323 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
324 printf("import ");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
325 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
326 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
327 for (size_t i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
328 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
329 printf("%s.", pid->toChars());
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
332 printf("%s\t(%s)\n", ident->toChars(), m->srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
333 }
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 m->read(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
336 m->parse();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
337
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
338 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
339 d_gcc_magic_module(m);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
340 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
341
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
342 return m;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
343 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
344
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
345 void Module::read(Loc loc)
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 //printf("Module::read('%s') file '%s'\n", toChars(), srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
348 if (srcfile->read())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
349 { error(loc, "cannot read file '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
350 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
351 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
352 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
353
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
354 inline unsigned readwordLE(unsigned short *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
355 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
356 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
357 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
358 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
359 return (((unsigned char *)p)[1] << 8) | ((unsigned char *)p)[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
360 #endif
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 inline unsigned readwordBE(unsigned short *p)
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 return (((unsigned char *)p)[0] << 8) | ((unsigned char *)p)[1];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
366 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
367
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
368 inline unsigned readlongLE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
369 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
370 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
371 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
372 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
373 return ((unsigned char *)p)[0] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
374 (((unsigned char *)p)[1] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
375 (((unsigned char *)p)[2] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
376 (((unsigned char *)p)[3] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
377 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
378 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
379
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
380 inline unsigned readlongBE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
381 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
382 return ((unsigned char *)p)[3] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
383 (((unsigned char *)p)[2] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
384 (((unsigned char *)p)[1] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
385 (((unsigned char *)p)[0] << 24);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
388 #if IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
389 void Module::parse(bool dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
390 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
391 void Module::parse()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
392 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
393 { char *srcname;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
394 unsigned char *buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
395 unsigned buflen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
396 unsigned le;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
397 unsigned bom;
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 //printf("Module::parse()\n");
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 srcname = srcfile->name->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
402 //printf("Module::parse(srcname = '%s')\n", srcname);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
403
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
404 buf = srcfile->buffer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
405 buflen = srcfile->len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
406
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
407 if (buflen >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
408 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
409 /* Convert all non-UTF-8 formats to UTF-8.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
410 * BOM : http://www.unicode.org/faq/utf_bom.html
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
411 * 00 00 FE FF UTF-32BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
412 * FF FE 00 00 UTF-32LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
413 * FE FF UTF-16BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
414 * FF FE UTF-16LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
415 * EF BB BF UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
416 */
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 bom = 1; // assume there's a BOM
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
419 if (buf[0] == 0xFF && buf[1] == 0xFE)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
420 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
421 if (buflen >= 4 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
422 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
423 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
424
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
425 Lutf32:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
426 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
427 unsigned *pu = (unsigned *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
428 unsigned *pumax = &pu[buflen / 4];
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 if (buflen & 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
431 { error("odd length of UTF-32 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
432 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
433 }
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 dbuf.reserve(buflen / 4);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
436 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
437 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
438
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
439 u = le ? readlongLE(pu) : readlongBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
440 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
441 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
442 if (u > 0x10FFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
443 { error("UTF-32 value %08x greater than 0x10FFFF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
444 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
445 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
446 dbuf.writeUTF8(u);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
449 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
450 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
451 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
452 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
453 buf = (unsigned char *) dbuf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
454 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
455 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
456 { // UTF-16LE (X86)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
457 // Convert it to UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
458 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
459
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
460 Lutf16:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
461 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
462 unsigned short *pu = (unsigned short *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
463 unsigned short *pumax = &pu[buflen / 2];
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 if (buflen & 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
466 { error("odd length of UTF-16 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
467 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
468 }
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 dbuf.reserve(buflen / 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
471 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
472 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
473
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
474 u = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
475 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
476 { if (u >= 0xD800 && u <= 0xDBFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
477 { unsigned u2;
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 if (++pu > pumax)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
480 { error("surrogate UTF-16 high value %04x at EOF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
481 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
482 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
483 u2 = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
484 if (u2 < 0xDC00 || u2 > 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
485 { error("surrogate UTF-16 low value %04x out of range", u2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
486 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
487 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
488 u = (u - 0xD7C0) << 10;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
489 u |= (u2 - 0xDC00);
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 else if (u >= 0xDC00 && u <= 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
492 { error("unpaired surrogate UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
493 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
494 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
495 else if (u == 0xFFFE || u == 0xFFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
496 { error("illegal UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
497 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
498 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
499 dbuf.writeUTF8(u);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
502 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
503 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
504 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
505 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
506 buf = (unsigned char *) dbuf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
507 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
508 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
509 else if (buf[0] == 0xFE && buf[1] == 0xFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
510 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
511 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
512 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
513 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
514 else if (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
515 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
516 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
517 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
518 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
519 else if (buflen >= 3 && buf[0] == 0xEF && buf[1] == 0xBB && buf[2] == 0xBF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
520 { // UTF-8
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 buf += 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
523 buflen -= 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
524 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
525 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
526 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
527 /* There is no BOM. Make use of Arcane Jill's insight that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
528 * the first char of D source must be ASCII to
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
529 * figure out the encoding.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
530 */
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 bom = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
533 if (buflen >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
534 { if (buf[1] == 0 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
535 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
536 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
537 goto Lutf32;
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 else if (buf[0] == 0 && buf[1] == 0 && buf[2] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
540 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
541 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
542 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
543 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
544 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
545 if (buflen >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
546 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
547 if (buf[1] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
548 { // UTF-16LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
549 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
550 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
551 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
552 else if (buf[0] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
553 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
554 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
555 goto Lutf16;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
556 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
557 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
558
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
559 // It's UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
560 if (buf[0] >= 0x80)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
561 { 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
562 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
563 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
564 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
565 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
566
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
567 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
568 // dump utf-8 encoded source
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
569 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
570 { // %% srcname could contain a path ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
571 d_gcc_dump_source(srcname, "utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
572 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
573 #endif
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 /* If it starts with the string "Ddoc", then it's a documentation
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
576 * source file.
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 (buflen >= 4 && memcmp(buf, "Ddoc", 4) == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
579 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
580 comment = buf + 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
581 isDocFile = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
582 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
583 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
584 if (isHtml)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
585 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
586 OutBuffer *dbuf = new OutBuffer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
587 Html h(srcname, buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
588 h.extractCode(dbuf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
589 buf = dbuf->data;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
590 buflen = dbuf->offset;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
591 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
592 // dump extracted source
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
593 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
594 d_gcc_dump_source(srcname, "d.utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
595 #endif
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 Parser p(this, buf, buflen, docfile != NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
598 p.nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
599 members = p.parseModule();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
600 md = p.md;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
601 numlines = p.loc.linnum;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
602
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
603 DsymbolTable *dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
604
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
605 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
606 { this->ident = md->id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
607 dst = Package::resolve(md->packages, &this->parent, NULL);
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 else
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 dst = modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
612
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
613 /* Check to see if module name is a valid identifier
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 (!Lexer::isValidIdentifier(this->ident->toChars()))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
616 error("has non-identifier characters in filename, use module declaration instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
617 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
618
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
619 // Update global list of modules
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
620 if (!dst->insert(this))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
621 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
622 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
623 error(loc, "is in multiple packages %s", md->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
624 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
625 error(loc, "is in multiple defined");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
626 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
627 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
628 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
629 amodules.push(this);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
630 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
631 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
632
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
633 void Module::semantic(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
634 { int i;
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 (semanticstarted)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
637 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
638
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
639 //printf("+Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
640 semanticstarted = 1;
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 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
643 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
644 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
645 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
646
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
647 //printf("Module = %p, linkage = %d\n", sc->scopesym, sc->linkage);
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 // Add import of "object" if this module isn't "object"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
650 if (ident != Id::object)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
651 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
652 Import *im = new Import(0, NULL, Id::object, NULL, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
653 members->shift(im);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
654 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
655
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
656 // Add all symbols into module's symbol table
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
657 symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
658 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
659 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
660
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
661 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
662 s->addMember(NULL, sc->scopesym, 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
663 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
664
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
665 // Pass 1 semantic routines: do public side of the definition
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
666 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
667 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
668
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
669 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
670 //printf("\tModule('%s'): '%s'.semantic()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
671 s->semantic(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
672 runDeferredSemantic();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
673 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
674
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
675 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
676 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
677 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
678 //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
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
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
681 void Module::semantic2(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
682 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
683
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
684 if (deferred.dim)
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 for (int i = 0; i < deferred.dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
687 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
688 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
689
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
690 sd->error("unable to resolve forward reference in definition");
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 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
693 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
694 //printf("Module::semantic2('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
695 if (semanticstarted >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
696 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
697 assert(semanticstarted == 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
698 semanticstarted = 2;
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 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
701 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
702 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
703 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
704 //printf("Module = %p\n", sc.scopesym);
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 // Pass 2 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
707 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
708 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
709
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
710 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
711 s->semantic2(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
712 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
713
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
714 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
715 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
716 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
717 //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent);
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
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
720 void Module::semantic3(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
721 { int i;
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 //printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
724 if (semanticstarted >= 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
725 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
726 assert(semanticstarted == 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
727 semanticstarted = 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
728
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
729 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
730 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
731 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
732 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
733 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
734
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
735 // Pass 3 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
736 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
737 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
738
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
739 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
740 //printf("Module %s: %s.semantic3()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
741 s->semantic3(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
742 }
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 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
745 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
746 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
747 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
748
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
749 void Module::inlineScan()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
750 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
751
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
752 if (semanticstarted >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
753 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
754 assert(semanticstarted == 3);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
755 semanticstarted = 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
756
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
757 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
758 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
759 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
760 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
761
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
762 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
763 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
764
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
765 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
766 //if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
767 //printf("inline scan symbol %s\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
768
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
769 s->inlineScan();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
770 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
771 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
772 }
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 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
776
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
777 // is this used anywhere?
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
778 /*
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
779 void Module::gensymfile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
780 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
781 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
782 HdrGenState hgs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
783
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
784 //printf("Module::gensymfile()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
785
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
786 buf.printf("// Sym file generated from '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
787 buf.writenl();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
788
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
789 for (int i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
790 { Dsymbol *s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
791
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
792 s->toCBuffer(&buf, &hgs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
793 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
794
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
795 // Transfer image to file
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
796 symfile->setbuffer(buf.data, buf.offset);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
797 buf.data = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
798
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
799 symfile->writev();
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
800 }*/
336
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 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
803 * Determine if we need to generate an instance of ModuleInfo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
804 * for this Module.
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 int Module::needModuleInfo()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
808 {
550
cbe08531430f Removed unimplemented switches.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 510
diff changeset
809 return needmoduleinfo;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
810 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
811
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
812 Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
813 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
814 /* Since modules can be circularly referenced,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
815 * need to stop infinite recursive searches.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
818 //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
819 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
820 if (insearch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
821 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
822 else if (searchCacheIdent == ident && searchCacheFlags == flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
823 s = searchCacheSymbol;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
824 else
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 insearch = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
827 s = ScopeDsymbol::search(loc, ident, flags);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
828 insearch = 0;
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 searchCacheIdent = ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
831 searchCacheSymbol = s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
832 searchCacheFlags = flags;
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 return s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
835 }
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 * Can't run semantic on s now, try again later.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
839 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
840
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
841 void Module::addDeferredSemantic(Dsymbol *s)
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 // Don't add it if it is already there
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
844 for (int i = 0; i < deferred.dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
845 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
846 Dsymbol *sd = (Dsymbol *)deferred.data[i];
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 if (sd == s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
849 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
850 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
851
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
852 //printf("Module::addDeferredSemantic('%s')\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
853 deferred.push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
854 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
855
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
856
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
857 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
858 * Run semantic() on deferred symbols.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
859 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
860
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
861 void Module::runDeferredSemantic()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
862 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
863 size_t len;
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 static int nested;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
866 if (nested)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
867 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
868 //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
869 nested++;
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 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
872 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
873 dprogress = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
874 len = deferred.dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
875 if (!len)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
876 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
877
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
878 Dsymbol **todo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
879 Dsymbol *tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
880 if (len == 1)
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 todo = &tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
883 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
884 else
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 todo = (Dsymbol **)alloca(len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
887 assert(todo);
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 memcpy(todo, deferred.data, len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
890 deferred.setDim(0);
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 for (int i = 0; i < len; i++)
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 Dsymbol *s = todo[i];
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 s->semantic(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
897 //printf("deferred: %s, parent = %s\n", s->toChars(), s->parent->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
898 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
899 //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
900 } while (deferred.dim < len || dprogress); // while making progress
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
901 nested--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
902 //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
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
875
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
905 /************************************
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
906 * 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
907 * return TRUE if it imports m.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
908 * Can be used to detect circular imports.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
909 */
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
910
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
911 int Module::imports(Module *m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
912 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
913 //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
914 int aimports_dim = aimports.dim;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
915 #if 0
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
916 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
917 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
918 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
919 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
920 #endif
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
921 for (int i = 0; i < aimports.dim; i++)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
922 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
923 if (mi == m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
924 return TRUE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
925 if (!mi->insearch)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
926 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
927 mi->insearch = 1;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
928 int r = mi->imports(m);
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
929 mi->insearch = 0;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
930 if (r)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
931 return r;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
932 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
933 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
934 return FALSE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
935 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
936
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
937 /* =========================== ModuleDeclaration ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
938
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
939 ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
940 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
941 this->packages = packages;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
942 this->id = id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
943 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
944
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
945 char *ModuleDeclaration::toChars()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
946 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
947 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
948 int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
949
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
950 if (packages && packages->dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
951 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
952 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
953 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
954
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
955 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
956 buf.writeByte('.');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
957 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
958 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
959 buf.writestring(id->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
960 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
961 return (char *)buf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
962 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
963
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
964 /* =========================== Package ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
965
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
966 Package::Package(Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
967 : ScopeDsymbol(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
968 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
969 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
970
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
971
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
972 const char *Package::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
973 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
974 return "package";
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
975 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
976
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
977
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
978 DsymbolTable *Package::resolve(Array *packages, Dsymbol **pparent, Package **ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
979 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
980 DsymbolTable *dst = Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
981 Dsymbol *parent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
982
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
983 //printf("Package::resolve()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
984 if (ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
985 *ppkg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
986
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
987 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
988 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
989
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
990 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
991 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
992 Dsymbol *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
993
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
994 p = dst->lookup(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
995 if (!p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
996 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
997 p = new Package(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
998 dst->insert(p);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
999 p->parent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1000 ((ScopeDsymbol *)p)->symtab = new DsymbolTable();
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 else
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 assert(p->isPackage());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1005 if (p->isModule())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1006 { p->error("module and package have the same name");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1007 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1008 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1009 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1010 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1011 parent = p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1012 dst = ((Package *)p)->symtab;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1013 if (ppkg && !*ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1014 *ppkg = (Package *)p;
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 if (pparent)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1017 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1018 *pparent = parent;
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 return dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1022 }