annotate dmd/module.c @ 883:b52d5de7783f

GC defines and linkage changes.
author Christian Kamm <kamm incasoftware de>
date Thu, 08 Jan 2009 18:20:02 +0100
parents 330f999ade44
children 369996c08420
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
47 ClassDeclaration *Module::moduleinfo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
48
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
49 Module *Module::rootModule;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
50 DsymbolTable *Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
51 Array Module::amodules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
52
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
53 Array Module::deferred; // deferred Dsymbol's needing semantic() run on them
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
54 unsigned Module::dprogress;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
55
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
56 void Module::init()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
57 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
58 modules = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
59 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
60
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
61 Module::Module(char *filename, Identifier *ident, int doDocComment, int doHdrGen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
62 : Package(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
63 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
64 FileName *srcfilename;
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 // printf("Module::Module(filename = '%s', ident = '%s')\n", filename, ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
67 this->arg = filename;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
68 md = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
69 errors = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
70 numlines = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
71 members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
72 isHtml = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
73 isDocFile = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
74 needmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
75 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
76 strictlyneedmoduleinfo = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
77 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
78 insearch = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
79 searchCacheIdent = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
80 searchCacheSymbol = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
81 searchCacheFlags = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
82 semanticstarted = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
83 semanticdone = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
84 decldefs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
85 vmoduleinfo = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
86 massert = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
87 marray = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
88 sictor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
89 sctor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
90 sdtor = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
91 stest = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
92 sfilename = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
93 root = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
94 importedFrom = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
95 srcfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
96 objfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
97 docfile = NULL;
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
98 hdrfile = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
99
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
100 debuglevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
101 debugids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
102 debugidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
103 versionlevel = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
104 versionids = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
105 versionidsNot = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
106
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
107 macrotable = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
108 escapetable = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
109 doppelganger = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
110 cov = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
111 covb = NULL;
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 srcfilename = FileName::defaultExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
114 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
115 !srcfilename->equalsExt(global.hdr_ext) &&
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
116 !srcfilename->equalsExt("dd"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
117 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
118 if (srcfilename->equalsExt("html") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
119 srcfilename->equalsExt("htm") ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
120 srcfilename->equalsExt("xhtml"))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
121 isHtml = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
122 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
123 { 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
124 fatal();
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
127 srcfile = new File(srcfilename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
128
664
eef8ac26c66c Some missed LLVMDC -> LDC.
Christian Kamm <kamm incasoftware de>
parents: 643
diff changeset
129 // 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
130 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
131 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
132 this->doHdrGen = doHdrGen;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
133 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
134
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
135 File* Module::buildFilePath(char* forcename, char* path, char* ext)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
136 {
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
137 char *argobj;
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
138 if (forcename)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
139 argobj = forcename;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
140 else
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
141 {
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
142 if (global.params.preservePaths)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
143 argobj = (char*)this->arg;
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
144 else
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
145 argobj = FileName::name((char*)this->arg);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
146
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
147 if (global.params.fqnNames)
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
148 {
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
149 if(md)
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
150 argobj = FileName::replaceName(argobj, md->toChars());
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
151 else
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
152 argobj = FileName::replaceName(argobj, toChars());
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
153
643
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
154 // 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
155 size_t len = strlen(argobj);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
156 size_t extlen = strlen(ext);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
157 char* s = (char *)alloca(len + 1 + extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
158 memcpy(s, argobj, len);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
159 s[len] = '.';
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
160 memcpy(s + len + 1, ext, extlen + 1);
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
161 s[len+1+extlen] = 0;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
162 argobj = s;
2a0bcf7f7b3d Fix -oq, closes #96
Christian Kamm <kamm incasoftware de>
parents: 614
diff changeset
163 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
164 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
165
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
166 if (!FileName::absolute(argobj))
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
167 {
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
168 argobj = FileName::combine(path, argobj);
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
169 }
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
170
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
171 FileName::ensurePathExists(FileName::path(argobj));
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
172
708
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
173 // 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
174 // if (forcename)
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
175 // 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
176 // else
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
177 // 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
178 #if _WIN32
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
179 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
180 && 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
181 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
182 #endif
fd5665da3a27 Hopefully sensible command switch handling. Changed default ext to .o on Windows.
Christian Kamm <kamm incasoftware de>
parents: 675
diff changeset
183 return new File(FileName::forceExt(argobj, ext));
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
184 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
185
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
186 void Module::buildTargetFiles()
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
187 {
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
188 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
189 (!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
190 (!doHdrGen || hdrfile))
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
191 return;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
192
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
193 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
194 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
195 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
196 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
197 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
198 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
199
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
200 // 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
201 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
202 {
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 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
204 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
205 }
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(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
207 {
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 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
209 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
210 }
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
211 if(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
212 {
a30fc28e8f23 Make creating and deleting of doc and hdr files dependent on whether doc and
Christian Kamm <kamm incasoftware de>
parents: 598
diff changeset
213 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
214 fatal();
13ff06605226 To prevert source-overwriting in the future, forbit output files with the same
Christian Kamm <kamm incasoftware de>
parents: 597
diff changeset
215 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
216 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
217
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
218 void Module::deleteObjFile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
219 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
220 if (global.params.obj)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
221 objfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
222 //if (global.params.llvmBC)
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
223 //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
224 if (doDocComment && docfile)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
225 docfile->remove();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
226 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
227
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
228 Module::~Module()
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
232 const char *Module::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
233 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
234 return "module";
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
235 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
236
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
237 Module *Module::load(Loc loc, Array *packages, Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
238 { Module *m;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
239 char *filename;
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 //printf("Module::load(ident = '%s')\n", ident->toChars());
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 // Build module filename by turning:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
244 // foo.bar.baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
245 // into:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
246 // foo\bar\baz
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
247 filename = ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
248 if (packages && packages->dim)
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 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
251 int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
252
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
253 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
254 { Identifier *pid = (Identifier *)packages->data[i];
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 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
257 #if _WIN32
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
258 buf.writeByte('\\');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
259 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
260 buf.writeByte('/');
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
261 #endif
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 buf.writestring(filename);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
264 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
265 filename = (char *)buf.extractData();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
266 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
267
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
268 m = new Module(filename, ident, 0, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
269 m->loc = loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
270
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
271 /* Search along global.path for .di file, then .d file.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
272 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
273 char *result = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
274 FileName *fdi = FileName::forceExt(filename, global.hdr_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
275 FileName *fd = FileName::forceExt(filename, global.mars_ext);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
276 char *sdi = fdi->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
277 char *sd = fd->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
278
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
279 if (FileName::exists(sdi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
280 result = sdi;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
281 else if (FileName::exists(sd))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
282 result = sd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
283 else if (FileName::absolute(filename))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
284 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
285 else if (!global.path)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
286 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
287 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
288 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
289 for (size_t i = 0; i < global.path->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
290 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
291 char *p = (char *)global.path->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
292 char *n = FileName::combine(p, sdi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
293 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
294 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
295 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
296 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
297 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
298 n = FileName::combine(p, sd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
299 if (FileName::exists(n))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
300 { result = n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
301 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
302 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
303 mem.free(n);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
304 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
305 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
306 if (result)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
307 m->srcfile = new File(result);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
308
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
309 if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
310 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
311 printf("import ");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
312 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
313 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
314 for (size_t i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
315 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
316 printf("%s.", pid->toChars());
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 printf("%s\t(%s)\n", ident->toChars(), m->srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
320 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
321
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
322 m->read(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
323 m->parse();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
324
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
325 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
326 d_gcc_magic_module(m);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
327 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
328
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
329 return m;
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 void Module::read(Loc loc)
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 //printf("Module::read('%s') file '%s'\n", toChars(), srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
335 if (srcfile->read())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
336 { error(loc, "cannot read file '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
337 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
338 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
339 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
340
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
341 inline unsigned readwordLE(unsigned short *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
342 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
343 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
344 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
345 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
346 return (((unsigned char *)p)[1] << 8) | ((unsigned char *)p)[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
347 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
348 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
349
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
350 inline unsigned readwordBE(unsigned short *p)
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 return (((unsigned char *)p)[0] << 8) | ((unsigned char *)p)[1];
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
355 inline unsigned readlongLE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
356 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
357 #if __I86__
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
358 return *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
359 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
360 return ((unsigned char *)p)[0] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
361 (((unsigned char *)p)[1] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
362 (((unsigned char *)p)[2] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
363 (((unsigned char *)p)[3] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
364 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
365 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
366
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
367 inline unsigned readlongBE(unsigned *p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
368 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
369 return ((unsigned char *)p)[3] |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
370 (((unsigned char *)p)[2] << 8) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
371 (((unsigned char *)p)[1] << 16) |
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
372 (((unsigned char *)p)[0] << 24);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
373 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
374
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
375 #if IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
376 void Module::parse(bool dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
377 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
378 void Module::parse()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
379 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
380 { char *srcname;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
381 unsigned char *buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
382 unsigned buflen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
383 unsigned le;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
384 unsigned bom;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
385
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
386 //printf("Module::parse()\n");
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 srcname = srcfile->name->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
389 //printf("Module::parse(srcname = '%s')\n", srcname);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
390
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
391 buf = srcfile->buffer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
392 buflen = srcfile->len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
393
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
394 if (buflen >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
395 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
396 /* Convert all non-UTF-8 formats to UTF-8.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
397 * BOM : http://www.unicode.org/faq/utf_bom.html
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
398 * 00 00 FE FF UTF-32BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
399 * FF FE 00 00 UTF-32LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
400 * FE FF UTF-16BE, big-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
401 * FF FE UTF-16LE, little-endian
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
402 * EF BB BF UTF-8
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
405 bom = 1; // assume there's a BOM
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
406 if (buf[0] == 0xFF && buf[1] == 0xFE)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
407 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
408 if (buflen >= 4 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
409 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
410 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
411
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
412 Lutf32:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
413 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
414 unsigned *pu = (unsigned *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
415 unsigned *pumax = &pu[buflen / 4];
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 if (buflen & 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
418 { error("odd length of UTF-32 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
419 fatal();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
422 dbuf.reserve(buflen / 4);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
423 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
424 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
425
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
426 u = le ? readlongLE(pu) : readlongBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
427 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
428 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
429 if (u > 0x10FFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
430 { error("UTF-32 value %08x greater than 0x10FFFF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
431 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
432 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
433 dbuf.writeUTF8(u);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
436 dbuf.writeByte(u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
437 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
438 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
439 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
440 buf = (unsigned char *) dbuf.extractData();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
443 { // UTF-16LE (X86)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
444 // Convert it to UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
445 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
446
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
447 Lutf16:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
448 OutBuffer dbuf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
449 unsigned short *pu = (unsigned short *)(buf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
450 unsigned short *pumax = &pu[buflen / 2];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
451
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
452 if (buflen & 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
453 { error("odd length of UTF-16 char source %u", buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
454 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
455 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
456
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
457 dbuf.reserve(buflen / 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
458 for (pu += bom; pu < pumax; pu++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
459 { unsigned u;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
460
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
461 u = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
462 if (u & ~0x7F)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
463 { if (u >= 0xD800 && u <= 0xDBFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
464 { unsigned u2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
465
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
466 if (++pu > pumax)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
467 { error("surrogate UTF-16 high value %04x at EOF", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
468 fatal();
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 u2 = le ? readwordLE(pu) : readwordBE(pu);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
471 if (u2 < 0xDC00 || u2 > 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
472 { error("surrogate UTF-16 low value %04x out of range", u2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
473 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
474 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
475 u = (u - 0xD7C0) << 10;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
476 u |= (u2 - 0xDC00);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
477 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
478 else if (u >= 0xDC00 && u <= 0xDFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
479 { error("unpaired surrogate UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
480 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
481 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
482 else if (u == 0xFFFE || u == 0xFFFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
483 { error("illegal UTF-16 value %04x", u);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
484 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
485 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
486 dbuf.writeUTF8(u);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
489 dbuf.writeByte(u);
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 dbuf.writeByte(0); // add 0 as sentinel for scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
492 buflen = dbuf.offset - 1; // don't include sentinel in count
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
493 buf = (unsigned char *) dbuf.extractData();
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
496 else if (buf[0] == 0xFE && buf[1] == 0xFF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
497 { // UTF-16BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
498 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
499 goto Lutf16;
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 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
502 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
503 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
504 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
505 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
506 else if (buflen >= 3 && buf[0] == 0xEF && buf[1] == 0xBB && buf[2] == 0xBF)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
507 { // UTF-8
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 buf += 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
510 buflen -= 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
511 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
512 else
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 /* There is no BOM. Make use of Arcane Jill's insight that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
515 * the first char of D source must be ASCII to
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
516 * figure out the encoding.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
517 */
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 bom = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
520 if (buflen >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
521 { if (buf[1] == 0 && buf[2] == 0 && buf[3] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
522 { // UTF-32LE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
523 le = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
524 goto Lutf32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
525 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
526 else if (buf[0] == 0 && buf[1] == 0 && buf[2] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
527 { // UTF-32BE
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
528 le = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
529 goto Lutf32;
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 if (buflen >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
533 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
534 if (buf[1] == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
535 { // UTF-16LE
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 Lutf16;
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)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
540 { // UTF-16BE
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 Lutf16;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
546 // It's UTF-8
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
547 if (buf[0] >= 0x80)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
548 { 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
549 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
550 }
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
553
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
554 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
555 // dump utf-8 encoded source
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
556 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
557 { // %% srcname could contain a path ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
558 d_gcc_dump_source(srcname, "utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
559 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
560 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
561
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
562 /* If it starts with the string "Ddoc", then it's a documentation
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
563 * source file.
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 if (buflen >= 4 && memcmp(buf, "Ddoc", 4) == 0)
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 comment = buf + 4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
568 isDocFile = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
569 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
570 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
571 if (isHtml)
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 OutBuffer *dbuf = new OutBuffer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
574 Html h(srcname, buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
575 h.extractCode(dbuf);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
576 buf = dbuf->data;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
577 buflen = dbuf->offset;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
578 #ifdef IN_GCC
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
579 // dump extracted source
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
580 if (dump_source)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
581 d_gcc_dump_source(srcname, "d.utf-8", buf, buflen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
582 #endif
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 Parser p(this, buf, buflen, docfile != NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
585 p.nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
586 members = p.parseModule();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
587 md = p.md;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
588 numlines = p.loc.linnum;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
589
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
590 DsymbolTable *dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
591
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
592 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
593 { this->ident = md->id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
594 dst = Package::resolve(md->packages, &this->parent, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
595 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
596 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
597 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
598 dst = modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
599
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
600 /* Check to see if module name is a valid identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
601 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
602 if (!Lexer::isValidIdentifier(this->ident->toChars()))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
603 error("has non-identifier characters in filename, use module declaration instead");
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
606 // Update global list of modules
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
607 if (!dst->insert(this))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
608 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
609 if (md)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
610 error(loc, "is in multiple packages %s", md->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
611 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
612 error(loc, "is in multiple defined");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
613 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
614 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
615 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
616 amodules.push(this);
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
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
620 void Module::semantic(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
621 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
622
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
623 if (semanticstarted)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
624 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
625
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
626 //printf("+Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
627 semanticstarted = 1;
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 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
630 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
631 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
632 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
633
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
634 //printf("Module = %p, linkage = %d\n", sc->scopesym, sc->linkage);
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 // Add import of "object" if this module isn't "object"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
637 if (ident != Id::object)
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 Import *im = new Import(0, NULL, Id::object, NULL, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
640 members->shift(im);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
643 // Add all symbols into module's symbol table
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
644 symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
645 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
646 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
647
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
648 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
649 s->addMember(NULL, sc->scopesym, 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
650 }
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 // Pass 1 semantic routines: do public side of the definition
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
653 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
654 { Dsymbol *s;
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 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
657 //printf("\tModule('%s'): '%s'.semantic()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
658 s->semantic(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
659 runDeferredSemantic();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
662 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
663 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
664 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
665 //printf("-Module::semantic(this = %p, '%s'): parent = %p\n", this, toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
666 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
667
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
668 void Module::semantic2(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
669 { int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
670
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
671 if (deferred.dim)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
672 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
673 for (int i = 0; i < deferred.dim; i++)
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 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
676
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
677 sd->error("unable to resolve forward reference in definition");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
678 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
679 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
680 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
681 //printf("Module::semantic2('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
682 if (semanticstarted >= 2)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
683 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
684 assert(semanticstarted == 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
685 semanticstarted = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
686
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
687 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
688 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
689 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
690 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
691 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
692
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
693 // Pass 2 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
694 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
695 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
696
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
697 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
698 s->semantic2(sc);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
701 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
702 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
703 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
704 //printf("-Module::semantic2('%s'): parent = %p\n", toChars(), parent);
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
751
dc8b8b7ea0c1 Fix compile-time warnings. Adjust include in d-asm-i386.
Christian Kamm <kamm incasoftware de>
parents: 708
diff changeset
707 void Module::semantic3(Scope* unused_sc)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
708 { int i;
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 //printf("Module::semantic3('%s'): parent = %p\n", toChars(), parent);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
711 if (semanticstarted >= 3)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
712 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
713 assert(semanticstarted == 2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
714 semanticstarted = 3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
715
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
716 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
717 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
718 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
719 Scope *sc = Scope::createGlobal(this); // create root scope
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
720 //printf("Module = %p\n", sc.scopesym);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
721
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
722 // Pass 3 semantic routines: do initializers and function bodies
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
723 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
724 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
725
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
726 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
727 //printf("Module %s: %s.semantic3()\n", toChars(), s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
728 s->semantic3(sc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
729 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
730
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
731 sc = sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
732 sc->pop();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
733 semanticdone = semanticstarted;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
736 void Module::inlineScan()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
737 { int i;
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 if (semanticstarted >= 4)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
740 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
741 assert(semanticstarted == 3);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
742 semanticstarted = 4;
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 // Note that modules get their own scope, from scratch.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
745 // This is so regardless of where in the syntax a module
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
746 // gets imported, it is unaffected by context.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
747 //printf("Module = %p\n", sc.scopesym);
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 for (i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
750 { Dsymbol *s;
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 s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
753 //if (global.params.verbose)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
754 //printf("inline scan symbol %s\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
755
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
756 s->inlineScan();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
757 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
758 semanticdone = semanticstarted;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
759 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
760
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 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
763
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
764 // is this used anywhere?
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
765 /*
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
766 void Module::gensymfile()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
767 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
768 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
769 HdrGenState hgs;
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 //printf("Module::gensymfile()\n");
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 buf.printf("// Sym file generated from '%s'", srcfile->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
774 buf.writenl();
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 for (int i = 0; i < members->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
777 { Dsymbol *s = (Dsymbol *)members->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
778
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
779 s->toCBuffer(&buf, &hgs);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
782 // Transfer image to file
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
783 symfile->setbuffer(buf.data, buf.offset);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
784 buf.data = NULL;
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 symfile->writev();
580
7824c21a58e3 Restructure path handling a bit. Fixes #66.
Christian Kamm <kamm incasoftware de>
parents: 550
diff changeset
787 }*/
336
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 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
790 * Determine if we need to generate an instance of ModuleInfo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
791 * for this Module.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
792 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
793
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
794 int Module::needModuleInfo()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
795 {
550
cbe08531430f Removed unimplemented switches.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 510
diff changeset
796 return needmoduleinfo;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
797 }
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 Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
800 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
801 /* Since modules can be circularly referenced,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
802 * need to stop infinite recursive searches.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
803 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
804
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
805 //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
806 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
807 if (insearch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
808 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
809 else if (searchCacheIdent == ident && searchCacheFlags == flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
810 s = searchCacheSymbol;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
811 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
812 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
813 insearch = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
814 s = ScopeDsymbol::search(loc, ident, flags);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
815 insearch = 0;
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 searchCacheIdent = ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
818 searchCacheSymbol = s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
819 searchCacheFlags = flags;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
820 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
821 return s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
822 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
823
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
824 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
825 * Can't run semantic on s now, try again later.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
826 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
827
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
828 void Module::addDeferredSemantic(Dsymbol *s)
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 // Don't add it if it is already there
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
831 for (int i = 0; i < deferred.dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
832 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
833 Dsymbol *sd = (Dsymbol *)deferred.data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
834
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
835 if (sd == s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
836 return;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
839 //printf("Module::addDeferredSemantic('%s')\n", s->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
840 deferred.push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
841 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
842
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
843
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
844 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
845 * Run semantic() on deferred symbols.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
846 */
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 void Module::runDeferredSemantic()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
849 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
850 size_t len;
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 static int nested;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
853 if (nested)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
854 return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
855 //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
856 nested++;
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 do
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 dprogress = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
861 len = deferred.dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
862 if (!len)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
863 break;
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 Dsymbol **todo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
866 Dsymbol *tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
867 if (len == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
868 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
869 todo = &tmp;
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 else
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 todo = (Dsymbol **)alloca(len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
874 assert(todo);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
875 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
876 memcpy(todo, deferred.data, len * sizeof(Dsymbol *));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
877 deferred.setDim(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
878
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
879 for (int i = 0; i < len; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
880 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
881 Dsymbol *s = todo[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
882
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
883 s->semantic(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
884 //printf("deferred: %s, parent = %s\n", s->toChars(), s->parent->toChars());
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 //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
887 } while (deferred.dim < len || dprogress); // while making progress
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
888 nested--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
889 //printf("-Module::runDeferredSemantic('%s'), len = %d\n", toChars(), deferred.dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
890 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
891
875
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
892 /************************************
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
893 * 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
894 * return TRUE if it imports m.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
895 * Can be used to detect circular imports.
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
896 */
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
897
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
898 int Module::imports(Module *m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
899 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
900 //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
901 int aimports_dim = aimports.dim;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
902 #if 0
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
903 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
904 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
905 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
906 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
907 #endif
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
908 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
909 { Module *mi = (Module *)aimports.data[i];
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
910 if (mi == m)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
911 return TRUE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
912 if (!mi->insearch)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
913 {
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
914 mi->insearch = 1;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
915 int r = mi->imports(m);
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
916 mi->insearch = 0;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
917 if (r)
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
918 return r;
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 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
921 return FALSE;
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
922 }
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 872
diff changeset
923
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
924 /* =========================== ModuleDeclaration ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
925
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
926 ModuleDeclaration::ModuleDeclaration(Array *packages, Identifier *id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
927 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
928 this->packages = packages;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
929 this->id = id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
930 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
931
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
932 char *ModuleDeclaration::toChars()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
933 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
934 OutBuffer buf;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
935 int i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
936
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
937 if (packages && packages->dim)
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 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
940 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
941
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
942 buf.writestring(pid->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
943 buf.writeByte('.');
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
946 buf.writestring(id->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
947 buf.writeByte(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
948 return (char *)buf.extractData();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
951 /* =========================== Package ===================== */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
952
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
953 Package::Package(Identifier *ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
954 : ScopeDsymbol(ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
955 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
956 }
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 const char *Package::kind()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
960 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
961 return "package";
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
965 DsymbolTable *Package::resolve(Array *packages, Dsymbol **pparent, Package **ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
966 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
967 DsymbolTable *dst = Module::modules;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
968 Dsymbol *parent = NULL;
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 //printf("Package::resolve()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
971 if (ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
972 *ppkg = NULL;
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 if (packages)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
975 { int i;
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 for (i = 0; i < packages->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
978 { Identifier *pid = (Identifier *)packages->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
979 Dsymbol *p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
980
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
981 p = dst->lookup(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
982 if (!p)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
983 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
984 p = new Package(pid);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
985 dst->insert(p);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
986 p->parent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
987 ((ScopeDsymbol *)p)->symtab = new DsymbolTable();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
988 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
989 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
990 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
991 assert(p->isPackage());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
992 if (p->isModule())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
993 { p->error("module and package have the same name");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
994 fatal();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
995 break;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
998 parent = p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
999 dst = ((Package *)p)->symtab;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1000 if (ppkg && !*ppkg)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1001 *ppkg = (Package *)p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1002 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1003 if (pparent)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1004 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1005 *pparent = parent;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1006 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1007 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1008 return dst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 285
diff changeset
1009 }