annotate dmd/func.c @ 1362:194852badf8c

Don't always expand aliases to FuncDecls to FuncAliasDecls - breaks for single functions.
author Christian Kamm <kamm incasoftware de>
date Sat, 16 May 2009 14:22:09 +0200
parents 78038e540342
children 8026319762be
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2 // Compiler implementation of the D programming language
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3 // Copyright (c) 1999-2008 by Digital Mars
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
4 // All Rights Reserved
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
5 // written by Walter Bright
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
6 // http://www.digitalmars.com
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
7 // License for redistribution is by either the Artistic License
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
8 // in artistic.txt, or the GNU General Public License in gnu.txt.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
9 // See the included readme.txt for details.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
10
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
11 #include <stdio.h>
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
12 #include <assert.h>
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
13
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
14 #include "mars.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
15 #include "init.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
16 #include "declaration.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
17 #include "attrib.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
18 #include "expression.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
19 #include "scope.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
20 #include "mtype.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
21 #include "aggregate.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
22 #include "identifier.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
23 #include "id.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
24 #include "module.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
25 #include "statement.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
26 #include "template.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
27 #include "hdrgen.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
28
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
29 #ifdef IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
30 #include "d-dmd-gcc.h"
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
31 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
32
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
33 /********************************* FuncDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
34
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
35 FuncDeclaration::FuncDeclaration(Loc loc, Loc endloc, Identifier *id, enum STC storage_class, Type *type)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
36 : Declaration(id)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
37 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
38 //printf("FuncDeclaration(id = '%s', type = %p)\n", id->toChars(), type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
39 this->storage_class = storage_class;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
40 this->type = type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
41 this->loc = loc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
42 this->endloc = endloc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
43 fthrows = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
44 frequire = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
45 outId = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
46 vresult = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
47 returnLabel = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
48 fensure = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
49 fbody = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
50 localsymtab = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
51 vthis = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
52 v_arguments = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
53 #if IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
54 v_argptr = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
55 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
56 parameters = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
57 labtab = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
58 overnext = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
59 vtblIndex = -1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
60 hasReturnExp = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
61 naked = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
62 inlineStatus = ILSuninitialized;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
63 inlineNest = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
64 inlineAsm = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
65 cantInterpret = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
66 semanticRun = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
67 nestedFrameRef = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
68 fes = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
69 introducing = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
70 tintro = NULL;
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
71 /* The type given for "infer the return type" is a TypeFunction with
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
72 * NULL for the return type.
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
73 */
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
74 inferRetType = (type && type->nextOf() == NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
75 scope = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
76 hasReturnExp = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
77 nrvo_can = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
78 nrvo_var = NULL;
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1143
diff changeset
79 #if IN_DMD
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
80 shidden = NULL;
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1143
diff changeset
81 #endif
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1143
diff changeset
82
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1143
diff changeset
83 #if IN_LLVM
703
06576ece1a1b Changed premake.lua to work with mingw.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 664
diff changeset
84 // LDC
06576ece1a1b Changed premake.lua to work with mingw.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 664
diff changeset
85 isArrayOp = false;
945
03d7c4aac654 SWITCHED TO LLVM 2.5 !
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 937
diff changeset
86 allowInlining = false;
1228
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
87
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
88 // function types in ldc don't merge if the context parameter differs
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
89 // so we actually don't care about the function declaration, but only
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
90 // what kind of context parameter it has.
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
91 // however, this constructor is usually called from the parser, which
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
92 // unfortunately doesn't provide the information needed to get to the
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
93 // aggregate type. So we have to stick with the FuncDeclaration and
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
94 // just be sure we don't actually rely on the symbol it points to,
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
95 // but rather just the type of its context parameter.
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
96 // this means some function might have a function type pointing to
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
97 // another function declaration
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
98
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
99 if (type)
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
100 {
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
101 assert(type->ty == Tfunction && "invalid function type");
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
102 TypeFunction* tf = (TypeFunction*)type;
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
103 if (tf->funcdecl == NULL)
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
104 tf->funcdecl = this;
79758fd2f48a Added Doxygen file.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1195
diff changeset
105 }
1146
1860414bf3b7 * Moved ir/irsymbol.cpp/h into ir/irdsymbol.cpp/h.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1143
diff changeset
106 #endif
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
107 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
108
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
109 Dsymbol *FuncDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
110 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
111 FuncDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
112
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
113 //printf("FuncDeclaration::syntaxCopy('%s')\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
114 if (s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
115 f = (FuncDeclaration *)s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
116 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
117 f = new FuncDeclaration(loc, endloc, ident, (enum STC) storage_class, type->syntaxCopy());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
118 f->outId = outId;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
119 f->frequire = frequire ? frequire->syntaxCopy() : NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
120 f->fensure = fensure ? fensure->syntaxCopy() : NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
121 f->fbody = fbody ? fbody->syntaxCopy() : NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
122 assert(!fthrows); // deprecated
443
44f08170f4ef Removed tango from the repository and instead added a runtime dir with the files needed to patch and build tango from svn.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 378
diff changeset
123
664
eef8ac26c66c Some missed LLVMDC -> LDC.
Christian Kamm <kamm incasoftware de>
parents: 658
diff changeset
124 // LDC
443
44f08170f4ef Removed tango from the repository and instead added a runtime dir with the files needed to patch and build tango from svn.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 378
diff changeset
125 f->intrinsicName = intrinsicName;
44f08170f4ef Removed tango from the repository and instead added a runtime dir with the files needed to patch and build tango from svn.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 378
diff changeset
126
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
127 return f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
128 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
129
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
130
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
131 // Do the semantic analysis on the external interface to the function.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
132
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
133 void FuncDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
134 { TypeFunction *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
135 StructDeclaration *sd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
136 ClassDeclaration *cd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
137 InterfaceDeclaration *id;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
138 Dsymbol *pd;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
139
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
140 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
141 printf("FuncDeclaration::semantic(sc = %p, this = %p, '%s', linkage = %d)\n", sc, this, toPrettyChars(), sc->linkage);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
142 if (isFuncLiteralDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
143 printf("\tFuncLiteralDeclaration()\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
144 printf("sc->parent = %s\n", sc->parent->toChars());
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
145 printf("type: %p, %s\n", type, type->toChars());
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
146 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
147
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
148 if (type->nextOf())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
149 type = type->semantic(loc, sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
150 //type->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
151 if (type->ty != Tfunction)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
152 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
153 error("%s must be a function", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
154 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
155 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
156 f = (TypeFunction *)(type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
157 size_t nparams = Argument::dim(f->parameters);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
158
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
159 linkage = sc->linkage;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
160 // if (!parent)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
161 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
162 //parent = sc->scopesym;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
163 parent = sc->parent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
164 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
165 protection = sc->protection;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
166 storage_class |= sc->stc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
167 //printf("function storage_class = x%x\n", storage_class);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
168 Dsymbol *parent = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
169
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 644
diff changeset
170 if (ident == Id::ctor && !isCtorDeclaration())
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 644
diff changeset
171 error("_ctor is reserved for constructors");
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 644
diff changeset
172
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
173 if (isConst() || isAuto() || isScope())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
174 error("functions cannot be const or auto");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
175
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
176 if (isAbstract() && !isVirtual())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
177 error("non-virtual functions cannot be abstract");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
178
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
179 if (isAbstract() && isFinal())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
180 error("cannot be both final and abstract");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
181 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
182 if (isAbstract() && fbody)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
183 error("abstract functions cannot have bodies");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
184 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
185
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
186 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
187 if (isStaticConstructor() || isStaticDestructor())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
188 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
189 if (!isStatic() || type->nextOf()->ty != Tvoid)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
190 error("static constructors / destructors must be static void");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
191 if (f->arguments && f->arguments->dim)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
192 error("static constructors / destructors must have empty parameter list");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
193 // BUG: check for invalid storage classes
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
194 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
195 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
196
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
197 #ifdef IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
198 AggregateDeclaration *ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
199
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
200 ad = parent->isAggregateDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
201 if (ad)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
202 ad->methods.push(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
203 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
204 sd = parent->isStructDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
205 if (sd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
206 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
207 // Verify no constructors, destructors, etc.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
208 if (isCtorDeclaration() ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
209 isDtorDeclaration()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
210 //|| isInvariantDeclaration()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
211 //|| isUnitTestDeclaration()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
212 )
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
213 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
214 error("special member functions not allowed for %ss", sd->kind());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
215 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
216
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
217 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
218 if (!sd->inv)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
219 sd->inv = isInvariantDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
220
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
221 if (!sd->aggNew)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
222 sd->aggNew = isNewDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
223
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
224 if (isDelete())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
225 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
226 if (sd->aggDelete)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
227 error("multiple delete's for struct %s", sd->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
228 sd->aggDelete = (DeleteDeclaration *)(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
229 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
230 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
231 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
232
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
233 id = parent->isInterfaceDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
234 if (id)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
235 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
236 storage_class |= STCabstract;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
237
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
238 if (isCtorDeclaration() ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
239 isDtorDeclaration() ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
240 isInvariantDeclaration() ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
241 isUnitTestDeclaration() || isNewDeclaration() || isDelete())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
242 error("special function not allowed in interface %s", id->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
243 if (fbody)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
244 error("function body is not abstract in interface %s", id->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
245 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
246
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
247 /* Template member functions aren't virtual:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
248 * interface TestInterface { void tpl(T)(); }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
249 * and so won't work in interfaces
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
250 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
251 if ((pd = toParent()) != NULL &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
252 pd->isTemplateInstance() &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
253 (pd = toParent2()) != NULL &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
254 (id = pd->isInterfaceDeclaration()) != NULL)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
255 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
256 error("template member function not allowed in interface %s", id->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
257 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
258
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
259 cd = parent->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
260 if (cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
261 { int vi;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
262 CtorDeclaration *ctor;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
263 DtorDeclaration *dtor;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
264 InvariantDeclaration *inv;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
265
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
266 if (isCtorDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
267 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
268 // ctor = (CtorDeclaration *)this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
269 // if (!cd->ctor)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
270 // cd->ctor = ctor;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
271 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
272 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
273
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
274 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
275 dtor = isDtorDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
276 if (dtor)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
277 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
278 if (cd->dtor)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
279 error("multiple destructors for class %s", cd->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
280 cd->dtor = dtor;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
281 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
282
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
283 inv = isInvariantDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
284 if (inv)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
285 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
286 cd->inv = inv;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
287 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
288
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
289 if (isNewDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
290 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
291 if (!cd->aggNew)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
292 cd->aggNew = (NewDeclaration *)(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
293 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
294
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
295 if (isDelete())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
296 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
297 if (cd->aggDelete)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
298 error("multiple delete's for class %s", cd->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
299 cd->aggDelete = (DeleteDeclaration *)(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
300 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
301 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
302
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
303 if (storage_class & STCabstract)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
304 cd->isabstract = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
305
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
306 // if static function, do not put in vtbl[]
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
307 if (!isVirtual())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
308 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
309 //printf("\tnot virtual\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
310 goto Ldone;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
311 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
312
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
313 // Find index of existing function in vtbl[] to override
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
314 vi = findVtblIndex(&cd->vtbl, cd->baseClass ? cd->baseClass->vtbl.dim : 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
315 switch (vi)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
316 {
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
317 case -1:
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
318 /* Didn't find one, so
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
319 * This is an 'introducing' function which gets a new
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
320 * slot in the vtbl[].
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
321 */
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
322
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
323 // Verify this doesn't override previous final function
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
324 if (cd->baseClass)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
325 { Dsymbol *s = cd->baseClass->search(loc, ident, 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
326 if (s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
327 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
328 FuncDeclaration *f = s->isFuncDeclaration();
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
329 f = f->overloadExactMatch(type, getModule());
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
330 if (f && f->isFinal() && f->prot() != PROTprivate)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
331 error("cannot override final function %s", f->toPrettyChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
332 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
333 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
334
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
335 if (isFinal())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
336 {
875
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 846
diff changeset
337 if (isOverride())
330f999ade44 Merged DMD 1.038
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 846
diff changeset
338 error("does not override any function");
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
339 cd->vtblFinal.push(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
340 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
341 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
342 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
343 // Append to end of vtbl[]
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
344 //printf("\tintroducing function\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
345 introducing = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
346 vi = cd->vtbl.dim;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
347 cd->vtbl.push(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
348 vtblIndex = vi;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
349 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
350 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
351
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
352 case -2: // can't determine because of fwd refs
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
353 cd->sizeok = 2; // can't finish due to forward reference
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
354 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
355
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
356 default:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
357 { FuncDeclaration *fdv = (FuncDeclaration *)cd->vtbl.data[vi];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
358 // This function is covariant with fdv
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
359 if (fdv->isFinal())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
360 error("cannot override final function %s", fdv->toPrettyChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
361
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
362 #if DMDV2
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
363 if (!isOverride())
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
364 warning(loc, "overrides base class function %s, but is not marked with 'override'", fdv->toPrettyChars());
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
365 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
366
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
367 if (fdv->toParent() == parent)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
368 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
369 // If both are mixins, then error.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
370 // If either is not, the one that is not overrides
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
371 // the other.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
372 if (fdv->parent->isClassDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
373 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
374 if (!this->parent->isClassDeclaration()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
375 #if !BREAKABI
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
376 && !isDtorDeclaration()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
377 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
378 #if DMDV2
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
379 && !isPostBlitDeclaration()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
380 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
381 )
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
382 error("multiple overrides of same function");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
383 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
384 cd->vtbl.data[vi] = (void *)this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
385 vtblIndex = vi;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
386
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
387 /* This works by whenever this function is called,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
388 * it actually returns tintro, which gets dynamically
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
389 * cast to type. But we know that tintro is a base
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
390 * of type, so we could optimize it by not doing a
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
391 * dynamic cast, but just subtracting the isBaseOf()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
392 * offset if the value is != null.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
393 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
394
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
395 if (fdv->tintro)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
396 tintro = fdv->tintro;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
397 else if (!type->equals(fdv->type))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
398 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
399 /* Only need to have a tintro if the vptr
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
400 * offsets differ
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
401 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
402 int offset;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
403 if (fdv->type->nextOf()->isBaseOf(type->nextOf(), &offset))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
404 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
405 tintro = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
406 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
407 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
408 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
409 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
410 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
411
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
412 /* Go through all the interface bases.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
413 * If this function is covariant with any members of those interface
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
414 * functions, set the tintro.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
415 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
416 for (int i = 0; i < cd->interfaces_dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
417 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
418 #if 1
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
419 BaseClass *b = cd->interfaces[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
420 vi = findVtblIndex(&b->base->vtbl, b->base->vtbl.dim);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
421 switch (vi)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
422 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
423 case -1:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
424 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
425
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
426 case -2:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
427 cd->sizeok = 2; // can't finish due to forward reference
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
428 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
429
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
430 default:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
431 { FuncDeclaration *fdv = (FuncDeclaration *)b->base->vtbl.data[vi];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
432 Type *ti = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
433
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
434 if (fdv->tintro)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
435 ti = fdv->tintro;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
436 else if (!type->equals(fdv->type))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
437 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
438 /* Only need to have a tintro if the vptr
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
439 * offsets differ
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
440 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
441 int offset;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
442 if (fdv->type->nextOf()->isBaseOf(type->nextOf(), &offset))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
443 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
444 ti = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
445 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
446 if (offset)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
447 ti = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
448 else if (type->nextOf()->ty == Tclass)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
449 { ClassDeclaration *cdn = ((TypeClass *)type->nextOf())->sym;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
450 if (cdn && cdn->sizeok != 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
451 ti = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
452 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
453 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
454 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
455 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
456 if (ti)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
457 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
458 if (tintro && !tintro->equals(ti))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
459 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
460 error("incompatible covariant types %s and %s", tintro->toChars(), ti->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
461 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
462 tintro = ti;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
463 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
464 goto L2;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
465 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
466 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
467 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
468 BaseClass *b = cd->interfaces[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
469 for (vi = 0; vi < b->base->vtbl.dim; vi++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
470 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
471 Dsymbol *s = (Dsymbol *)b->base->vtbl.data[vi];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
472 //printf("interface %d vtbl[%d] %p %s\n", i, vi, s, s->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
473 FuncDeclaration *fdv = s->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
474 if (fdv && fdv->ident == ident)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
475 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
476 int cov = type->covariant(fdv->type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
477 //printf("\tcov = %d\n", cov);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
478 if (cov == 2)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
479 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
480 //type->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
481 //fdv->type->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
482 //printf("%s %s\n", type->deco, fdv->type->deco);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
483 error("of type %s overrides but is not covariant with %s of type %s",
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
484 type->toChars(), fdv->toPrettyChars(), fdv->type->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
485 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
486 if (cov == 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
487 { Type *ti = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
488
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
489 if (fdv->tintro)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
490 ti = fdv->tintro;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
491 else if (!type->equals(fdv->type))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
492 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
493 /* Only need to have a tintro if the vptr
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
494 * offsets differ
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
495 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
496 int offset;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
497 if (fdv->type->nextOf()->isBaseOf(type->nextOf(), &offset))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
498 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
499 ti = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
500 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
501 if (offset)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
502 ti = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
503 else if (type->nextOf()->ty == Tclass)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
504 { ClassDeclaration *cdn = ((TypeClass *)type->nextOf())->sym;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
505 if (cdn && cdn->sizeok != 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
506 ti = fdv->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
507 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
508 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
509 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
510 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
511 if (ti)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
512 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
513 if (tintro && !tintro->equals(ti))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
514 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
515 error("incompatible covariant types %s and %s", tintro->toChars(), ti->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
516 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
517 tintro = ti;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
518 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
519 goto L2;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
520 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
521 if (cov == 3)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
522 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
523 cd->sizeok = 2; // can't finish due to forward reference
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
524 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
525 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
526 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
527 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
528 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
529 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
530
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
531 if (introducing && isOverride())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
532 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
533 error("does not override any function");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
534 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
535
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
536 L2: ;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
537 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
538 else if (isOverride() && !parent->isTemplateInstance())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
539 error("override only applies to class member functions");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
540
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
541 /* Do not allow template instances to add virtual functions
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
542 * to a class.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
543 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
544 if (isVirtual())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
545 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
546 TemplateInstance *ti = parent->isTemplateInstance();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
547 if (ti)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
548 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
549 // Take care of nested templates
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
550 while (1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
551 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
552 TemplateInstance *ti2 = ti->tempdecl->parent->isTemplateInstance();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
553 if (!ti2)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
554 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
555 ti = ti2;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
556 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
557
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
558 // If it's a member template
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
559 ClassDeclaration *cd = ti->tempdecl->isClassMember();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
560 if (cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
561 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
562 error("cannot use template to add virtual function to class '%s'", cd->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
563 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
564 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
565 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
566
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
567 if (isMain())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
568 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
569 // Check parameters to see if they are either () or (char[][] args)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
570 switch (nparams)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
571 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
572 case 0:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
573 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
574
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
575 case 1:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
576 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
577 Argument *arg0 = Argument::getNth(f->parameters, 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
578 if (arg0->type->ty != Tarray ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
579 arg0->type->nextOf()->ty != Tarray ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
580 arg0->type->nextOf()->nextOf()->ty != Tchar ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
581 arg0->storageClass & (STCout | STCref | STClazy))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
582 goto Lmainerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
583 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
584 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
585
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
586 default:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
587 goto Lmainerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
588 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
589
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
590 if (f->nextOf()->ty != Tint32 && f->nextOf()->ty != Tvoid)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
591 error("must return int or void, not %s", f->nextOf()->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
592 if (f->varargs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
593 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
594 Lmainerr:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
595 error("parameters must be main() or main(char[][] args)");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
596 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
597 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
598
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
599 if (ident == Id::assign && (sd || cd))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
600 { // Disallow identity assignment operator.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
601
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
602 // opAssign(...)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
603 if (nparams == 0)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
604 { if (f->varargs == 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
605 goto Lassignerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
606 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
607 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
608 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
609 Argument *arg0 = Argument::getNth(f->parameters, 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
610 Type *t0 = arg0->type->toBasetype();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
611 Type *tb = sd ? sd->type : cd->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
612 if (arg0->type->implicitConvTo(tb) ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
613 (sd && t0->ty == Tpointer && t0->nextOf()->implicitConvTo(tb))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
614 )
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
615 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
616 if (nparams == 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
617 goto Lassignerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
618 Argument *arg1 = Argument::getNth(f->parameters, 1);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
619 if (arg1->defaultArg)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
620 goto Lassignerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
621 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
622 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
623 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
624
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
625 Ldone:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
626 /* Save scope for possible later use (if we need the
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
627 * function internals)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
628 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
629 scope = new Scope(*sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
630 scope->setNoFree();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
631 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
632
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
633 Lassignerr:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
634 error("identity assignment operator overload is illegal");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
635 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
636
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
637 void FuncDeclaration::semantic2(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
638 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
639 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
640
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
641 // Do the semantic analysis on the internals of the function.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
642
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
643 void FuncDeclaration::semantic3(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
644 { TypeFunction *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
645 AggregateDeclaration *ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
646 VarDeclaration *argptr = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
647 VarDeclaration *_arguments = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
648
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
649 if (!parent)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
650 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
651 if (global.errors)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
652 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
653 //printf("FuncDeclaration::semantic3(%s '%s', sc = %p)\n", kind(), toChars(), sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
654 assert(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
655 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
656 //printf("FuncDeclaration::semantic3('%s.%s', sc = %p, loc = %s)\n", parent->toChars(), toChars(), sc, loc.toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
657 //fflush(stdout);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
658 //{ static int x; if (++x == 2) *(char*)0=0; }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
659 //printf("\tlinkage = %d\n", sc->linkage);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
660
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
661 //printf(" sc->incontract = %d\n", sc->incontract);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
662 if (semanticRun)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
663 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
664 semanticRun = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
665
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
666 if (!type || type->ty != Tfunction)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
667 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
668 f = (TypeFunction *)(type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
669 size_t nparams = Argument::dim(f->parameters);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
670
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
671 // Check the 'throws' clause
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
672 if (fthrows)
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
673 {
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
674 for (int i = 0; i < fthrows->dim; i++)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
675 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
676 Type *t = (Type *)fthrows->data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
677
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
678 t = t->semantic(loc, sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
679 if (!t->isClassHandle())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
680 error("can only throw classes, not %s", t->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
681 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
682 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
683
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
684 if (fbody || frequire)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
685 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
686 /* Symbol table into which we place parameters and nested functions,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
687 * solely to diagnose name collisions.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
688 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
689 localsymtab = new DsymbolTable();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
690
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
691 // Establish function scope
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
692 ScopeDsymbol *ss = new ScopeDsymbol();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
693 ss->parent = sc->scopesym;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
694 Scope *sc2 = sc->push(ss);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
695 sc2->func = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
696 sc2->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
697 sc2->callSuper = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
698 sc2->sbreak = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
699 sc2->scontinue = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
700 sc2->sw = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
701 sc2->fes = fes;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
702 sc2->linkage = LINKd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
703 sc2->stc &= ~(STCauto | STCscope | STCstatic | STCabstract | STCdeprecated | STCfinal);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
704 sc2->protection = PROTpublic;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
705 sc2->explicitProtection = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
706 sc2->structalign = 8;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
707 sc2->incontract = 0;
1141
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
708 sc2->enclosingFinally = NULL;
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
709 sc2->enclosingScopeExit = NULL;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
710 sc2->noctor = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
711
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
712 // Declare 'this'
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
713 ad = isThis();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
714 if (ad)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
715 { VarDeclaration *v;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
716
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
717 if (isFuncLiteralDeclaration() && isNested())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
718 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
719 error("literals cannot be class members");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
720 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
721 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
722 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
723 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
724 assert(!isNested()); // can't be both member and nested
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
725 assert(ad->handle);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
726 v = new ThisDeclaration(ad->handle);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
727 v->storage_class |= STCparameter | STCin;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
728 v->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
729 if (!sc2->insert(v))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
730 assert(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
731 v->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
732 vthis = v;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
733 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
734 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
735 else if (isNested())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
736 {
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
737 /* The 'this' for a nested function is the link to the
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
738 * enclosing function's stack frame.
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
739 * Note that nested functions and member functions are disjoint.
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
740 */
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
741 VarDeclaration *v = new ThisDeclaration(Type::tvoid->pointerTo());
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
742 v->storage_class |= STCparameter | STCin;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
743 v->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
744 if (!sc2->insert(v))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
745 assert(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
746 v->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
747 vthis = v;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
748 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
749
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
750 // Declare hidden variable _arguments[] and _argptr
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
751 if (f->varargs == 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
752 { Type *t;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
753
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
754 if (f->linkage == LINKd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
755 { // Declare _arguments[]
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
756 #if BREAKABI
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
757 v_arguments = new VarDeclaration(0, Type::typeinfotypelist->type, Id::_arguments_typeinfo, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
758 v_arguments->storage_class = STCparameter | STCin;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
759 v_arguments->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
760 sc2->insert(v_arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
761 v_arguments->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
762
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
763 t = Type::typeinfo->type->arrayOf();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
764 _arguments = new VarDeclaration(0, t, Id::_arguments, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
765 _arguments->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
766 sc2->insert(_arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
767 _arguments->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
768 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
769 t = Type::typeinfo->type->arrayOf();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
770 v_arguments = new VarDeclaration(0, t, Id::_arguments, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
771 v_arguments->storage_class = STCparameter | STCin;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
772 v_arguments->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
773 sc2->insert(v_arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
774 v_arguments->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
775 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
776 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
777 if (f->linkage == LINKd || (parameters && parameters->dim))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
778 { // Declare _argptr
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
779 #if IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
780 t = d_gcc_builtin_va_list_d_type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
781 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
782 t = Type::tvoid->pointerTo();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
783 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
784 argptr = new VarDeclaration(0, t, Id::_argptr, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
785 argptr->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
786 sc2->insert(argptr);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
787 argptr->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
788 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
789 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
790
1177
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
791 #if IN_LLVM
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
792 // LDC make sure argument type is semanticed.
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
793 // Turns TypeTuple!(int, int) into two int parameters, for instance.
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
794 if (f->parameters)
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
795 {
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
796 for (size_t i = 0; i < Argument::dim(f->parameters); i++)
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
797 { Argument *arg = (Argument *)Argument::getNth(f->parameters, i);
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
798 Type* nw = arg->type->semantic(0, sc);
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
799 if (arg->type != nw) {
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
800 arg->type = nw;
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
801 // Examine this index again.
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
802 // This is important if it turned into a tuple.
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
803 // In particular, the empty tuple should be handled or the
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
804 // next parameter will be skipped.
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
805 // FIXME: Maybe we only need to do this for tuples,
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
806 // and can add tuple.length after decrement?
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
807 i--;
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
808 }
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
809 }
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
810 // update nparams to include expanded tuples
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
811 nparams = Argument::dim(f->parameters);
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
812 }
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
813 #endif
a8b9fc41c34b Fix #246 by running type->semantic() on parameters so tuples are expanded.
Frits van Bommel <fvbommel wxs.nl>
parents: 1158
diff changeset
814
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
815 // Propagate storage class from tuple parameters to their element-parameters.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
816 if (f->parameters)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
817 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
818 for (size_t i = 0; i < f->parameters->dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
819 { Argument *arg = (Argument *)f->parameters->data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
820
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
821 if (arg->type->ty == Ttuple)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
822 { TypeTuple *t = (TypeTuple *)arg->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
823 size_t dim = Argument::dim(t->arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
824 for (size_t j = 0; j < dim; j++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
825 { Argument *narg = Argument::getNth(t->arguments, j);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
826 narg->storageClass = arg->storageClass;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
827 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
828 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
829 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
830 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
831
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
832 // Declare all the function parameters as variables
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
833 if (nparams)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
834 { /* parameters[] has all the tuples removed, as the back end
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
835 * doesn't know about tuples
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
836 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
837 parameters = new Dsymbols();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
838 parameters->reserve(nparams);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
839 for (size_t i = 0; i < nparams; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
840 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
841 Argument *arg = Argument::getNth(f->parameters, i);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
842 Identifier *id = arg->ident;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
843 if (!id)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
844 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
845 /* Generate identifier for un-named parameter,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
846 * because we need it later on.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
847 */
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
848 arg->ident = id = Identifier::generateId("_param_", i);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
849 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
850 VarDeclaration *v = new VarDeclaration(loc, arg->type, id, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
851 //printf("declaring parameter %s of type %s\n", v->toChars(), v->type->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
852 v->storage_class |= STCparameter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
853 if (f->varargs == 2 && i + 1 == nparams)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
854 v->storage_class |= STCvariadic;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
855 v->storage_class |= arg->storageClass & (STCin | STCout | STCref | STClazy);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
856 if (v->storage_class & STClazy)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
857 v->storage_class |= STCin;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
858 v->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
859 if (!sc2->insert(v))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
860 error("parameter %s.%s is already defined", toChars(), v->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
861 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
862 parameters->push(v);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
863 localsymtab->insert(v);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
864 v->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
865 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
866 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
867
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
868 // Declare the tuple symbols and put them in the symbol table,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
869 // but not in parameters[].
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
870 if (f->parameters)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
871 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
872 for (size_t i = 0; i < f->parameters->dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
873 { Argument *arg = (Argument *)f->parameters->data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
874
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
875 if (!arg->ident)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
876 continue; // never used, so ignore
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
877 if (arg->type->ty == Ttuple)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
878 { TypeTuple *t = (TypeTuple *)arg->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
879 size_t dim = Argument::dim(t->arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
880 Objects *exps = new Objects();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
881 exps->setDim(dim);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
882 for (size_t j = 0; j < dim; j++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
883 { Argument *narg = Argument::getNth(t->arguments, j);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
884 assert(narg->ident);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
885 VarDeclaration *v = sc2->search(0, narg->ident, NULL)->isVarDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
886 assert(v);
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
887 Expression *e = new VarExp(v->loc, v);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
888 exps->data[j] = (void *)e;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
889 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
890 assert(arg->ident);
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
891 TupleDeclaration *v = new TupleDeclaration(loc, arg->ident, exps);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
892 //printf("declaring tuple %s\n", v->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
893 v->isexp = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
894 if (!sc2->insert(v))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
895 error("parameter %s.%s is already defined", toChars(), v->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
896 localsymtab->insert(v);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
897 v->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
898 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
899 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
900 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
901
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
902 /* Do the semantic analysis on the [in] preconditions and
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
903 * [out] postconditions.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
904 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
905 sc2->incontract++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
906
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
907 if (frequire)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
908 { /* frequire is composed of the [in] contracts
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
909 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
910 // BUG: need to error if accessing out parameters
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
911 // BUG: need to treat parameters as const
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
912 // BUG: need to disallow returns and throws
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
913 // BUG: verify that all in and ref parameters are read
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
914 frequire = frequire->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
915 labtab = NULL; // so body can't refer to labels
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
916 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
917
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
918 if (fensure || addPostInvariant())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
919 { /* fensure is composed of the [out] contracts
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
920 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
921 ScopeDsymbol *sym = new ScopeDsymbol();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
922 sym->parent = sc2->scopesym;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
923 sc2 = sc2->push(sym);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
924
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
925 assert(type->nextOf());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
926 if (type->nextOf()->ty == Tvoid)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
927 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
928 if (outId)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
929 error("void functions have no result");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
930 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
931 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
932 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
933 if (!outId)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
934 outId = Id::result; // provide a default
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
935 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
936
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
937 if (outId)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
938 { // Declare result variable
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
939 VarDeclaration *v;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
940 Loc loc = this->loc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
941
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
942 if (fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
943 loc = fensure->loc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
944
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
945 v = new VarDeclaration(loc, type->nextOf(), outId, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
946 v->noauto = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
947 sc2->incontract--;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
948 v->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
949 sc2->incontract++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
950 if (!sc2->insert(v))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
951 error("out result %s is already defined", v->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
952 v->parent = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
953 vresult = v;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
954
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
955 // vresult gets initialized with the function return value
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
956 // in ReturnStatement::semantic()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
957 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
958
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
959 // BUG: need to treat parameters as const
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
960 // BUG: need to disallow returns and throws
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
961 if (fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
962 { fensure = fensure->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
963 labtab = NULL; // so body can't refer to labels
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
964 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
965
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
966 if (!global.params.useOut)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
967 { fensure = NULL; // discard
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
968 vresult = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
969 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
970
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
971 // Postcondition invariant
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
972 if (addPostInvariant())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
973 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
974 Expression *e = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
975 if (isCtorDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
976 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
977 // Call invariant directly only if it exists
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
978 InvariantDeclaration *inv = ad->inv;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
979 ClassDeclaration *cd = ad->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
980
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
981 while (!inv && cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
982 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
983 cd = cd->baseClass;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
984 if (!cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
985 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
986 inv = cd->inv;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
987 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
988 if (inv)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
989 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
990 e = new DsymbolExp(0, inv);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
991 e = new CallExp(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
992 e = e->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
993 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
994 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
995 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
996 { // Call invariant virtually
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
997 ThisExp *v = new ThisExp(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
998 v->type = vthis->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
999 e = new AssertExp(0, v);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1000 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1001 if (e)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1002 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1003 ExpStatement *s = new ExpStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1004 if (fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1005 fensure = new CompoundStatement(0, s, fensure);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1006 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1007 fensure = s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1008 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1009 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1010
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1011 if (fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1012 { returnLabel = new LabelDsymbol(Id::returnLabel);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1013 LabelStatement *ls = new LabelStatement(0, Id::returnLabel, fensure);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1014 ls->isReturnLabel = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1015 returnLabel->statement = ls;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1016 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1017 sc2 = sc2->pop();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1018 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1019
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1020 sc2->incontract--;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1021
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1022 if (fbody)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1023 { ClassDeclaration *cd = isClassMember();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1024
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1025 /* If this is a class constructor
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1026 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1027 if (isCtorDeclaration() && cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1028 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1029 for (int i = 0; i < cd->fields.dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1030 { VarDeclaration *v = (VarDeclaration *)cd->fields.data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1031
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1032 v->ctorinit = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1033 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1034 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1035
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1036 if (inferRetType || f->retStyle() != RETstack)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1037 nrvo_can = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1038
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1039 fbody = fbody->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1040
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1041 if (inferRetType)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1042 { // If no return type inferred yet, then infer a void
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1043 if (!type->nextOf())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1044 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1045 ((TypeFunction *)type)->next = Type::tvoid;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1046 type = type->semantic(loc, sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1047 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1048 f = (TypeFunction *)type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1049 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1050
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
1051 int offend = fbody ? fbody->blockExit() & BEfallthru : TRUE;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1052
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1053 if (isStaticCtorDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1054 { /* It's a static constructor. Ensure that all
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1055 * ctor consts were initialized.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1056 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1057
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1058 Dsymbol *p = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1059 ScopeDsymbol *ad = p->isScopeDsymbol();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1060 if (!ad)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1061 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1062 error("static constructor can only be member of struct/class/module, not %s %s", p->kind(), p->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1063 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1064 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1065 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1066 for (int i = 0; i < ad->members->dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1067 { Dsymbol *s = (Dsymbol *)ad->members->data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1068
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1069 s->checkCtorConstInit();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1070 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1071 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1072 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1073
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1074 if (isCtorDeclaration() && cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1075 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1076 //printf("callSuper = x%x\n", sc2->callSuper);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1077
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1078 // Verify that all the ctorinit fields got initialized
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1079 if (!(sc2->callSuper & CSXthis_ctor))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1080 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1081 for (int i = 0; i < cd->fields.dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1082 { VarDeclaration *v = (VarDeclaration *)cd->fields.data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1083
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1084 if (v->ctorinit == 0 && v->isCtorinit())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1085 error("missing initializer for const field %s", v->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1086 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1087 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1088
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1089 if (!(sc2->callSuper & CSXany_ctor) &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1090 cd->baseClass && cd->baseClass->ctor)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1091 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1092 sc2->callSuper = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1093
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1094 // Insert implicit super() at start of fbody
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1095 Expression *e1 = new SuperExp(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1096 Expression *e = new CallExp(0, e1);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1097
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1098 unsigned errors = global.errors;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1099 global.gag++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1100 e = e->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1101 global.gag--;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1102 if (errors != global.errors)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1103 error("no match for implicit super() call in constructor");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1104
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1105 Statement *s = new ExpStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1106 fbody = new CompoundStatement(0, s, fbody);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1107 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1108 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1109 else if (fes)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1110 { // For foreach(){} body, append a return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1111 Expression *e = new IntegerExp(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1112 Statement *s = new ReturnStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1113 fbody = new CompoundStatement(0, fbody, s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1114 assert(!returnLabel);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1115 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1116 else if (!hasReturnExp && type->nextOf()->ty != Tvoid)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1117 error("expected to return a value of type %s", type->nextOf()->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1118 else if (!inlineAsm)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1119 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1120 if (type->nextOf()->ty == Tvoid)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1121 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1122 if (offend && isMain())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1123 { // Add a return 0; statement
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1124 Statement *s = new ReturnStatement(0, new IntegerExp(0));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1125 fbody = new CompoundStatement(0, fbody, s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1126 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1127 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1128 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1129 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1130 if (offend)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1131 { Expression *e;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1132
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
1133 warning(loc, "no return at end of function");
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1134
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1135 if (global.params.useAssert &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1136 !global.params.useInline)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1137 { /* Add an assert(0, msg); where the missing return
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1138 * should be.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1139 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1140 e = new AssertExp(
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1141 endloc,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1142 new IntegerExp(0),
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
1143 new StringExp(loc, (char *)"missing return expression")
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1144 );
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1145 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1146 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1147 e = new HaltExp(endloc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1148 e = new CommaExp(0, e, type->nextOf()->defaultInit());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1149 e = e->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1150 Statement *s = new ExpStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1151 fbody = new CompoundStatement(0, fbody, s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1152 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1153 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1154 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1155 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1156
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1157 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1158 Statements *a = new Statements();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1160 // Merge in initialization of 'out' parameters
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1161 if (parameters)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1162 { for (size_t i = 0; i < parameters->dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1163 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1164 VarDeclaration *v = (VarDeclaration *)parameters->data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1165 if (v->storage_class & STCout)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1166 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1167 assert(v->init);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1168 ExpInitializer *ie = v->init->isExpInitializer();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1169 assert(ie);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1170 a->push(new ExpStatement(0, ie->exp));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1171 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1172 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1173 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1174
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1175 // we'll handle variadics ourselves
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1176 #if !IN_LLVM
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1177 if (argptr)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1178 { // Initialize _argptr to point past non-variadic arg
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1179 #if IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1180 // Handled in FuncDeclaration::toObjFile
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1181 v_argptr = argptr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1182 v_argptr->init = new VoidInitializer(loc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1183 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1184 Expression *e1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1185 Expression *e;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1186 Type *t = argptr->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1187 VarDeclaration *p;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1188 unsigned offset;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1189
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1190 e1 = new VarExp(0, argptr);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1191 if (parameters && parameters->dim)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1192 p = (VarDeclaration *)parameters->data[parameters->dim - 1];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1193 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1194 p = v_arguments; // last parameter is _arguments[]
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1195 offset = p->type->size();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1196 offset = (offset + 3) & ~3; // assume stack aligns on 4
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1197 e = new SymOffExp(0, p, offset);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1198 e = new AssignExp(0, e1, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1199 e->type = t;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1200 a->push(new ExpStatement(0, e));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1201 #endif // IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1202 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1203
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1204 if (_arguments)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1205 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1206 /* Advance to elements[] member of TypeInfo_Tuple with:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1207 * _arguments = v_arguments.elements;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1208 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1209 Expression *e = new VarExp(0, v_arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1210 e = new DotIdExp(0, e, Id::elements);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1211 Expression *e1 = new VarExp(0, _arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1212 e = new AssignExp(0, e1, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1213 e = e->semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1214 a->push(new ExpStatement(0, e));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1215 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1216
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1217 #endif // !IN_LLVM
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1218
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1219 // Merge contracts together with body into one compound statement
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1220
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1221 #ifdef _DH
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1222 if (frequire && global.params.useIn)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1223 { frequire->incontract = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1224 a->push(frequire);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1225 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1226 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1227 if (frequire && global.params.useIn)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1228 a->push(frequire);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1229 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1230
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1231 // Precondition invariant
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1232 if (addPreInvariant())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1233 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1234 Expression *e = NULL;
1326
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1235 Expression *ee = NULL;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1236 if (isDtorDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1237 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1238 // Call invariant directly only if it exists
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1239 InvariantDeclaration *inv = ad->inv;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1240 ClassDeclaration *cd = ad->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1241
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1242 while (!inv && cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1243 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1244 cd = cd->baseClass;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1245 if (!cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1246 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1247 inv = cd->inv;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1248 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1249 if (inv)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1250 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1251 e = new DsymbolExp(0, inv);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1252 e = new CallExp(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1253 e = e->semantic(sc2);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1254 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1255 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1256 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1257 { // Call invariant virtually
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1258 ThisExp *v = new ThisExp(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1259 v->type = vthis->type;
1326
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1260 e = new AssertExp(loc, v, NULL);
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1261
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1262 // LDC: check for null this
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1263 v = new ThisExp(0);
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1264 v->type = vthis->type;
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1265 v->var = vthis;
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1266
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1267 NullExp *nv = new NullExp(0);
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1268 nv->type = v->type;
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1269
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1270 IdentityExp *ie = new IdentityExp(TOKnotidentity, 0, v, nv);
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1271 ie->type = Type::tbool;
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1272
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1177
diff changeset
1273 Expression *se = new StringExp(0, (char *)"null this");
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1274 se = se->semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1275 se->type = Type::tchar->arrayOf();
1326
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1276
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1277 ee = new AssertExp(loc, ie, se);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1278 }
1326
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1279 if (ee)
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1280 {
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1281 ExpStatement *s = new ExpStatement(0, ee);
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1282 a->push(s);
a41a40deff73 Fixed dmdfe generated class invariant calls. Also insert proper "this !is null" check before it. Fixed invariant* dstress regressions and generally seems like a good idea. Hope I didn't break anything.. minitests run fine!
Tomas Lindquist Olsen <tomas.l.olsen gmail com>
parents: 1282
diff changeset
1283 }
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1284 if (e)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1285 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1286 ExpStatement *s = new ExpStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1287 a->push(s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1288 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1289 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1290
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1291 if (fbody)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1292 a->push(fbody);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1293
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1294 if (fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1295 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1296 a->push(returnLabel->statement);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1297
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1298 if (type->nextOf()->ty != Tvoid)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1299 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1300 // Create: return vresult;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1301 assert(vresult);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1302 Expression *e = new VarExp(0, vresult);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1303 if (tintro)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1304 { e = e->implicitCastTo(sc, tintro->nextOf());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1305 e = e->semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1306 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1307 ReturnStatement *s = new ReturnStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1308 a->push(s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1309 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1310 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1311
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1312 fbody = new CompoundStatement(0, a);
1141
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1313
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1314 // wrap body of synchronized functions in a synchronized statement
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1315 if (isSynchronized())
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1316 {
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1317 ClassDeclaration *cd = parent->isClassDeclaration();
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1318 if (!cd)
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1319 error("synchronized function %s must be a member of a class", toChars());
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1320
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1321 Expression *sync;
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1322 if (isStatic())
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1323 {
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1324 // static member functions synchronize on classinfo
1143
b28a57f4b530 Fix to synchronized function storage class when getting the classinfo via dotExp.
Christian Kamm <kamm incasoftware de>
parents: 1141
diff changeset
1325 sync = cd->type->dotExp(sc2, new TypeExp(loc, cd->type), Id::classinfo);
1141
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1326 }
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1327 else
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1328 {
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1329 // non-static member functions synchronize on this
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1330 sync = new VarExp(loc, vthis);
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1331 }
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1332
1158
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1333 // we do not want to rerun semantics on the whole function, so we
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1334 // manually adjust all labels in the function that currently don't
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1335 // have an enclosingScopeExit to use the new SynchronizedStatement
1141
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1336 SynchronizedStatement* s = new SynchronizedStatement(loc, sync, NULL);
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1337 s->semantic(sc2);
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1338 s->body = fbody;
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1339
1158
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1340 // LDC
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1341 LabelMap::iterator it, end = labmap.end();
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1342 for (it = labmap.begin(); it != end; ++it)
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1343 if (it->second->enclosingScopeExit == NULL)
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1344 it->second->enclosingScopeExit = s;
08c1c3bfea5a Fix goto inside synchronized functions.
Christian Kamm <kamm incasoftware de>
parents: 1146
diff changeset
1345
1141
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1346 a = new Statements;
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1347 a->push(s);
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1348 fbody = new CompoundStatement(0, a);
f99a3b393c03 Reorganize EnclosingHandlers to require less changes to the frontend and allow us to
Christian Kamm <kamm incasoftware de>
parents: 1133
diff changeset
1349 }
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1350 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1351
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1352 sc2->callSuper = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1353 sc2->pop();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1354 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1355 semanticRun = 2;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1356 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1357
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1358 void FuncDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1359 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1360 //printf("FuncDeclaration::toCBuffer() '%s'\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1361
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1362 type->toCBuffer(buf, ident, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1363 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1364 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1365
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1366
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1367 void FuncDeclaration::bodyToCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1368 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1369 if (fbody &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1370 (!hgs->hdrgen || hgs->tpltMember || canInline(1,1))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1371 )
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1372 { buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1373
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1374 // in{}
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1375 if (frequire)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1376 { buf->writestring("in");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1377 buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1378 frequire->toCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1379 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1380
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1381 // out{}
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1382 if (fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1383 { buf->writestring("out");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1384 if (outId)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1385 { buf->writebyte('(');
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1386 buf->writestring(outId->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1387 buf->writebyte(')');
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1388 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1389 buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1390 fensure->toCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1391 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1392
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1393 if (frequire || fensure)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1394 { buf->writestring("body");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1395 buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1396 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1397
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1398 buf->writebyte('{');
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1399 buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1400 fbody->toCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1401 buf->writebyte('}');
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1402 buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1403 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1404 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1405 { buf->writeByte(';');
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1406 buf->writenl();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1407 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1408 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1409
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1410 /****************************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1411 * Determine if 'this' overrides fd.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1412 * Return !=0 if it does.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1413 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1414
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1415 int FuncDeclaration::overrides(FuncDeclaration *fd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1416 { int result = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1417
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1418 if (fd->ident == ident)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1419 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1420 int cov = type->covariant(fd->type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1421 if (cov)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1422 { ClassDeclaration *cd1 = toParent()->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1423 ClassDeclaration *cd2 = fd->toParent()->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1424
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1425 if (cd1 && cd2 && cd2->isBaseOf(cd1, NULL))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1426 result = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1427 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1428 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1429 return result;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1430 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1431
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1432 /*************************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1433 * Find index of function in vtbl[0..dim] that
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1434 * this function overrides.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1435 * Returns:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1436 * -1 didn't find one
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1437 * -2 can't determine because of forward references
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1438 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1439
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1440 int FuncDeclaration::findVtblIndex(Array *vtbl, int dim)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1441 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1442 for (int vi = 0; vi < dim; vi++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1443 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1444 FuncDeclaration *fdv = ((Dsymbol *)vtbl->data[vi])->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1445 if (fdv && fdv->ident == ident)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1446 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1447 int cov = type->covariant(fdv->type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1448 //printf("\tbaseclass cov = %d\n", cov);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1449 switch (cov)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1450 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1451 case 0: // types are distinct
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1452 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1453
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1454 case 1:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1455 return vi;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1456
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1457 case 2:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1458 //type->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1459 //fdv->type->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1460 //printf("%s %s\n", type->deco, fdv->type->deco);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1461 error("of type %s overrides but is not covariant with %s of type %s",
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1462 type->toChars(), fdv->toPrettyChars(), fdv->type->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1463 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1464
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1465 case 3:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1466 return -2; // forward references
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1467
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1468 default:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1469 assert(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1470 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1471 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1472 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1473 return -1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1474 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1475
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1476 /****************************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1477 * Overload this FuncDeclaration with the new one f.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1478 * Return !=0 if successful; i.e. no conflict.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1479 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1480
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1481 int FuncDeclaration::overloadInsert(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1482 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1483 FuncDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1484 AliasDeclaration *a;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1485
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1486 //printf("FuncDeclaration::overloadInsert(%s)\n", s->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1487 a = s->isAliasDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1488 if (a)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1489 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1490 if (overnext)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1491 return overnext->overloadInsert(a);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1492 if (!a->aliassym && a->type->ty != Tident && a->type->ty != Tinstance)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1493 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1494 //printf("\ta = '%s'\n", a->type->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1495 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1496 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1497 overnext = a;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1498 //printf("\ttrue: no conflict\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1499 return TRUE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1500 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1501 f = s->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1502 if (!f)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1503 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1504
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1505 if (type && f->type && // can be NULL for overloaded constructors
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1506 f->type->covariant(type) &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1507 !isFuncAliasDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1508 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1509 //printf("\tfalse: conflict %s\n", kind());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1510 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1511 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1512
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1513 if (overnext)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1514 return overnext->overloadInsert(f);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1515 overnext = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1516 //printf("\ttrue: no conflict\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1517 return TRUE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1518 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1519
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1520 /********************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1521 * Find function in overload list that exactly matches t.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1522 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1523
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1524 /***************************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1525 * Visit each overloaded function in turn, and call
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1526 * (*fp)(param, f) on it.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1527 * Exit when no more, or (*fp)(param, f) returns 1.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1528 * Returns:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1529 * 0 continue
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1530 * 1 done
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1531 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1532
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1533 int overloadApply(Module* from, FuncDeclaration *fstart,
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1534 int (*fp)(void *, FuncDeclaration *),
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1535 void *param)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1536 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1537 FuncDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1538 Declaration *d;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1539 Declaration *next;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1540
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1541 for (d = fstart; d; d = next)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1542 { FuncAliasDeclaration *fa = d->isFuncAliasDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1543
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1544 if (fa)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1545 {
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1546 if (fa->getModule() == from || fa->importprot != PROTprivate)
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1547 if (overloadApply(from, fa->funcalias, fp, param))
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1548 return 1;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1549 next = fa->overnext;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1550 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1551 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1552 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1553 AliasDeclaration *a = d->isAliasDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1554
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1555 if (a)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1556 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1557 Dsymbol *s = a->toAlias();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1558 next = s->isDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1559 if (next == a)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1560 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1561 if (next == fstart)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1562 break;
1362
194852badf8c Don't always expand aliases to FuncDecls to FuncAliasDecls - breaks for single
Christian Kamm <kamm incasoftware de>
parents: 1358
diff changeset
1563 if (a->importprot == PROTprivate && a->getModule() != from)
194852badf8c Don't always expand aliases to FuncDecls to FuncAliasDecls - breaks for single
Christian Kamm <kamm incasoftware de>
parents: 1358
diff changeset
1564 if (FuncDeclaration* fd = next->isFuncDeclaration())
194852badf8c Don't always expand aliases to FuncDecls to FuncAliasDecls - breaks for single
Christian Kamm <kamm incasoftware de>
parents: 1358
diff changeset
1565 next = fd->overnext;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1566 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1567 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1568 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1569 f = d->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1570 if (!f)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1571 { d->error("is aliased to a function");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1572 break; // BUG: should print error message?
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1573 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1574 if ((*fp)(param, f))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1575 return 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1576
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1577 next = f->overnext;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1578 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1579 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1580 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1581 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1582 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1583
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1584 /********************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1585 * Find function in overload list that exactly matches t.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1586 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1587
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1588 struct Param1
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1589 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1590 Type *t; // type to match
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1591 FuncDeclaration *f; // return value
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1592 };
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1593
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1594 int fp1(void *param, FuncDeclaration *f)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1595 { Param1 *p = (Param1 *)param;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1596 Type *t = p->t;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1597
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1598 if (t->equals(f->type))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1599 { p->f = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1600 return 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1601 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1602
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
1603 #if DMDV2
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1604 /* Allow covariant matches, if it's just a const conversion
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1605 * of the return type
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1606 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1607 if (t->ty == Tfunction)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1608 { TypeFunction *tf = (TypeFunction *)f->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1609 if (tf->covariant(t) == 1 &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1610 tf->nextOf()->implicitConvTo(t->nextOf()) >= MATCHconst)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1611 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1612 p->f = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1613 return 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1614 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1615 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1616 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1617 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1618 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1619
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1620 FuncDeclaration *FuncDeclaration::overloadExactMatch(Type *t, Module* from)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1621 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1622 Param1 p;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1623 p.t = t;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1624 p.f = NULL;
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1625 overloadApply(from, this, &fp1, &p);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1626 return p.f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1627 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1628
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1629 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1630 FuncDeclaration *FuncDeclaration::overloadExactMatch(Type *t)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1631 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1632 FuncDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1633 Declaration *d;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1634 Declaration *next;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1635
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1636 for (d = this; d; d = next)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1637 { FuncAliasDeclaration *fa = d->isFuncAliasDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1638
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1639 if (fa)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1640 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1641 FuncDeclaration *f2 = fa->funcalias->overloadExactMatch(t);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1642 if (f2)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1643 return f2;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1644 next = fa->overnext;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1645 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1646 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1647 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1648 AliasDeclaration *a = d->isAliasDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1649
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1650 if (a)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1651 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1652 Dsymbol *s = a->toAlias();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1653 next = s->isDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1654 if (next == a)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1655 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1656 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1657 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1658 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1659 f = d->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1660 if (!f)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1661 break; // BUG: should print error message?
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1662 if (t->equals(d->type))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1663 return f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1664 next = f->overnext;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1665 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1666 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1667 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1668 return NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1669 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1670 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1671
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1672 /********************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1673 * Decide which function matches the arguments best.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1674 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1675
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1676 struct Param2
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1677 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1678 Match *m;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1679 Expressions *arguments;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1680 };
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1681
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1682 int fp2(void *param, FuncDeclaration *f)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1683 { Param2 *p = (Param2 *)param;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1684 Match *m = p->m;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1685 Expressions *arguments = p->arguments;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1686 MATCH match;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1687
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1688 if (f != m->lastf) // skip duplicates
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1689 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1690 m->anyf = f;
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
1691 TypeFunction *tf = (TypeFunction *)f->type;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1692 match = (MATCH) tf->callMatch(arguments);
717
a26b0c5d5942 Merged DMD 1.036.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 703
diff changeset
1693 //printf("1match = %d\n", match);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1694 if (match != MATCHnomatch)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1695 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1696 if (match > m->last)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1697 goto LfIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1698
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1699 if (match < m->last)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1700 goto LlastIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1701
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1702 /* See if one of the matches overrides the other.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1703 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1704 if (m->lastf->overrides(f))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1705 goto LlastIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1706 else if (f->overrides(m->lastf))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1707 goto LfIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1708
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1709 Lambiguous:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1710 m->nextf = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1711 m->count++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1712 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1713
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1714 LfIsBetter:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1715 m->last = match;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1716 m->lastf = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1717 m->count = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1718 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1719
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1720 LlastIsBetter:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1721 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1722 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1723 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1724 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1725 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1726
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1727
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1728 void overloadResolveX(Match *m, FuncDeclaration *fstart, Expressions *arguments, Module* from)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1729 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1730 Param2 p;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1731 p.m = m;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1732 p.arguments = arguments;
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1733 overloadApply(from, fstart, &fp2, &p);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1734 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1735
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1736 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1737 // Recursive helper function
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1738
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1739 void overloadResolveX(Match *m, FuncDeclaration *fstart, Expressions *arguments)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1740 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1741 MATCH match;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1742 Declaration *d;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1743 Declaration *next;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1744
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1745 for (d = fstart; d; d = next)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1746 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1747 FuncDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1748 FuncAliasDeclaration *fa;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1749 AliasDeclaration *a;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1750
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1751 fa = d->isFuncAliasDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1752 if (fa)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1753 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1754 overloadResolveX(m, fa->funcalias, arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1755 next = fa->overnext;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1756 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1757 else if ((f = d->isFuncDeclaration()) != NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1758 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1759 next = f->overnext;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1760 if (f == m->lastf)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1761 continue; // skip duplicates
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1762 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1763 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1764 TypeFunction *tf;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1765
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1766 m->anyf = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1767 tf = (TypeFunction *)f->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1768 match = (MATCH) tf->callMatch(arguments);
717
a26b0c5d5942 Merged DMD 1.036.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 703
diff changeset
1769 //printf("2match = %d\n", match);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1770 if (match != MATCHnomatch)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1771 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1772 if (match > m->last)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1773 goto LfIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1774
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1775 if (match < m->last)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1776 goto LlastIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1777
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1778 /* See if one of the matches overrides the other.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1779 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1780 if (m->lastf->overrides(f))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1781 goto LlastIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1782 else if (f->overrides(m->lastf))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1783 goto LfIsBetter;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1784
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1785 Lambiguous:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1786 m->nextf = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1787 m->count++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1788 continue;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1789
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1790 LfIsBetter:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1791 m->last = match;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1792 m->lastf = f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1793 m->count = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1794 continue;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1795
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1796 LlastIsBetter:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1797 continue;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1798 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1799 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1800 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1801 else if ((a = d->isAliasDeclaration()) != NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1802 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1803 Dsymbol *s = a->toAlias();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1804 next = s->isDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1805 if (next == a)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1806 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1807 if (next == fstart)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1808 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1809 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1810 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1811 { d->error("is aliased to a function");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1812 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1813 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1814 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1815 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1816 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1817
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1818 FuncDeclaration *FuncDeclaration::overloadResolve(Loc loc, Expressions *arguments, Module* from)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1819 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1820 TypeFunction *tf;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1821 Match m;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1822
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1823 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1824 printf("FuncDeclaration::overloadResolve('%s')\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1825 if (arguments)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1826 { int i;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1827
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1828 for (i = 0; i < arguments->dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1829 { Expression *arg;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1830
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1831 arg = (Expression *)arguments->data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1832 assert(arg->type);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1833 printf("\t%s: ", arg->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1834 arg->type->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1835 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1836 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1837 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1838
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1839 memset(&m, 0, sizeof(m));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1840 m.last = MATCHnomatch;
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
1841 overloadResolveX(&m, this, arguments, from);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1842
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1843 if (m.count == 1) // exactly one match
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1844 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1845 return m.lastf;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1846 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1847 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1848 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1849 OutBuffer buf;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1850
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1851 if (arguments)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1852 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1853 HdrGenState hgs;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1854
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1855 argExpTypesToCBuffer(&buf, arguments, &hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1856 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1857
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1858 if (m.last == MATCHnomatch)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1859 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1860 tf = (TypeFunction *)type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1861
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1862 //printf("tf = %s, args = %s\n", tf->deco, ((Expression *)arguments->data[0])->type->deco);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1863 error(loc, "%s does not match parameter types (%s)",
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1864 Argument::argsTypesToChars(tf->parameters, tf->varargs),
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1865 buf.toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1866 return m.anyf; // as long as it's not a FuncAliasDeclaration
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1867 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1868 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1869 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1870 #if 1
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1871 TypeFunction *t1 = (TypeFunction *)m.lastf->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1872 TypeFunction *t2 = (TypeFunction *)m.nextf->type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1873
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1874 error(loc, "called with argument types:\n\t(%s)\nmatches both:\n\t%s%s\nand:\n\t%s%s",
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1875 buf.toChars(),
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1876 m.lastf->toPrettyChars(), Argument::argsTypesToChars(t1->parameters, t1->varargs),
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1877 m.nextf->toPrettyChars(), Argument::argsTypesToChars(t2->parameters, t2->varargs));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1878 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1879 error(loc, "overloads %s and %s both match argument list for %s",
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1880 m.lastf->type->toChars(),
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1881 m.nextf->type->toChars(),
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1882 m.lastf->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1883 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1884 return m.lastf;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1885 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1886 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1887 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1888
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1889 /********************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1890 * Labels are in a separate scope, one per function.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1891 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1892
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1893 LabelDsymbol *FuncDeclaration::searchLabel(Identifier *ident)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1894 { Dsymbol *s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1895
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1896 if (!labtab)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1897 labtab = new DsymbolTable(); // guess we need one
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1898
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1899 s = labtab->lookup(ident);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1900 if (!s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1901 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1902 s = new LabelDsymbol(ident);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1903 labtab->insert(s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1904 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1905 return (LabelDsymbol *)s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1906 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
1907
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1908 /****************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1909 * If non-static member function that has a 'this' pointer,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1910 * return the aggregate it is a member of.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1911 * Otherwise, return NULL.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1912 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1913
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1914 AggregateDeclaration *FuncDeclaration::isThis()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1915 { AggregateDeclaration *ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1916
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1917 //printf("+FuncDeclaration::isThis() '%s'\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1918 ad = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1919 if ((storage_class & STCstatic) == 0)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1920 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1921 ad = isMember2();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1922 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1923 //printf("-FuncDeclaration::isThis() %p\n", ad);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1924 return ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1925 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1926
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1927 AggregateDeclaration *FuncDeclaration::isMember2()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1928 { AggregateDeclaration *ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1929
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1930 //printf("+FuncDeclaration::isMember2() '%s'\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1931 ad = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1932 for (Dsymbol *s = this; s; s = s->parent)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1933 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1934 //printf("\ts = '%s', parent = '%s', kind = %s\n", s->toChars(), s->parent->toChars(), s->parent->kind());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1935 ad = s->isMember();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1936 if (ad)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1937 { //printf("test4\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1938 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1939 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1940 if (!s->parent ||
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1941 (!s->parent->isTemplateInstance()))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1942 { //printf("test5\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1943 break;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1944 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1945 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1946 //printf("-FuncDeclaration::isMember2() %p\n", ad);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1947 return ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1948 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1949
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1950 /*****************************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1951 * Determine lexical level difference from 'this' to nested function 'fd'.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1952 * Error if this cannot call fd.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1953 * Returns:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1954 * 0 same level
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1955 * -1 increase nesting by 1 (fd is nested within 'this')
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1956 * >0 decrease nesting by number
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1957 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1958
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1959 int FuncDeclaration::getLevel(Loc loc, FuncDeclaration *fd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1960 { int level;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1961 Dsymbol *s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1962 Dsymbol *fdparent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1963
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1964 //printf("FuncDeclaration::getLevel(fd = '%s')\n", fd->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1965 fdparent = fd->toParent2();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1966 if (fdparent == this)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1967 return -1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1968 s = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1969 level = 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1970 while (fd != s && fdparent != s->toParent2())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1971 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1972 //printf("\ts = '%s'\n", s->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1973 FuncDeclaration *thisfd = s->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1974 if (thisfd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1975 { if (!thisfd->isNested() && !thisfd->vthis)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1976 goto Lerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1977 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1978 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1979 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1980 ClassDeclaration *thiscd = s->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1981 if (thiscd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1982 { if (!thiscd->isNested())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1983 goto Lerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1984 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1985 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1986 goto Lerr;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1987 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1988
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1989 s = s->toParent2();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1990 assert(s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1991 level++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1992 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1993 return level;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1994
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1995 Lerr:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1996 error(loc, "cannot access frame of function %s", fd->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1997 return 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1998 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
1999
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2000 void FuncDeclaration::appendExp(Expression *e)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2001 { Statement *s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2002
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2003 s = new ExpStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2004 appendState(s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2005 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2006
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2007 void FuncDeclaration::appendState(Statement *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2008 { CompoundStatement *cs;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2009
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2010 if (!fbody)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2011 { Statements *a;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2012
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2013 a = new Statements();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2014 fbody = new CompoundStatement(0, a);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2015 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2016 cs = fbody->isCompoundStatement();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2017 cs->statements->push(s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2018 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2019
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2020
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2021 int FuncDeclaration::isMain()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2022 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2023 return ident == Id::main &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2024 linkage != LINKc && !isMember() && !isNested();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2025 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2026
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2027 int FuncDeclaration::isWinMain()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2028 {
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2029 //printf("FuncDeclaration::isWinMain() %s\n", toChars());
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2030 #if 0
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2031 int x = ident == Id::WinMain &&
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2032 linkage != LINKc && !isMember();
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2033 printf("%s\n", x ? "yes" : "no");
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2034 return x;
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2035 #else
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2036 return ident == Id::WinMain &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2037 linkage != LINKc && !isMember();
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2038 #endif
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2039 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2040
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2041 int FuncDeclaration::isDllMain()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2042 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2043 return ident == Id::DllMain &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2044 linkage != LINKc && !isMember();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2045 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2046
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2047 int FuncDeclaration::isExport()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2048 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2049 return protection == PROTexport;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2050 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2051
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2052 int FuncDeclaration::isImportedSymbol()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2053 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2054 //printf("isImportedSymbol()\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2055 //printf("protection = %d\n", protection);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2056 return (protection == PROTexport) && !fbody;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2057 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2058
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2059 // Determine if function goes into virtual function pointer table
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2060
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2061 int FuncDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2062 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2063 #if 0
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2064 printf("FuncDeclaration::isVirtual(%s)\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2065 printf("%p %d %d %d %d\n", isMember(), isStatic(), protection == PROTprivate, isCtorDeclaration(), linkage != LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2066 printf("result is %d\n",
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2067 isMember() &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2068 !(isStatic() || protection == PROTprivate || protection == PROTpackage) &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2069 toParent()->isClassDeclaration());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2070 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2071 return isMember() &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2072 !(isStatic() || protection == PROTprivate || protection == PROTpackage) &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2073 toParent()->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2074 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2075
846
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2076 int FuncDeclaration::isFinal()
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2077 {
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2078 ClassDeclaration *cd;
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2079 #if 0
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2080 printf("FuncDeclaration::isFinal(%s)\n", toChars());
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2081 printf("%p %d %d %d %d\n", isMember(), isStatic(), protection == PROTprivate, isCtorDeclaration(), linkage != LINKd);
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2082 printf("result is %d\n",
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2083 isMember() &&
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2084 !(isStatic() || protection == PROTprivate || protection == PROTpackage) &&
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2085 (cd = toParent()->isClassDeclaration()) != NULL &&
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2086 cd->storage_class & STCfinal);
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2087 #endif
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2088 return isMember() &&
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2089 (Declaration::isFinal() ||
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2090 ((cd = toParent()->isClassDeclaration()) != NULL && cd->storage_class & STCfinal));
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2091 }
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2092
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2093 int FuncDeclaration::isAbstract()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2094 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2095 return storage_class & STCabstract;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2096 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2097
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2098 int FuncDeclaration::isCodeseg()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2099 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2100 return TRUE; // functions are always in the code segment
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2101 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2102
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2103 // Determine if function needs
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2104 // a static frame pointer to its lexically enclosing function
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2105
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2106 int FuncDeclaration::isNested()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2107 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2108 //if (!toParent())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2109 //printf("FuncDeclaration::isNested('%s') parent=%p\n", toChars(), parent);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2110 //printf("\ttoParent() = '%s'\n", toParent()->toChars());
1282
680b4df0ea36 Commit workaround for TypeFunction comparing issue.
Christian Kamm <kamm incasoftware de>
parents: 1228
diff changeset
2111 return ((storage_class & STCstatic) == 0) && toParent2() &&
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2112 (toParent2()->isFuncDeclaration() != NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2113 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2114
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2115 int FuncDeclaration::needThis()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2116 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2117 //printf("FuncDeclaration::needThis() '%s'\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2118 int i = isThis() != NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2119 //printf("\t%d\n", i);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2120 if (!i && isFuncAliasDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2121 i = ((FuncAliasDeclaration *)this)->funcalias->needThis();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2122 return i;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2123 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2124
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2125 int FuncDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2126 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2127 AggregateDeclaration *ad = isThis();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2128 return (ad &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2129 //ad->isClassDeclaration() &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2130 global.params.useInvariants &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2131 (protection == PROTpublic || protection == PROTexport) &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2132 !naked);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2133 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2134
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2135 int FuncDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2136 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2137 AggregateDeclaration *ad = isThis();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2138 return (ad &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2139 ad->inv &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2140 //ad->isClassDeclaration() &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2141 global.params.useInvariants &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2142 (protection == PROTpublic || protection == PROTexport) &&
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2143 !naked);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2144 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2145
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2146 /**********************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2147 * Generate a FuncDeclaration for a runtime library function.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2148 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2149
378
d8234836b40f Get rid of runTimeHack and instead add proper argument info to the frontend
Christian Kamm <kamm incasoftware de>
parents: 336
diff changeset
2150 //
664
eef8ac26c66c Some missed LLVMDC -> LDC.
Christian Kamm <kamm incasoftware de>
parents: 658
diff changeset
2151 // LDC: Adjusted to give argument info to the runtime function decl.
378
d8234836b40f Get rid of runTimeHack and instead add proper argument info to the frontend
Christian Kamm <kamm incasoftware de>
parents: 336
diff changeset
2152 //
d8234836b40f Get rid of runTimeHack and instead add proper argument info to the frontend
Christian Kamm <kamm incasoftware de>
parents: 336
diff changeset
2153
1133
eeb8b95ea92e Cleanup DMD 1.041 merge.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1103
diff changeset
2154 FuncDeclaration *FuncDeclaration::genCfunc(Arguments *args, Type *treturn, const char *name)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2155 {
378
d8234836b40f Get rid of runTimeHack and instead add proper argument info to the frontend
Christian Kamm <kamm incasoftware de>
parents: 336
diff changeset
2156 return genCfunc(args, treturn, Lexer::idPool(name));
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2157 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2158
378
d8234836b40f Get rid of runTimeHack and instead add proper argument info to the frontend
Christian Kamm <kamm incasoftware de>
parents: 336
diff changeset
2159 FuncDeclaration *FuncDeclaration::genCfunc(Arguments *args, Type *treturn, Identifier *id)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2160 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2161 FuncDeclaration *fd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2162 TypeFunction *tf;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2163 Dsymbol *s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2164 static DsymbolTable *st = NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2165
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2166 //printf("genCfunc(name = '%s')\n", id->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2167 //printf("treturn\n\t"); treturn->print();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2168
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2169 // See if already in table
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2170 if (!st)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2171 st = new DsymbolTable();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2172 s = st->lookup(id);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2173 if (s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2174 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2175 fd = s->isFuncDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2176 assert(fd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2177 assert(fd->type->nextOf()->equals(treturn));
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2178 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2179 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2180 {
378
d8234836b40f Get rid of runTimeHack and instead add proper argument info to the frontend
Christian Kamm <kamm incasoftware de>
parents: 336
diff changeset
2181 tf = new TypeFunction(args, treturn, 0, LINKc);
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2182 fd = new FuncDeclaration(0, 0, id, STCstatic, tf);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2183 fd->protection = PROTpublic;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2184 fd->linkage = LINKc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2185
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2186 st->insert(fd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2187 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2188 return fd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2189 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2190
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2191 const char *FuncDeclaration::kind()
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2192 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2193 return "function";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2194 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2195
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2196 /*******************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2197 * Look at all the variables in this function that are referenced
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2198 * by nested functions, and determine if a closure needs to be
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2199 * created for them.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2200 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2201
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2202 #if DMDV2
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2203 int FuncDeclaration::needsClosure()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2204 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2205 /* Need a closure for all the closureVars[] if any of the
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2206 * closureVars[] are accessed by a
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2207 * function that escapes the scope of this function.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2208 * We take the conservative approach and decide that any function that:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2209 * 1) is a virtual function
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2210 * 2) has its address taken
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2211 * 3) has a parent that escapes
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2212 *
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2213 * Note that since a non-virtual function can be called by
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2214 * a virtual one, if that non-virtual function accesses a closure
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2215 * var, the closure still has to be taken. Hence, we check for isThis()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2216 * instead of isVirtual(). (thanks to David Friedman)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2217 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2218
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2219 //printf("FuncDeclaration::needsClosure() %s\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2220 for (int i = 0; i < closureVars.dim; i++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2221 { VarDeclaration *v = (VarDeclaration *)closureVars.data[i];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2222 assert(v->isVarDeclaration());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2223 //printf("\tv = %s\n", v->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2224
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2225 for (int j = 0; j < v->nestedrefs.dim; j++)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2226 { FuncDeclaration *f = (FuncDeclaration *)v->nestedrefs.data[j];
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2227 assert(f != this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2228
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2229 //printf("\t\tf = %s, %d, %d\n", f->toChars(), f->isVirtual(), f->tookAddressOf);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2230 if (f->isThis() || f->tookAddressOf)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2231 goto Lyes; // assume f escapes this function's scope
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2232
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2233 // Look to see if any parents of f that are below this escape
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2234 for (Dsymbol *s = f->parent; s && s != this; s = s->parent)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2235 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2236 f = s->isFuncDeclaration();
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2237 if (f && (f->isThis() || f->tookAddressOf))
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2238 goto Lyes;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2239 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2240 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2241 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2242 return 0;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2243
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2244 Lyes:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2245 //printf("\tneeds closure\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2246 return 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2247 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2248 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2249
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2250 /****************************** FuncAliasDeclaration ************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2251
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2252 // Used as a way to import a set of functions from another scope into this one.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2253
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2254 FuncAliasDeclaration::FuncAliasDeclaration(FuncDeclaration *funcalias)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2255 : FuncDeclaration(funcalias->loc, funcalias->endloc, funcalias->ident,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2256 (enum STC)funcalias->storage_class, funcalias->type)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2257 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2258 assert(funcalias != this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2259 this->funcalias = funcalias;
1358
78038e540342 Fix overload resolution issue in dmd bug 313/314 fix.
Christian Kamm <kamm incasoftware de>
parents: 1326
diff changeset
2260 importprot = PROTundefined;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2261 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2262
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2263 const char *FuncAliasDeclaration::kind()
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2264 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2265 return "function alias";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2266 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2267
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2268
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2269 /****************************** FuncLiteralDeclaration ************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2270
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2271 FuncLiteralDeclaration::FuncLiteralDeclaration(Loc loc, Loc endloc, Type *type,
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2272 enum TOK tok, ForeachStatement *fes)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2273 : FuncDeclaration(loc, endloc, NULL, STCundefined, type)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2274 {
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
2275 const char *id;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2276
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2277 if (fes)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2278 id = "__foreachbody";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2279 else if (tok == TOKdelegate)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2280 id = "__dgliteral";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2281 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2282 id = "__funcliteral";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2283 this->ident = Identifier::generateId(id);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2284 this->tok = tok;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2285 this->fes = fes;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2286 //printf("FuncLiteralDeclaration() id = '%s', type = '%s'\n", this->ident->toChars(), type->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2287 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2288
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2289 Dsymbol *FuncLiteralDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2290 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2291 FuncLiteralDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2292
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2293 //printf("FuncLiteralDeclaration::syntaxCopy('%s')\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2294 if (s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2295 f = (FuncLiteralDeclaration *)s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2296 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2297 f = new FuncLiteralDeclaration(loc, endloc, type->syntaxCopy(), tok, fes);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2298 FuncDeclaration::syntaxCopy(f);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2299 return f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2300 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2301
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2302 int FuncLiteralDeclaration::isNested()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2303 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2304 //printf("FuncLiteralDeclaration::isNested() '%s'\n", toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2305 return (tok == TOKdelegate);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2306 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2307
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2308 int FuncLiteralDeclaration::isVirtual()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2309 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2310 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2311 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2312
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2313 const char *FuncLiteralDeclaration::kind()
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2314 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2315 // GCC requires the (char*) casts
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2316 return (tok == TOKdelegate) ? (char*)"delegate" : (char*)"function";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2317 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2318
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2319 void FuncLiteralDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2320 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2321 static Identifier *idfunc;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2322 static Identifier *iddel;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2323
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2324 if (!idfunc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2325 idfunc = new Identifier("function", 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2326 if (!iddel)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2327 iddel = new Identifier("delegate", 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2328
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2329 type->toCBuffer(buf, ((tok == TOKdelegate) ? iddel : idfunc), hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2330 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2331 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2332
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2333
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2334 /********************************* CtorDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2335
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2336 CtorDeclaration::CtorDeclaration(Loc loc, Loc endloc, Arguments *arguments, int varargs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2337 : FuncDeclaration(loc, endloc, Id::ctor, STCundefined, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2338 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2339 this->arguments = arguments;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2340 this->varargs = varargs;
510
6aee82889553 Merged DMD 1.034, array operations are not yet implemented ;)
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 468
diff changeset
2341 //printf("CtorDeclaration(loc = %s) %s\n", loc.toChars(), toChars());
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2342 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2343
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2344 Dsymbol *CtorDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2345 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2346 CtorDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2347
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2348 f = new CtorDeclaration(loc, endloc, NULL, varargs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2349
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2350 f->outId = outId;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2351 f->frequire = frequire ? frequire->syntaxCopy() : NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2352 f->fensure = fensure ? fensure->syntaxCopy() : NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2353 f->fbody = fbody ? fbody->syntaxCopy() : NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2354 assert(!fthrows); // deprecated
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2355
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2356 f->arguments = Argument::arraySyntaxCopy(arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2357 return f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2358 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2359
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2360
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2361 void CtorDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2362 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2363 ClassDeclaration *cd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2364 Type *tret;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2365
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2366 //printf("CtorDeclaration::semantic()\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2367 if (type)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2368 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2369
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2370 sc = sc->push();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2371 sc->stc &= ~STCstatic; // not a static constructor
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2372
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2373 parent = sc->parent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2374 Dsymbol *parent = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2375 cd = parent->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2376 if (!cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2377 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2378 error("constructors are only for class definitions");
333
f7190d9eb70c [svn r354] Fix the regressions between [346] and [353] by making constructors and destructors outside classes fatal errors.
ChristianK
parents: 305
diff changeset
2379 fatal();
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2380 tret = Type::tvoid;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2381 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2382 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2383 tret = cd->type; //->referenceTo();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2384 type = new TypeFunction(arguments, tret, varargs, LINKd);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2385 if (!originalType)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2386 originalType = type;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2387
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2388 sc->flags |= SCOPEctor;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2389 type = type->semantic(loc, sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2390 sc->flags &= ~SCOPEctor;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2391
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2392 // Append:
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2393 // return this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2394 // to the function body
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2395 if (fbody)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2396 { Expression *e;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2397 Statement *s;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2398
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2399 e = new ThisExp(0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2400 s = new ReturnStatement(0, e);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2401 fbody = new CompoundStatement(0, fbody, s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2402 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2403
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2404 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2405
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2406 sc->pop();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2407
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2408 // See if it's the default constructor
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2409 if (cd && varargs == 0 && Argument::dim(arguments) == 0)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2410 cd->defaultCtor = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2411 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2412
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2413 const char *CtorDeclaration::kind()
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2414 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2415 return "constructor";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2416 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2417
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2418 char *CtorDeclaration::toChars()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2419 {
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
2420 return (char *)"this";
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2421 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2422
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2423 int CtorDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2424 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2425 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2426 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2427
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2428 int CtorDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2429 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2430 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2431 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2432
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2433 int CtorDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2434 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2435 return (vthis && global.params.useInvariants);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2436 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2437
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2438
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2439 void CtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2440 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2441 buf->writestring("this");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2442 Argument::argsToCBuffer(buf, hgs, arguments, varargs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2443 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2444 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2445
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2446 /********************************* DtorDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2447
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2448 DtorDeclaration::DtorDeclaration(Loc loc, Loc endloc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2449 : FuncDeclaration(loc, endloc, Id::dtor, STCundefined, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2450 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2451 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2452
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2453 DtorDeclaration::DtorDeclaration(Loc loc, Loc endloc, Identifier *id)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2454 : FuncDeclaration(loc, endloc, id, STCundefined, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2455 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2456 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2457
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2458 Dsymbol *DtorDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2459 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2460 assert(!s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2461 DtorDeclaration *dd = new DtorDeclaration(loc, endloc, ident);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2462 return FuncDeclaration::syntaxCopy(dd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2463 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2464
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2465
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2466 void DtorDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2467 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2468 ClassDeclaration *cd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2469
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2470 parent = sc->parent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2471 Dsymbol *parent = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2472 cd = parent->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2473 if (!cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2474 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2475 error("destructors only are for class definitions");
333
f7190d9eb70c [svn r354] Fix the regressions between [346] and [353] by making constructors and destructors outside classes fatal errors.
ChristianK
parents: 305
diff changeset
2476 fatal();
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2477 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2478 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2479 cd->dtors.push(this);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2480 type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2481
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2482 sc = sc->push();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2483 sc->stc &= ~STCstatic; // not a static destructor
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2484 sc->linkage = LINKd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2485
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2486 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2487
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2488 sc->pop();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2489 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2490
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2491 int DtorDeclaration::overloadInsert(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2492 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2493 return FALSE; // cannot overload destructors
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2494 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2495
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2496 int DtorDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2497 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2498 return (vthis && global.params.useInvariants);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2499 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2500
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2501 int DtorDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2502 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2503 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2504 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2505
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2506 int DtorDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2507 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2508 /* This should be FALSE so that dtor's don't get put into the vtbl[],
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2509 * but doing so will require recompiling everything.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2510 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2511 #if BREAKABI
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2512 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2513 #else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2514 return FuncDeclaration::isVirtual();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2515 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2516 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2517
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2518 void DtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2519 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2520 if (hgs->hdrgen)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2521 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2522 buf->writestring("~this()");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2523 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2524 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2525
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2526 /********************************* StaticCtorDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2527
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2528 StaticCtorDeclaration::StaticCtorDeclaration(Loc loc, Loc endloc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2529 : FuncDeclaration(loc, endloc,
957
31bbc7f3b817 Backed out changeset [369996c08420].
Christian Kamm <kamm incasoftware de>
parents: 956
diff changeset
2530 Identifier::generateId("_staticCtor"), STCstatic, NULL)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2531 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2532 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2533
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2534 Dsymbol *StaticCtorDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2535 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2536 StaticCtorDeclaration *scd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2537
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2538 assert(!s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2539 scd = new StaticCtorDeclaration(loc, endloc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2540 return FuncDeclaration::syntaxCopy(scd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2541 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2542
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2543
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2544 void StaticCtorDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2545 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2546 //printf("StaticCtorDeclaration::semantic()\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2547
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2548 type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2549
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2550 /* If the static ctor appears within a template instantiation,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2551 * it could get called multiple times by the module constructors
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2552 * for different modules. Thus, protect it with a gate.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2553 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2554 if (inTemplateInstance())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2555 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2556 /* Add this prefix to the function:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2557 * static int gate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2558 * if (++gate != 1) return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2559 * Note that this is not thread safe; should not have threads
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2560 * during static construction.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2561 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2562 Identifier *id = Lexer::idPool("__gate");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2563 VarDeclaration *v = new VarDeclaration(0, Type::tint32, id, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2564 v->storage_class = STCstatic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2565 Statements *sa = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2566 Statement *s = new DeclarationStatement(0, v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2567 sa->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2568 Expression *e = new IdentifierExp(0, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2569 e = new AddAssignExp(0, e, new IntegerExp(1));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2570 e = new EqualExp(TOKnotequal, 0, e, new IntegerExp(1));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2571 s = new IfStatement(0, NULL, e, new ReturnStatement(0, NULL), NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2572 sa->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2573 if (fbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2574 sa->push(fbody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2575 fbody = new CompoundStatement(0, sa);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2576 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2577
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2578 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2579
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2580 // We're going to need ModuleInfo
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2581 Module *m = getModule();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2582 if (!m)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2583 m = sc->module;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2584 if (m)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2585 { m->needmoduleinfo = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2586 #ifdef IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2587 m->strictlyneedmoduleinfo = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2588 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2589 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2590 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2591
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2592 AggregateDeclaration *StaticCtorDeclaration::isThis()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2593 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2594 return NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2595 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2596
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2597 int StaticCtorDeclaration::isStaticConstructor()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2598 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2599 return TRUE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2600 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2601
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2602 int StaticCtorDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2603 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2604 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2605 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2606
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2607 int StaticCtorDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2608 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2609 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2610 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2611
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2612 int StaticCtorDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2613 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2614 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2615 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2616
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2617 void StaticCtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2618 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2619 if (hgs->hdrgen)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2620 { buf->writestring("static this();\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2621 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2622 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2623 buf->writestring("static this()");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2624 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2625 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2626
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2627 /********************************* StaticDtorDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2628
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2629 StaticDtorDeclaration::StaticDtorDeclaration(Loc loc, Loc endloc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2630 : FuncDeclaration(loc, endloc,
957
31bbc7f3b817 Backed out changeset [369996c08420].
Christian Kamm <kamm incasoftware de>
parents: 956
diff changeset
2631 Identifier::generateId("_staticDtor"), STCstatic, NULL)
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2632 {
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2633 vgate = NULL;
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2634 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2635
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2636 Dsymbol *StaticDtorDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2637 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2638 StaticDtorDeclaration *sdd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2639
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2640 assert(!s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2641 sdd = new StaticDtorDeclaration(loc, endloc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2642 return FuncDeclaration::syntaxCopy(sdd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2643 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2644
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2645
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2646 void StaticDtorDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2647 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2648 ClassDeclaration *cd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2649 Type *tret;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2650
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2651 cd = sc->scopesym->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2652 if (!cd)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2653 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2654 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2655 type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2656
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2657 /* If the static ctor appears within a template instantiation,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2658 * it could get called multiple times by the module constructors
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2659 * for different modules. Thus, protect it with a gate.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2660 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2661 if (inTemplateInstance())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2662 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2663 /* Add this prefix to the function:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2664 * static int gate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2665 * if (--gate != 0) return;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2666 * Increment gate during constructor execution.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2667 * Note that this is not thread safe; should not have threads
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2668 * during static destruction.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2669 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2670 Identifier *id = Lexer::idPool("__gate");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2671 VarDeclaration *v = new VarDeclaration(0, Type::tint32, id, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2672 v->storage_class = STCstatic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2673 Statements *sa = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2674 Statement *s = new DeclarationStatement(0, v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2675 sa->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2676 Expression *e = new IdentifierExp(0, id);
937
6c09179ebba0 Fixed warning on osx as per request from mwarning.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 891
diff changeset
2677 e = new AddAssignExp(0, e, new IntegerExp((uint64_t)-1));
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 644
diff changeset
2678 e = new EqualExp(TOKnotequal, 0, e, new IntegerExp(0));
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2679 s = new IfStatement(0, NULL, e, new ReturnStatement(0, NULL), NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2680 sa->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2681 if (fbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2682 sa->push(fbody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2683 fbody = new CompoundStatement(0, sa);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2684 vgate = v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2685 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2686
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2687 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2688
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2689 // We're going to need ModuleInfo
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2690 Module *m = getModule();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2691 if (!m)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2692 m = sc->module;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2693 if (m)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2694 { m->needmoduleinfo = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2695 #ifdef IN_GCC
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2696 m->strictlyneedmoduleinfo = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2697 #endif
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2698 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2699 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2700
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2701 AggregateDeclaration *StaticDtorDeclaration::isThis()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2702 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2703 return NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2704 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2705
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2706 int StaticDtorDeclaration::isStaticDestructor()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2707 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2708 return TRUE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2709 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2710
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2711 int StaticDtorDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2712 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2713 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2714 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2715
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2716 int StaticDtorDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2717 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2718 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2719 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2720
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2721 int StaticDtorDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2722 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2723 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2724 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2725
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2726 void StaticDtorDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2727 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2728 if (hgs->hdrgen)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2729 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2730 buf->writestring("static ~this()");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2731 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2732 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2733
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2734 /********************************* InvariantDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2735
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2736 InvariantDeclaration::InvariantDeclaration(Loc loc, Loc endloc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2737 : FuncDeclaration(loc, endloc, Id::classInvariant, STCundefined, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2738 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2739 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2740
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2741 Dsymbol *InvariantDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2742 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2743 InvariantDeclaration *id;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2744
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2745 assert(!s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2746 id = new InvariantDeclaration(loc, endloc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2747 FuncDeclaration::syntaxCopy(id);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2748 return id;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2749 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2750
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2751
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2752 void InvariantDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2753 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2754 AggregateDeclaration *ad;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2755 Type *tret;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2756
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2757 parent = sc->parent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2758 Dsymbol *parent = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2759 ad = parent->isAggregateDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2760 if (!ad)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2761 {
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 957
diff changeset
2762 error("invariants are only for struct/union/class definitions");
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2763 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2764 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2765 else if (ad->inv && ad->inv != this)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2766 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2767 error("more than one invariant for %s", ad->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2768 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2769 ad->inv = this;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2770 type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2771
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2772 sc = sc->push();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2773 sc->stc &= ~STCstatic; // not a static invariant
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2774 sc->incontract++;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2775 sc->linkage = LINKd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2776
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2777 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2778
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2779 sc->pop();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2780 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2781
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2782 int InvariantDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2783 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2784 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2785 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2786
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2787 int InvariantDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2788 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2789 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2790 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2791
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2792 int InvariantDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2793 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2794 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2795 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2796
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2797 void InvariantDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2798 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2799 if (hgs->hdrgen)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2800 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2801 buf->writestring("invariant");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2802 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2803 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2804
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2805
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2806 /********************************* UnitTestDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2807
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2808 /*******************************
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2809 * Generate unique unittest function Id so we can have multiple
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2810 * instances per module.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2811 */
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2812
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2813 static Identifier *unitTestId()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2814 {
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2815 return Lexer::uniqueId("__unittest");
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2816 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2817
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2818 UnitTestDeclaration::UnitTestDeclaration(Loc loc, Loc endloc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2819 : FuncDeclaration(loc, endloc, unitTestId(), STCundefined, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2820 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2821 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2822
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2823 Dsymbol *UnitTestDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2824 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2825 UnitTestDeclaration *utd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2826
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2827 assert(!s);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2828 utd = new UnitTestDeclaration(loc, endloc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2829 return FuncDeclaration::syntaxCopy(utd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2830 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2831
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2832
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2833 void UnitTestDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2834 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2835 if (global.params.useUnitTests)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2836 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2837 type = new TypeFunction(NULL, Type::tvoid, FALSE, LINKd);
846
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2838 Scope *sc2 = sc->push();
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2839 sc2->linkage = LINKd;
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2840 FuncDeclaration::semantic(sc2);
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
2841 sc2->pop();
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2842 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2843
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2844 // We're going to need ModuleInfo even if the unit tests are not
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2845 // compiled in, because other modules may import this module and refer
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2846 // to this ModuleInfo.
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2847 Module *m = getModule();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2848 if (!m)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2849 m = sc->module;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2850 if (m)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2851 m->needmoduleinfo = 1;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2852 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2853
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2854 AggregateDeclaration *UnitTestDeclaration::isThis()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2855 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2856 return NULL;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2857 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2858
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2859 int UnitTestDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2860 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2861 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2862 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2863
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2864 int UnitTestDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2865 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2866 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2867 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2868
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2869 int UnitTestDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2870 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2871 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2872 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2873
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2874 void UnitTestDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2875 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2876 if (hgs->hdrgen)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2877 return;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2878 buf->writestring("unittest");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2879 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2880 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2881
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2882 /********************************* NewDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2883
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2884 NewDeclaration::NewDeclaration(Loc loc, Loc endloc, Arguments *arguments, int varargs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2885 : FuncDeclaration(loc, endloc, Id::classNew, STCstatic, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2886 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2887 this->arguments = arguments;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2888 this->varargs = varargs;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2889 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2890
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2891 Dsymbol *NewDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2892 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2893 NewDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2894
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2895 f = new NewDeclaration(loc, endloc, NULL, varargs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2896
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2897 FuncDeclaration::syntaxCopy(f);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2898
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2899 f->arguments = Argument::arraySyntaxCopy(arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2900
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2901 return f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2902 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2903
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2904
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2905 void NewDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2906 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2907 ClassDeclaration *cd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2908 Type *tret;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2909
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2910 //printf("NewDeclaration::semantic()\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2911
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2912 parent = sc->parent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2913 Dsymbol *parent = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2914 cd = parent->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2915 if (!cd && !parent->isStructDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2916 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2917 error("new allocators only are for class or struct definitions");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2918 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2919 tret = Type::tvoid->pointerTo();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2920 type = new TypeFunction(arguments, tret, varargs, LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2921
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2922 type = type->semantic(loc, sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2923 assert(type->ty == Tfunction);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2924
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1177
diff changeset
2925 // Check that there is at least one argument of type size_t
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2926 TypeFunction *tf = (TypeFunction *)type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2927 if (Argument::dim(tf->parameters) < 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2928 {
891
ea82e2077f9d Change custom allocator new size argument to size_t instead of uint. See #175.
Christian Kamm <kamm incasoftware de>
parents: 875
diff changeset
2929 error("at least one argument of type size_t expected");
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2930 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2931 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2932 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2933 Argument *a = Argument::getNth(tf->parameters, 0);
891
ea82e2077f9d Change custom allocator new size argument to size_t instead of uint. See #175.
Christian Kamm <kamm incasoftware de>
parents: 875
diff changeset
2934 if (!a->type->equals(Type::tsize_t))
ea82e2077f9d Change custom allocator new size argument to size_t instead of uint. See #175.
Christian Kamm <kamm incasoftware de>
parents: 875
diff changeset
2935 error("first argument must be type size_t, not %s", a->type->toChars());
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2936 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2937
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2938 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2939 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2940
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
2941 const char *NewDeclaration::kind()
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2942 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2943 return "allocator";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2944 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2945
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2946 int NewDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2947 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2948 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2949 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2950
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2951 int NewDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2952 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2953 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2954 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2955
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2956 int NewDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2957 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2958 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2959 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2960
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2961 void NewDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2962 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2963 buf->writestring("new");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2964 Argument::argsToCBuffer(buf, hgs, arguments, varargs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2965 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2966 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2967
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2968
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2969 /********************************* DeleteDeclaration ****************************/
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2970
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2971 DeleteDeclaration::DeleteDeclaration(Loc loc, Loc endloc, Arguments *arguments)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2972 : FuncDeclaration(loc, endloc, Id::classDelete, STCstatic, NULL)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2973 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2974 this->arguments = arguments;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2975 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2976
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2977 Dsymbol *DeleteDeclaration::syntaxCopy(Dsymbol *s)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2978 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2979 DeleteDeclaration *f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2980
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2981 f = new DeleteDeclaration(loc, endloc, NULL);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2982
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2983 FuncDeclaration::syntaxCopy(f);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2984
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2985 f->arguments = Argument::arraySyntaxCopy(arguments);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2986
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2987 return f;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2988 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2989
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2990
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2991 void DeleteDeclaration::semantic(Scope *sc)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2992 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2993 ClassDeclaration *cd;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2994
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2995 //printf("DeleteDeclaration::semantic()\n");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2996
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2997 parent = sc->parent;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2998 Dsymbol *parent = toParent();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
2999 cd = parent->isClassDeclaration();
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3000 if (!cd && !parent->isStructDeclaration())
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3001 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3002 error("new allocators only are for class or struct definitions");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3003 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3004 type = new TypeFunction(arguments, Type::tvoid, 0, LINKd);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3005
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3006 type = type->semantic(loc, sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3007 assert(type->ty == Tfunction);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3008
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3009 // Check that there is only one argument of type void*
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3010 TypeFunction *tf = (TypeFunction *)type;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3011 if (Argument::dim(tf->parameters) != 1)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3012 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3013 error("one argument of type void* expected");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3014 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3015 else
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3016 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3017 Argument *a = Argument::getNth(tf->parameters, 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3018 if (!a->type->equals(Type::tvoid->pointerTo()))
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3019 error("one argument of type void* expected, not %s", a->type->toChars());
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3020 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3021
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3022 FuncDeclaration::semantic(sc);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3023 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3024
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 333
diff changeset
3025 const char *DeleteDeclaration::kind()
159
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3026 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3027 return "deallocator";
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3028 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3029
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3030 int DeleteDeclaration::isDelete()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3031 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3032 return TRUE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3033 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3034
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3035 int DeleteDeclaration::isVirtual()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3036 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3037 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3038 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3039
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3040 int DeleteDeclaration::addPreInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3041 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3042 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3043 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3044
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3045 int DeleteDeclaration::addPostInvariant()
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3046 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3047 return FALSE;
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3048 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3049
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3050 void DeleteDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3051 {
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3052 buf->writestring("delete");
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3053 Argument::argsToCBuffer(buf, hgs, arguments, 0);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3054 bodyToCBuffer(buf, hgs);
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3055 }
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3056
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3057
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3058
5acec6b2eef8 [svn r175] merged dmd 1.029
ChristianK
parents: 155
diff changeset
3059