annotate dmd/parse.c @ 1256:6af2359b433a

Change needed for mingw
author Kelly Wilson <wilsonk cpsc.ucalgary.ca>
date Wed, 22 Apr 2009 14:40:56 -0600
parents e961851fb8be
children dda95755f63d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2 // Compiler implementation of the D programming language
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3 // Copyright (c) 1999-2009 by Digital Mars
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4 // All Rights Reserved
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5 // written by Walter Bright
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
6 // http://www.digitalmars.com
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
7 // License for redistribution is by either the Artistic License
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
8 // in artistic.txt, or the GNU General Public License in gnu.txt.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
9 // See the included readme.txt for details.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
10
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
11 // This is the D parser
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
12
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
13 #include <stdio.h>
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
14 #include <assert.h>
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
15
1103
b30fe7e1dbb9 - Updated to DMD frontend 1.041.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 846
diff changeset
16 #include "rmem.h"
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
17 #include "lexer.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
18 #include "parse.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
19 #include "init.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
20 #include "attrib.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
21 #include "cond.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
22 #include "mtype.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
23 #include "template.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
24 #include "staticassert.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
25 #include "expression.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
26 #include "statement.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
27 #include "module.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
28 #include "dsymbol.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
29 #include "import.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
30 #include "declaration.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
31 #include "aggregate.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
32 #include "enum.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
33 #include "id.h"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
34 #include "version.h"
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
35 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
36 #include "aliasthis.h"
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
37 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
38
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
39 // How multiple declarations are parsed.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
40 // If 1, treat as C.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
41 // If 0, treat:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
42 // int *p, i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
43 // as:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
44 // int* p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
45 // int* i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
46 #define CDECLSYNTAX 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
47
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
48 // Support C cast syntax:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
49 // (type)(expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
50 #define CCASTSYNTAX 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
51
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
52 // Support postfix C array declarations, such as
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
53 // int a[3][4];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
54 #define CARRAYDECL 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
55
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
56 // Support left-to-right array declarations
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
57 #define LTORARRAYDECL 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
58
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
59
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
60 Parser::Parser(Module *module, unsigned char *base, unsigned length, int doDocComment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
61 : Lexer(module, base, 0, length, doDocComment, 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
62 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
63 //printf("Parser::Parser()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
64 md = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
65 linkage = LINKd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
66 endloc = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
67 inBrackets = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
68 //nextToken(); // start up the scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
69 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
70
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
71 Array *Parser::parseModule()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
72 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
73 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
74
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
75 // ModuleDeclation leads off
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
76 if (token.value == TOKmodule)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
77 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
78 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
79
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
80 nextToken();
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
81 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
82 if (token.value == TOKlparen)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
83 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
84 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
85 if (token.value != TOKidentifier)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
86 { error("module (system) identifier expected");
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
87 goto Lerr;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
88 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
89 Identifier *id = token.ident;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
90
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
91 if (id == Id::system)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
92 safe = TRUE;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
93 else
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
94 error("(safe) expected, not %s", id->toChars());
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
95 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
96 check(TOKrparen);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
97 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
98 #endif
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
99
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
100 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
101 { error("Identifier expected following module");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
102 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
103 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
104 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
105 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
106 Array *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
107 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
108
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
109 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
110 while (nextToken() == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
111 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
112 if (!a)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
113 a = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
114 a->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
115 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
116 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
117 { error("Identifier expected following package");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
118 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
119 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
120 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
121 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
122
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
123 md = new ModuleDeclaration(a, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
124
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
125 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
126 error("';' expected following module declaration instead of %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
127 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
128 addComment(mod, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
129 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
130 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
131
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
132 decldefs = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
133 if (token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
134 { error("unrecognized declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
135 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
136 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
137 return decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
138
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
139 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
140 while (token.value != TOKsemicolon && token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
141 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
142 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
143 return new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
144 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
145
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
146 Array *Parser::parseDeclDefs(int once)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
147 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
148 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
149 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
150 Array *aelse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
151 enum PROT prot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
152 unsigned stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
153 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
154 unsigned char *comment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
155
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
156 //printf("Parser::parseDeclDefs()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
157 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
158 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
159 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
160 comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
161 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
162 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
163 case TOKenum:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
164 s = parseEnum();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
165 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
166
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
167 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
168 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
169 case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
170 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
171 s = parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
172 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
173
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
174 case TOKimport:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
175 s = parseImport(decldefs, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
176 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
177
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
178 case TOKtemplate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
179 s = (Dsymbol *)parseTemplateDeclaration();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
180 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
181
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
182 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
183 { Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
184 if (peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
185 { // mixin(string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
186 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
187 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
188 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
189 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
190 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
191 s = new CompileDeclaration(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
192 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
193 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
194 s = parseMixin();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
195 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
196 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
197
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
198 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
199 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
200 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
201 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
202 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
203 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
204 Ldeclaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
205 a = parseDeclarations();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
206 decldefs->append(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
207 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
208
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
209 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
210 s = parseCtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
211 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
212
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
213 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
214 s = parseDtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
215 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
216
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
217 case TOKinvariant:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
218 #if 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
219 s = parseInvariant();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
220 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
221 if (peek(&token)->value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
222 s = parseInvariant();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
223 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
224 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
225 stc = STCinvariant;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
226 goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
227 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
228 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
229 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
230
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
231 case TOKunittest:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
232 s = parseUnitTest();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
233 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
234
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
235 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
236 s = parseNew();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
237 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
238
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
239 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
240 s = parseDelete();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
241 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
242
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
243 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
244 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
245 return decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
246
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
247 case TOKstatic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
248 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
249 if (token.value == TOKthis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
250 s = parseStaticCtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
251 else if (token.value == TOKtilde)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
252 s = parseStaticDtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
253 else if (token.value == TOKassert)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
254 s = parseStaticAssert();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
255 else if (token.value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
256 { condition = parseStaticIfCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
257 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
258 aelse = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
259 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
260 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
261 aelse = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
262 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
263 s = new StaticIfDeclaration(condition, a, aelse);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
264 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
265 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
266 else if (token.value == TOKimport)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
267 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
268 s = parseImport(decldefs, 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
269 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
270 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
271 { stc = STCstatic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
272 goto Lstc2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
273 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
274 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
275
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
276 case TOKconst: stc = STCconst; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
277 case TOKfinal: stc = STCfinal; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
278 case TOKauto: stc = STCauto; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
279 case TOKscope: stc = STCscope; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
280 case TOKoverride: stc = STCoverride; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
281 case TOKabstract: stc = STCabstract; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
282 case TOKsynchronized: stc = STCsynchronized; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
283 case TOKdeprecated: stc = STCdeprecated; goto Lstc;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
284 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
285 case TOKnothrow: stc = STCnothrow; goto Lstc;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
286 case TOKpure: stc = STCpure; goto Lstc;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
287 case TOKref: stc = STCref; goto Lstc;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
288 case TOKtls: stc = STCtls; goto Lstc;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
289 //case TOKmanifest: stc = STCmanifest; goto Lstc;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
290 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
291
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
292 Lstc:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
293 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
294 Lstc2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
295 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
296 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
297 case TOKconst: stc |= STCconst; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
298 case TOKfinal: stc |= STCfinal; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
299 case TOKauto: stc |= STCauto; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
300 case TOKscope: stc |= STCscope; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
301 case TOKoverride: stc |= STCoverride; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
302 case TOKabstract: stc |= STCabstract; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
303 case TOKsynchronized: stc |= STCsynchronized; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
304 case TOKdeprecated: stc |= STCdeprecated; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
305 //case TOKinvariant: stc |= STCinvariant; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
306 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
307 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
308 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
309
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
310 /* Look for auto initializers:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
311 * storage_class identifier = initializer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
312 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
313 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
314 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
315 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
316 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
317 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
318 Identifier *ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
319 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
320 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
321 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
322 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
323 v->storage_class = stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
324 s = v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
325 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
326 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
327 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
328 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
329 else if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
330 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
331 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
332 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
333 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
334 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
335 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
336 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
337 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
338 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
339 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
340 error("Identifier expected following comma");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
341 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
342 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
343 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
344 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
345 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
346 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
347 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
348 { a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
349 s = new StorageClassDeclaration(stc, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
350 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
351 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
352
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
353 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
354 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
355 { stc = STCextern;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
356 goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
357 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
358 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
359 enum LINK linksave = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
360 linkage = parseLinkage();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
361 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
362 s = new LinkDeclaration(linkage, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
363 linkage = linksave;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
364 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
365 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
366 case TOKprivate: prot = PROTprivate; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
367 case TOKpackage: prot = PROTpackage; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
368 case TOKprotected: prot = PROTprotected; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
369 case TOKpublic: prot = PROTpublic; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
370 case TOKexport: prot = PROTexport; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
371
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
372 Lprot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
373 nextToken();
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
374 switch (token.value)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
375 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
376 case TOKprivate:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
377 case TOKpackage:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
378 case TOKprotected:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
379 case TOKpublic:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
380 case TOKexport:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
381 error("redundant protection attribute");
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
382 break;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
383 }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
384 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
385 s = new ProtDeclaration(prot, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
386 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
387
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
388 case TOKalign:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
389 { unsigned n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
390
737
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
391 // LDC better align code locations
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
392 Loc alignloc = loc;
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
393
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
394 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
395 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
396 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
397 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
398 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
399 if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
400 n = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
401 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
402 { error("integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
403 n = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
404 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
405 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
406 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
407 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
408 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
409 n = global.structalign; // default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
410
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
411 a = parseBlock();
737
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
412 s = new AlignDeclaration(alignloc, n, a);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
413 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
414 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
415
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
416 case TOKpragma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
417 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
418 Expressions *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
419
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
420 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
421 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
422 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
423 { error("pragma(identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
424 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
425 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
426 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
427 nextToken();
846
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 737
diff changeset
428 if (token.value == TOKcomma && peekNext() != TOKrparen)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
429 args = parseArguments(); // pragma(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
430 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
431 check(TOKrparen); // pragma(identifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
432
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
433 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
434 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
435 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
436 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
437 s = new PragmaDeclaration(loc, ident, args, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
438 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
439 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
440
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
441 case TOKdebug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
442 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
443 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
444 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
445 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
446 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
447 s = new DebugSymbol(loc, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
448 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
449 s = new DebugSymbol(loc, (unsigned)token.uns64value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
450 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
451 { error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
452 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
453 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
454 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
455 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
456 error("semicolon expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
457 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
458 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
459 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
460
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
461 condition = parseDebugCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
462 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
463
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
464 case TOKversion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
465 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
466 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
467 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
468 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
469 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
470 s = new VersionSymbol(loc, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
471 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
472 s = new VersionSymbol(loc, (unsigned)token.uns64value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
473 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
474 { error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
475 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
476 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
477 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
478 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
479 error("semicolon expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
480 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
481 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
482 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
483 condition = parseVersionCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
484 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
485
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
486 Lcondition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
487 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
488 aelse = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
489 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
490 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
491 aelse = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
492 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
493 s = new ConditionalDeclaration(condition, a, aelse);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
494 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
495
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
496 case TOKsemicolon: // empty declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
497 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
498 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
499
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
500 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
501 error("Declaration expected, not '%s'",token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
502 Lerror:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
503 while (token.value != TOKsemicolon && token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
504 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
505 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
506 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
507 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
508 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
509 if (s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
510 { decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
511 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
512 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
513 } while (!once);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
514 return decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
515 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
516
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
517
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
518 /********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
519 * Parse declarations after an align, protection, or extern decl.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
520 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
521
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
522 Array *Parser::parseBlock()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
523 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
524 Array *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
525 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
526
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
527 //printf("parseBlock()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
528 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
529 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
530 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
531 error("declaration expected following attribute, not ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
532 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
533 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
534
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
535 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
536 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
537 a = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
538 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
539 { /* { */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
540 error("matching '}' expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
541 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
542 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
543 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
544 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
545
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
546 case TOKcolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
547 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
548 #if 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
549 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
550 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
551 a = parseDeclDefs(0); // grab declarations up to closing curly bracket
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
552 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
553 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
554
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
555 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
556 a = parseDeclDefs(1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
557 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
558 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
559 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
560 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
561
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
562 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
563 * Parse a static assertion.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
564 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
565
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
566 StaticAssert *Parser::parseStaticAssert()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
567 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
568 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
569 Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
570 Expression *msg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
571
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
572 //printf("parseStaticAssert()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
573 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
574 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
575 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
576 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
577 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
578 msg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
579 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
580 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
581 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
582 return new StaticAssert(loc, exp, msg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
583 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
584
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
585 /***********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
586 * Parse typeof(expression).
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
587 * Current token is on the 'typeof'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
588 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
589
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
590 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
591 TypeQualified *Parser::parseTypeof()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
592 { TypeQualified *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
593 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
594
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
595 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
596 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
597 if (token.value == TOKreturn) // typeof(return)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
598 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
599 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
600 t = new TypeReturn(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
601 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
602 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
603 { Expression *exp = parseExpression(); // typeof(expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
604 t = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
605 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
606 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
607 return t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
608 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
609 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
610
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
611 /***********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
612 * Parse extern (linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
613 * The parser is on the 'extern' token.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
614 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
615
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
616 enum LINK Parser::parseLinkage()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
617 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
618 enum LINK link = LINKdefault;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
619 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
620 assert(token.value == TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
621 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
622 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
623 { Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
624
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
625 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
626 if (id == Id::Windows)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
627 link = LINKwindows;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
628 else if (id == Id::Pascal)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
629 link = LINKpascal;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
630 else if (id == Id::D)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
631 link = LINKd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
632 else if (id == Id::C)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
633 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
634 link = LINKc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
635 if (token.value == TOKplusplus)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
636 { link = LINKcpp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
637 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
638 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
639 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
640 else if (id == Id::System)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
641 {
721
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
642 // LDC we configure target at runtime
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
643 if (global.params.os == OSWindows)
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
644 link = LINKwindows;
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
645 else
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
646 link = LINKc;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
647 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
648 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
649 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
650 error("valid linkage identifiers are D, C, C++, Pascal, Windows, System");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
651 link = LINKd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
652 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
653 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
654 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
655 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
656 link = LINKd; // default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
657 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
658 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
659 return link;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
660 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
661
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
662 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
663 * Parse a debug conditional
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
664 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
665
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
666 Condition *Parser::parseDebugCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
667 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
668 Condition *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
669
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
670 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
671 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
672 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
673 unsigned level = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
674 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
675
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
676 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
677 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
678 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
679 level = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
680 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
681 error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
682 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
683 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
684 c = new DebugCondition(mod, level, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
685 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
686 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
687 c = new DebugCondition(mod, 1, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
688 return c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
689
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
690 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
691
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
692 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
693 * Parse a version conditional
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
694 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
695
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
696 Condition *Parser::parseVersionCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
697 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
698 Condition *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
699 unsigned level = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
700 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
701
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
702 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
703 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
704 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
705 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
706 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
707 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
708 level = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
709 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
710 /* Allow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
711 * version (unittest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
712 * even though unittest is a keyword
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
713 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
714 else if (token.value == TOKunittest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
715 id = Lexer::idPool(Token::toChars(TOKunittest));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
716 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
717 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
718 error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
719 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
720 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
721
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
722 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
723 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
724 error("(condition) expected following version");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
725 c = new VersionCondition(mod, level, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
726 return c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
727
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
728 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
729
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
730 /***********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
731 * static if (expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
732 * body
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
733 * else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
734 * body
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
735 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
736
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
737 Condition *Parser::parseStaticIfCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
738 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
739 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
740 Array *aif;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
741 Array *aelse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
742 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
743
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
744 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
745 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
746 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
747 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
748 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
749 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
750 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
751 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
752 { error("(expression) expected following static if");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
753 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
754 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
755 condition = new StaticIfCondition(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
756 return condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
757 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
758
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
759
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
760 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
761 * Parse a constructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
762 * this(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
763 * Current token is 'this'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
764 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
765
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
766 CtorDeclaration *Parser::parseCtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
767 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
768 CtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
769 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
770 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
771 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
772
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
773 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
774 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
775 f = new CtorDeclaration(loc, 0, arguments, varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
776 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
777 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
778 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
779
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
780 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
781 * Parse a destructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
782 * ~this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
783 * Current token is '~'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
784 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
785
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
786 DtorDeclaration *Parser::parseDtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
787 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
788 DtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
789 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
790
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
791 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
792 check(TOKthis);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
793 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
794 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
795
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
796 f = new DtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
797 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
798 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
799 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
800
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
801 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
802 * Parse a static constructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
803 * static this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
804 * Current token is 'this'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
805 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
806
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
807 StaticCtorDeclaration *Parser::parseStaticCtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
808 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
809 StaticCtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
810 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
811
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
812 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
813 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
814 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
815
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
816 f = new StaticCtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
817 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
818 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
819 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
820
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
821 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
822 * Parse a static destructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
823 * static ~this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
824 * Current token is '~'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
825 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
826
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
827 StaticDtorDeclaration *Parser::parseStaticDtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
828 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
829 StaticDtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
830 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
831
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
832 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
833 check(TOKthis);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
834 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
835 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
836
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
837 f = new StaticDtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
838 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
839 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
840 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
841
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
842 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
843 * Parse an invariant definition:
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
844 * invariant() { body }
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
845 * Current token is 'invariant'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
846 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
847
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
848 InvariantDeclaration *Parser::parseInvariant()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
849 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
850 InvariantDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
851 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
852
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
853 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
854 if (token.value == TOKlparen) // optional ()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
855 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
856 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
857 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
858 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
859
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
860 f = new InvariantDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
861 f->fbody = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
862 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
863 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
864
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
865 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
866 * Parse a unittest definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
867 * unittest { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
868 * Current token is 'unittest'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
869 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
870
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
871 UnitTestDeclaration *Parser::parseUnitTest()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
872 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
873 UnitTestDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
874 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
875 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
876
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
877 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
878
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
879 body = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
880
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
881 f = new UnitTestDeclaration(loc, this->loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
882 f->fbody = body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
883 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
884 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
885
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
886 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
887 * Parse a new definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
888 * new(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
889 * Current token is 'new'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
890 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
891
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
892 NewDeclaration *Parser::parseNew()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
893 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
894 NewDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
895 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
896 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
897 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
898
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
899 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
900 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
901 f = new NewDeclaration(loc, 0, arguments, varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
902 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
903 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
904 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
905
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
906 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
907 * Parse a delete definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
908 * delete(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
909 * Current token is 'delete'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
910 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
911
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
912 DeleteDeclaration *Parser::parseDelete()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
913 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
914 DeleteDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
915 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
916 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
917 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
918
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
919 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
920 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
921 if (varargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
922 error("... not allowed in delete function parameter list");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
923 f = new DeleteDeclaration(loc, 0, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
924 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
925 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
926 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
927
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
928 /**********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
929 * Parse parameter list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
930 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
931
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
932 Arguments *Parser::parseParameters(int *pvarargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
933 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
934 Arguments *arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
935 int varargs = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
936 int hasdefault = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
937
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
938 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
939 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
940 { Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
941 Identifier *ai = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
942 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
943 Argument *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
944 unsigned storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
945 Expression *ae;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
946
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
947 storageClass = STCin; // parameter is "in" by default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
948 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
949 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
950 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
951 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
952
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
953 case TOKdotdotdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
954 varargs = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
955 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
956 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
957
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
958 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
959 storageClass = STCin;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
960 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
961 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
962
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
963 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
964 storageClass = STCout;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
965 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
966 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
967
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
968 case TOKinout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
969 case TOKref:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
970 storageClass = STCref;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
971 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
972 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
973
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
974 case TOKlazy:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
975 storageClass = STClazy;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
976 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
977 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
978
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
979 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
980 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
981 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
982 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
983 ae = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
984 if (token.value == TOKassign) // = defaultArg
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
985 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
986 ae = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
987 hasdefault = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
988 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
989 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
990 { if (hasdefault)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
991 error("default argument expected for %s",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
992 ai ? ai->toChars() : at->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
993 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
994 if (token.value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
995 { /* This is:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
996 * at ai ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
997 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
998
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
999 if (storageClass & (STCout | STCref))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1000 error("variadic argument cannot be out or ref");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1001 varargs = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1002 a = new Argument(storageClass, at, ai, ae);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1003 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1004 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1005 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1006 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1007 a = new Argument(storageClass, at, ai, ae);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1008 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1009 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1010 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1011 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1012 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1013 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1014 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1015 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1016 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1017 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1018 *pvarargs = varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1019 return arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1020 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1021
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1022
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1023 /*************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1024 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1025
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1026 EnumDeclaration *Parser::parseEnum()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1027 { EnumDeclaration *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1028 Identifier *id;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1029 Type *memtype;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1030 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1031
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1032 //printf("Parser::parseEnum()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1033 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1034 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1035 { id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1036 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1037 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1038 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1039 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1040
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1041 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1042 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1043 nextToken();
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1044 memtype = parseBasicType();
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1045 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1046 else
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1047 memtype = NULL;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1048
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1049 e = new EnumDeclaration(loc, id, memtype);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1050 if (token.value == TOKsemicolon && id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1051 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1052 else if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1053 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1054 //printf("enum definition\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1055 e->members = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1056 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1057 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1058 while (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1059 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1060 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1061 { EnumMember *em;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1062 Expression *value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1063 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1064
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1065 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1066 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1067 value = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1068 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1069 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1070 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1071 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1072 value = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1073 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1074 em = new EnumMember(loc, ident, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1075 e->members->push(em);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1076 if (token.value == TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1077 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1078 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1079 { addComment(em, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1080 comment = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1081 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1082 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1083 addComment(em, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1084 comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1085 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1086 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1087 { error("enum member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1088 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1089 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1090 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1091 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1092 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1093 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1094 error("enum declaration is invalid");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1095
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1096 //printf("-parseEnum() %s\n", e->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1097 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1098 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1099
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1100 /********************************
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1101 * Parse struct, union, interface, class.
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1102 */
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1103
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1104 Dsymbol *Parser::parseAggregate()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1105 { AggregateDeclaration *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1106 int anon = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1107 enum TOK tok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1108 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1109 TemplateParameters *tpl = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1110
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1111 //printf("Parser::parseAggregate()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1112 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1113 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1114 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1115 { id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1116 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1117 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1118 { id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1119 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1120
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1121 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1122 { // Class template declaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1123
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1124 // Gather template parameter list
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1125 tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1126 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1127 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1128
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1129 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1130 switch (tok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1131 { case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1132 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1133 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1134 if (!id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1135 error("anonymous classes not allowed");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1136
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1137 // Collect base class(es)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1138 BaseClasses *baseclasses = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1139 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1140 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1141 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1142 baseclasses = parseBaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1143
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1144 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1145 error("members expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1146 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1147
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1148 if (tok == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1149 a = new ClassDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1150 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1151 a = new InterfaceDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1152 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1153 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1154
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1155 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1156 if (id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1157 a = new StructDeclaration(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1158 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1159 anon = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1160 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1161
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1162 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1163 if (id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1164 a = new UnionDeclaration(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1165 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1166 anon = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1167 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1168
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1169 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1170 assert(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1171 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1172 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1173 if (a && token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1174 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1175 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1176 else if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1177 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1178 //printf("aggregate definition\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1179 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1180 Array *decl = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1181 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1182 error("} expected following member declarations in aggregate");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1183 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1184 if (anon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1185 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1186 /* Anonymous structs/unions are more like attributes.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1187 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1188 return new AnonDeclaration(loc, anon - 1, decl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1189 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1190 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1191 a->members = decl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1192 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1193 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1194 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1195 error("{ } expected following aggregate declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1196 a = new StructDeclaration(loc, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1197 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1198
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1199 if (tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1200 { Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1201 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1202
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1203 // Wrap a template around the aggregate declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1204 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1205 decldefs->push(a);
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1206 tempdecl = new TemplateDeclaration(loc, id, tpl, NULL, decldefs);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1207 return tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1208 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1209
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1210 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1211 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1212
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1213 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1214 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1215
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1216 BaseClasses *Parser::parseBaseClasses()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1217 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1218 enum PROT protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1219 BaseClasses *baseclasses = new BaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1220
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1221 for (; 1; nextToken())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1222 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1223 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1224 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1225 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1226 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1227 case TOKprivate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1228 protection = PROTprivate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1229 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1230 case TOKpackage:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1231 protection = PROTpackage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1232 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1233 case TOKprotected:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1234 protection = PROTprotected;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1235 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1236 case TOKpublic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1237 protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1238 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1239 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1240 error("base classes expected instead of %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1241 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1242 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1243 BaseClass *b = new BaseClass(parseBasicType(), protection);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1244 baseclasses->push(b);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1245 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1246 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1247 protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1248 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1249 return baseclasses;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1250 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1251
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1252 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1253 * Parse constraint.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1254 * Constraint is of the form:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1255 * if ( ConstraintExpression )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1256 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1257
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1258 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1259 Expression *Parser::parseConstraint()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1260 { Expression *e = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1261
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1262 if (token.value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1263 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1264 nextToken(); // skip over 'if'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1265 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1266 e = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1267 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1268 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1269 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1270 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1271 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1272
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1273 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1274 * Parse a TemplateDeclaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1275 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1276
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1277 TemplateDeclaration *Parser::parseTemplateDeclaration()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1278 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1279 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1280 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1281 TemplateParameters *tpl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1282 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1283 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1284
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1285 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1286 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1287 { error("TemplateIdentifier expected following template");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1288 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1289 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1290 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1291 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1292 tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1293 if (!tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1294 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1295
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1296 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1297 { error("members of template declaration expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1298 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1299 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1300 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1301 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1302 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1303 decldefs = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1304 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1305 { error("template member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1306 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1307 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1308 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1309 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1310
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1311 tempdecl = new TemplateDeclaration(loc, id, tpl, NULL, decldefs);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1312 return tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1313
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1314 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1315 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1316 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1317
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1318 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1319 * Parse template parameter list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1320 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1321
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1322 TemplateParameters *Parser::parseTemplateParameterList()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1323 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1324 TemplateParameters *tpl = new TemplateParameters();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1325
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1326 if (token.value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1327 { error("parenthesized TemplateParameterList expected following TemplateIdentifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1328 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1329 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1330 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1331
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1332 // Get array of TemplateParameters
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1333 if (token.value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1334 { int isvariadic = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1335
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1336 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1337 { TemplateParameter *tp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1338 Identifier *tp_ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1339 Type *tp_spectype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1340 Type *tp_valtype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1341 Type *tp_defaulttype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1342 Expression *tp_specvalue = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1343 Expression *tp_defaultvalue = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1344 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1345
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1346 // Get TemplateParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1347
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1348 // First, look ahead to see if it is a TypeParameter or a ValueParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1349 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1350 if (token.value == TOKalias)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1351 { // AliasParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1352 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1353 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1354 { error("Identifier expected for template parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1355 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1356 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1357 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1358 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1359 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1360 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1361 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1362 tp_spectype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1363 tp_spectype = parseDeclarator(tp_spectype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1364 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1365 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1366 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1367 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1368 tp_defaulttype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1369 tp_defaulttype = parseDeclarator(tp_defaulttype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1370 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1371 tp = new TemplateAliasParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1372 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1373 else if (t->value == TOKcolon || t->value == TOKassign ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1374 t->value == TOKcomma || t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1375 { // TypeParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1376 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1377 { error("Identifier expected for template parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1378 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1379 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1380 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1381 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1382 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1383 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1384 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1385 tp_spectype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1386 tp_spectype = parseDeclarator(tp_spectype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1387 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1388 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1389 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1390 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1391 tp_defaulttype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1392 tp_defaulttype = parseDeclarator(tp_defaulttype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1393 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1394 tp = new TemplateTypeParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1395 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1396 else if (token.value == TOKidentifier && t->value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1397 { // ident...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1398 if (isvariadic)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1399 error("variadic template parameter must be last");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1400 isvariadic = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1401 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1402 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1403 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1404 tp = new TemplateTupleParameter(loc, tp_ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1405 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1406 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1407 else if (token.value == TOKthis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1408 { // ThisParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1409 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1410 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1411 { error("identifier expected for template this parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1412 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1413 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1414 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1415 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1416 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1417 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1418 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1419 tp_spectype = parseType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1420 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1421 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1422 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1423 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1424 tp_defaulttype = parseType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1425 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1426 tp = new TemplateThisParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1427 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1428 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1429 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1430 { // ValueParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1431 tp_valtype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1432 tp_valtype = parseDeclarator(tp_valtype, &tp_ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1433 if (!tp_ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1434 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1435 error("identifier expected for template value parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1436 tp_ident = new Identifier("error", TOKidentifier);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1437 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1438 if (token.value == TOKcolon) // : CondExpression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1439 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1440 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1441 tp_specvalue = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1442 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1443 if (token.value == TOKassign) // = CondExpression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1444 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1445 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1446 tp_defaultvalue = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1447 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1448 tp = new TemplateValueParameter(loc, tp_ident, tp_valtype, tp_specvalue, tp_defaultvalue);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1449 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1450 tpl->push(tp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1451 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1452 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1453 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1454 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1455 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1456 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1457 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1458 return tpl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1459 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1460
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1461 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1462 * Parse template mixin.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1463 * mixin Foo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1464 * mixin Foo!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1465 * mixin a.b.c!(args).Foo!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1466 * mixin Foo!(args) identifier;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1467 * mixin typeof(expr).identifier!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1468 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1469
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1470 Dsymbol *Parser::parseMixin()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1471 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1472 TemplateMixin *tm;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1473 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1474 Type *tqual;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1475 Objects *tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1476 Array *idents;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1477
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1478 //printf("parseMixin()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1479 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1480 tqual = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1481 if (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1482 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1483 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1484 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1485 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1486 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1487 if (token.value == TOKtypeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1488 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1489
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1490 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1491 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1492 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1493 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1494 tqual = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1495 check(TOKdot);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1496 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1497 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1498 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1499 error("identifier expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1500 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1501 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1502 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1503 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1504 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1505 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1506
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1507 idents = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1508 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1509 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1510 tiargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1511 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1512 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1513 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1514 tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1515 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1516
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1517 if (token.value != TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1518 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1519
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1520 if (tiargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1521 { TemplateInstance *tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1522 tempinst->tiargs = tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1523 id = (Identifier *)tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1524 tiargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1525 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1526 idents->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1527
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1528 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1529 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1530 { error("identifier expected following '.' instead of '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1531 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1532 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1533 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1534 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1535 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1536 idents->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1537
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1538 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1539 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1540 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1541 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1542 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1543 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1544 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1545
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1546 tm = new TemplateMixin(loc, id, tqual, idents, tiargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1547 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1548 error("';' expected after mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1549 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1550
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1551 return tm;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1552 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1553
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1554 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1555 * Parse template argument list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1556 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1557 * current token is opening '('
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1558 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1559 * current token is one after closing ')'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1560 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1561
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1562 Objects *Parser::parseTemplateArgumentList()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1563 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1564 //printf("Parser::parseTemplateArgumentList()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1565 Objects *tiargs = new Objects();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1566 if (token.value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1567 { error("!(TemplateArgumentList) expected following TemplateIdentifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1568 return tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1569 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1570 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1571
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1572 // Get TemplateArgumentList
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1573 if (token.value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1574 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1575 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1576 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1577 // See if it is an Expression or a Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1578 if (isDeclaration(&token, 0, TOKreserved, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1579 { // Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1580 Type *ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1581
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1582 // Get TemplateArgument
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1583 ta = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1584 ta = parseDeclarator(ta, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1585 tiargs->push(ta);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1586 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1587 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1588 { // Expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1589 Expression *ea;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1590
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1591 ea = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1592 tiargs->push(ea);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1593 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1594 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1595 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1596 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1597 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1598 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1599 check(TOKrparen, "template argument list");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1600 return tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1601 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1602
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1603 Import *Parser::parseImport(Array *decldefs, int isstatic)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1604 { Import *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1605 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1606 Identifier *aliasid = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1607 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1608 Loc loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1609
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1610 //printf("Parser::parseImport()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1611 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1612 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1613 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1614 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1615 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1616 { error("Identifier expected following import");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1617 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1618 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1619
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1620 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1621 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1622 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1623 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1624 if (!aliasid && token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1625 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1626 aliasid = id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1627 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1628 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1629 while (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1630 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1631 if (!a)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1632 a = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1633 a->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1634 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1635 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1636 { error("Identifier expected following package");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1637 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1638 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1639 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1640 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1641 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1642
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1643 s = new Import(loc, a, token.ident, aliasid, isstatic);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1644 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1645
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1646 /* Look for
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1647 * : alias=name, alias=name;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1648 * syntax.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1649 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1650 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1651 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1652 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1653 { Identifier *name;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1654 Identifier *alias;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1655
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1656 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1657 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1658 { error("Identifier expected following :");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1659 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1660 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1661 alias = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1662 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1663 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1664 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1665 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1666 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1667 { error("Identifier expected following %s=", alias->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1668 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1669 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1670 name = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1671 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1672 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1673 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1674 { name = alias;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1675 alias = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1676 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1677 s->addAlias(name, alias);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1678 } while (token.value == TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1679 break; // no comma-separated imports of this form
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1680 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1681
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1682 aliasid = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1683 } while (token.value == TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1684
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1685 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1686 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1687 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1688 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1689 error("';' expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1690 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1691 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1692
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1693 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1694 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1695
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1696 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1697 Type *Parser::parseType(Identifier **pident, TemplateParameters **tpl)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1698 { Type *t;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1699
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1700 /* Take care of the storage class prefixes that
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1701 * serve as type attributes:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1702 * const shared, shared const, const, invariant, shared
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1703 */
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1704 if (token.value == TOKconst && peekNext() == TOKshared && peekNext2() != TOKlparen ||
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1705 token.value == TOKshared && peekNext() == TOKconst && peekNext2() != TOKlparen)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1706 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1707 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1708 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1709 /* shared const type
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1710 */
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1711 t = parseType(pident, tpl);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1712 t = t->makeSharedConst();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1713 return t;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1714 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1715 else if (token.value == TOKconst && peekNext() != TOKlparen)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1716 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1717 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1718 /* const type
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1719 */
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1720 t = parseType(pident, tpl);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1721 t = t->makeConst();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1722 return t;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1723 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1724 else if ((token.value == TOKinvariant || token.value == TOKimmutable) &&
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1725 peekNext() != TOKlparen)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1726 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1727 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1728 /* invariant type
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1729 */
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1730 t = parseType(pident, tpl);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1731 t = t->makeInvariant();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1732 return t;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1733 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1734 else if (token.value == TOKshared && peekNext() != TOKlparen)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1735 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1736 nextToken();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1737 /* shared type
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1738 */
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1739 t = parseType(pident, tpl);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1740 t = t->makeShared();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1741 return t;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1742 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1743 else
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1744 t = parseBasicType();
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1745 t = parseDeclarator(t, pident, tpl);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1746 return t;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1747 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1748 #endif
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1749
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1750 Type *Parser::parseBasicType()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1751 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1752 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1753 TypeQualified *tid;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1754 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1755
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1756 //printf("parseBasicType()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1757 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1758 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1759 CASE_BASIC_TYPES_X(t):
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1760 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1761 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1762
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1763 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1764 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1765 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1766 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1767 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1768 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1769 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1770 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1771 tid = new TypeInstance(loc, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1772 goto Lident2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1773 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1774 Lident:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1775 tid = new TypeIdentifier(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1776 Lident2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1777 while (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1778 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1779 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1780 { error("identifier expected following '.' instead of '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1781 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1782 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1783 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1784 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1785 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1786 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1787 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1788 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1789 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1790 tid->addIdent((Identifier *)tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1791 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1792 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1793 tid->addIdent(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1794 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1795 t = tid;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1796 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1797
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1798 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1799 // Leading . as in .foo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1800 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1801 goto Lident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1802
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1803 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1804 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1805
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1806 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1807 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1808 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1809 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1810 tid = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1811 goto Lident2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1812 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1813
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1814 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1815 error("basic type expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1816 t = Type::tint32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1817 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1818 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1819 return t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1820 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1821
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1822 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1823 * Parse things that follow the initial type t.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1824 * t *
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1825 * t []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1826 * t [type]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1827 * t [expression]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1828 * t [expression .. expression]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1829 * t function
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1830 * t delegate
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1831 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1832
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1833 Type *Parser::parseBasicType2(Type *t)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1834 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1835 Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1836 Type *ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1837
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1838 //printf("parseBasicType2()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1839 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1840 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1841 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1842 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1843 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1844 t = new TypePointer(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1845 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1846 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1847
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1848 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1849 #if LTORARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1850 // Handle []. Make sure things like
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1851 // int[3][1] a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1852 // is (array[1] of array[3] of int)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1853 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1854 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1855 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1856 t = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1857 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1858 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1859 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1860 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1861 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1862
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1863 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1864 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1865 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1866 t = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1867 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1868 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1869 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1870 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1871 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1872 inBrackets++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1873 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1874 if (token.value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1875 { Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1876
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1877 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1878 e2 = parseExpression(); // [ exp .. exp ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1879 t = new TypeSlice(t, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1880 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1881 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1882 t = new TypeSArray(t,e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1883 inBrackets--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1884 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1885 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1886 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1887 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1888 // Handle []. Make sure things like
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1889 // int[3][1] a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1890 // is (array[3] of array[1] of int)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1891 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1892 while (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1893 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1894 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1895 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1896 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1897 ta = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1898 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1899 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1900 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1901 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1902 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1903
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1904 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1905 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1906 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1907 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1908 ta = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1909 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1910 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1911 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1912 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1913 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1914 ta = new TypeSArray(t,e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1915 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1916 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1917 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1918 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1919 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1920 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1921 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1922 t = ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1923 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1924 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1925
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1926 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1927 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1928 { // Handle delegate declaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1929 // t delegate(parameter list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1930 // t function(parameter list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1931 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1932 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1933 enum TOK save = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1934
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1935 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1936 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1937 t = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1938 if (save == TOKdelegate)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1939 t = new TypeDelegate(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1940 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1941 t = new TypePointer(t); // pointer to function
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1942 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1943 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1944
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1945 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1946 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1947 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1948 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1949 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1950 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1951 return ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1952 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1953
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1954 Type *Parser::parseDeclarator(Type *t, Identifier **pident, TemplateParameters **tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1955 { Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1956 Type *ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1957
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1958 //printf("parseDeclarator(tpl = %p)\n", tpl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1959 t = parseBasicType2(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1960
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1961 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1962 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1963
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1964 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1965 if (pident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1966 *pident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1967 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1968 error("unexpected identifer '%s' in declarator", token.ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1969 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1970 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1971 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1972
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1973 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1974 /* Parse things with parentheses around the identifier, like:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1975 * int (*ident[3])[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1976 * although the D style would be:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1977 * int[]*[3] ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1978 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1979 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1980 ts = parseDeclarator(t, pident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1981 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1982 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1983
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1984 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1985 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1986 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1987 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1988
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
1989 // parse DeclaratorSuffixes
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1990 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1991 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1992 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1993 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1994 #if CARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1995 /* Support C style array syntax:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1996 * int ident[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1997 * as opposed to D-style:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1998 * int[] ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1999 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2000 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2001 { // This is the old C-style post [] syntax.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2002 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2003 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2004 { // It's a dynamic array
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2005 ta = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2006 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2007 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2008 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2009 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2010 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2011
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2012 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2013 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2014 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2015 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2016 ta = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2017 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2018 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2019 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2020 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2021 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2022 ta = new TypeSArray(t, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2023 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2024 }
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2025
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2026 /* Insert ta into
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2027 * ts -> ... -> t
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2028 * so that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2029 * ts -> ... -> ta -> t
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2030 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2031 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2032 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2033 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2034 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2035 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2036 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2037 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2038 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2039 { Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2040 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2041
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2042 if (tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2043 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2044 /* Look ahead to see if this is (...)(...),
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2045 * i.e. a function template declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2046 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2047 if (peekPastParen(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2048 { // It's a function template declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2049 //printf("function template declaration\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2050
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2051 // Gather template parameter list
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2052 *tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2053 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2054 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2055
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2056 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2057 Type *ta = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2058 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2059 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2060 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2061 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2062 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2063 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2064 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2065 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2066 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2067
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2068 return ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2069 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2070
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2071 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2072 * Parse Declarations.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2073 * These can be:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2074 * 1. declarations at global/class level
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2075 * 2. declarations at statement level
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2076 * Return array of Declaration *'s.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2077 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2078
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2079 Array *Parser::parseDeclarations()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2080 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2081 enum STC storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2082 enum STC stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2083 Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2084 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2085 Type *tfirst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2086 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2087 Array *a;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2088 enum TOK tok = TOKreserved;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2089 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2090 enum LINK link = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2091
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2092 //printf("parseDeclarations()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2093 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2094 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2095 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2096 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2097 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2098 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2099 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2100
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2101 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2102 tok = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2103 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2104 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2105
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2106 storage_class = STCundefined;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2107 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2108 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2109 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2110 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2111 case TOKconst: stc = STCconst; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2112 case TOKstatic: stc = STCstatic; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2113 case TOKfinal: stc = STCfinal; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2114 case TOKauto: stc = STCauto; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2115 case TOKscope: stc = STCscope; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2116 case TOKoverride: stc = STCoverride; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2117 case TOKabstract: stc = STCabstract; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2118 case TOKsynchronized: stc = STCsynchronized; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2119 case TOKdeprecated: stc = STCdeprecated; goto L1;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2120 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2121 case TOKnothrow: stc = STCnothrow; goto L1;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2122 case TOKpure: stc = STCpure; goto L1;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2123 case TOKref: stc = STCref; goto L1;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2124 case TOKtls: stc = STCtls; goto L1;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2125 case TOKenum: stc = STCmanifest; goto L1;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2126 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2127 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2128 if (storage_class & stc)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2129 error("redundant storage class '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2130 storage_class = (STC) (storage_class | stc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2131 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2132 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2133
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2134 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2135 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2136 { stc = STCextern;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2137 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2138 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2139
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2140 link = parseLinkage();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2141 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2142
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2143 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2144 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2145 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2146 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2147 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2148
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2149 a = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2150
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2151 /* Look for auto initializers:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2152 * storage_class identifier = initializer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2153 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2154 while (storage_class &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2155 token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2156 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2157 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2158 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2159 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2160 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2161 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2162 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2163 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2164 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2165 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2166 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2167 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2168 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2169 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2170 else if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2171 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2172 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2173 if (!(token.value == TOKidentifier && peek(&token)->value == TOKassign))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2174 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2175 error("Identifier expected following comma");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2176 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2177 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2178 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2179 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2180 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2181 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2182 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2183 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2184
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2185 if (token.value == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2186 { AggregateDeclaration *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2187
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2188 s = (AggregateDeclaration *)parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2189 s->storage_class |= storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2190 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2191 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2192 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2193 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2194
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2195 ts = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2196 ts = parseBasicType2(ts);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2197 tfirst = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2198
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2199 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2200 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2201 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2202 TemplateParameters *tpl = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2203
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2204 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2205 t = parseDeclarator(ts, &ident, &tpl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2206 assert(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2207 if (!tfirst)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2208 tfirst = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2209 else if (t != tfirst)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2210 error("multiple declarations must have the same type, not %s and %s",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2211 tfirst->toChars(), t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2212 if (!ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2213 error("no identifier for declarator %s", t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2214
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2215 if (tok == TOKtypedef || tok == TOKalias)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2216 { Declaration *v;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2217 Initializer *init = NULL;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2218
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2219 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2220 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2221 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2222 init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2223 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2224 if (tok == TOKtypedef)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2225 v = new TypedefDeclaration(loc, ident, t, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2226 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2227 { if (init)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2228 error("alias cannot have initializer");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2229 v = new AliasDeclaration(loc, ident, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2230 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2231 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2232 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2233 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2234 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2235 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2236 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2237 ax->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2238 Dsymbol *s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2239 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2240 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2241 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2242 { case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2243 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2244 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2245 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2246
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2247 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2248 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2249 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2250 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2251
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2252 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2253 error("semicolon expected to close %s declaration", Token::toChars(tok));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2254 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2255 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2256 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2257 else if (t->ty == Tfunction)
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2258 { FuncDeclaration *f =
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2259 new FuncDeclaration(loc, 0, ident, storage_class, t);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2260 addComment(f, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2261 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2262 addComment(f, NULL);
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2263 Dsymbol *s;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2264 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2265 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2266 s = f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2267 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2268 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2269 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2270 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2271 ax->push(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2272 s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2273 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2274 if (tpl) // it's a function template
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2275 { Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2276 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2277
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2278 // Wrap a template around the aggregate declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2279 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2280 decldefs->push(s);
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2281 tempdecl = new TemplateDeclaration(loc, s->ident, tpl, NULL, decldefs);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2282 s = tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2283 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2284 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2285 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2286 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2287 else
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2288 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2289 Initializer *init = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2290 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2291 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2292 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2293 init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2294 }
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2295
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2296 VarDeclaration *v = new VarDeclaration(loc, t, ident, init);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2297 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2298 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2299 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2300 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2301 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2302 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2303 ax->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2304 Dsymbol *s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2305 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2306 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2307 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2308 { case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2309 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2310 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2311 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2312
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2313 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2314 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2315 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2316 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2317
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2318 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2319 error("semicolon expected, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2320 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2321 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2322 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2323 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2324 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2325 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2326 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2327
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2328 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2329 * Parse auto declarations of the form:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2330 * storageClass ident = init, ident = init, ... ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2331 * and return the array of them.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2332 * Starts with token on the first ident.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2333 * Ends with scanner past closing ';'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2334 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2335
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2336 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2337 Array *Parser::parseAutoDeclarations(unsigned storageClass, unsigned char *comment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2338 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2339 Array *a = new Array;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2340
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2341 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2342 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2343 Identifier *ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2344 nextToken(); // skip over ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2345 assert(token.value == TOKassign);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2346 nextToken(); // skip over '='
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2347 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2348 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2349 v->storage_class = storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2350 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2351 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2352 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2353 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2354 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2355 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2356 else if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2357 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2358 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2359 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2360 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2361 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2362 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2363 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2364 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2365 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2366 error("Identifier expected following comma");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2367 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2368 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2369 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2370 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2371 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2372 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2373 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2374 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2375
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2376 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2377 * Parse contracts following function declaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2378 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2379
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2380 void Parser::parseContracts(FuncDeclaration *f)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2381 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2382 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2383 enum LINK linksave = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2384
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2385 // The following is irrelevant, as it is overridden by sc->linkage in
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2386 // TypeFunction::semantic
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2387 linkage = LINKd; // nested functions have D linkage
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2388 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2389 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2390 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2391 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2392 if (f->frequire || f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2393 error("missing body { ... } after in or out");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2394 f->fbody = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2395 f->endloc = endloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2396 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2397
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2398 case TOKbody:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2399 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2400 f->fbody = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2401 f->endloc = endloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2402 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2403
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2404 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2405 if (f->frequire || f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2406 error("missing body { ... } after in or out");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2407 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2408 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2409
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2410 #if 0 // Do we want this for function declarations, so we can do:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2411 // int x, y, foo(), z;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2412 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2413 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2414 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2415 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2416
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2417 #if 0 // Dumped feature
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2418 case TOKthrow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2419 if (!f->fthrows)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2420 f->fthrows = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2421 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2422 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2423 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2424 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2425 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2426 f->fthrows->push(tb);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2427 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2428 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2429 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2430 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2431 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2432 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2433 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2434 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2435 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2436
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2437 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2438 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2439 if (f->frequire)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2440 error("redundant 'in' statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2441 f->frequire = parseStatement(PScurly | PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2442 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2443
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2444 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2445 // parse: out (identifier) { statement }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2446 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2447 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2448 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2449 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2450 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2451 error("(identifier) following 'out' expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2452 f->outId = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2453 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2454 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2455 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2456 if (f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2457 error("redundant 'out' statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2458 f->fensure = parseStatement(PScurly | PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2459 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2460
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2461 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2462 error("semicolon expected following function declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2463 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2464 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2465 linkage = linksave;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2466 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2467
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2468 /*****************************************
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2469 * Parse initializer for variable declaration.
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2470 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2471
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2472 Initializer *Parser::parseInitializer()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2473 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2474 StructInitializer *is;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2475 ArrayInitializer *ia;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2476 ExpInitializer *ie;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2477 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2478 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2479 Initializer *value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2480 int comma;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2481 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2482 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2483 int braces;
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2484 int brackets;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2485
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2486 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2487 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2488 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2489 /* Scan ahead to see if it is a struct initializer or
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2490 * a function literal.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2491 * If it contains a ';', it is a function literal.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2492 * Treat { } as a struct initializer.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2493 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2494 braces = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2495 for (t = peek(&token); 1; t = peek(t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2496 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2497 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2498 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2499 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2500 case TOKreturn:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2501 goto Lexpression;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2502
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2503 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2504 braces++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2505 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2506
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2507 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2508 if (--braces == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2509 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2510 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2511
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2512 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2513 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2514
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2515 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2516 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2517 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2518 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2519 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2520
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2521 is = new StructInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2522 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2523 comma = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2524 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2525 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2526 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2527 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2528 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2529 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2530 error("comma expected separating field initializers");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2531 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2532 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2533 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2534 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2535 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2536 nextToken(); // skip over ':'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2537 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2538 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2539 { id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2540 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2541 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2542 is->addInit(id, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2543 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2544 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2545
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2546 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2547 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2548 comma = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2549 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2550
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2551 case TOKrcurly: // allow trailing comma's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2552 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2553 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2554
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2555 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2556 error("found EOF instead of initializer");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2557 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2558
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2559 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2560 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2561 is->addInit(NULL, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2562 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2563 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2564 //error("found '%s' instead of field initializer", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2565 //break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2566 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2567 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2568 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2569 return is;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2570
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2571 case TOKlbracket:
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2572 /* Scan ahead to see if it is an array initializer or
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2573 * an expression.
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2574 * If it ends with a ';', it is an array initializer.
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2575 */
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2576 brackets = 1;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2577 for (t = peek(&token); 1; t = peek(t))
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2578 {
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2579 switch (t->value)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2580 {
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2581 case TOKlbracket:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2582 brackets++;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2583 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2584
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2585 case TOKrbracket:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2586 if (--brackets == 0)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2587 { t = peek(t);
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2588 if (t->value != TOKsemicolon &&
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2589 t->value != TOKcomma &&
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2590 t->value != TOKrcurly)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2591 goto Lexpression;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2592 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2593 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2594 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2595
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2596 case TOKeof:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2597 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2598
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2599 default:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2600 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2601 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2602 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2603 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2604
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2605 ia = new ArrayInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2606 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2607 comma = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2608 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2609 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2610 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2611 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2612 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2613 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2614 { error("comma expected separating array initializers, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2615 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2616 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2617 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2618 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2619 if (!e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2620 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2621 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2622 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2623 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2624 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2625 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2626 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2627 { value = new ExpInitializer(e->loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2628 e = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2629 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2630 ia->addInit(e, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2631 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2632 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2633
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2634 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2635 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2636 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2637 error("comma expected separating array initializers, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2638 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2639 ia->addInit(NULL, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2640 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2641 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2642
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2643 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2644 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2645 comma = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2646 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2647
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2648 case TOKrbracket: // allow trailing comma's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2649 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2650 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2651
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2652 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2653 error("found '%s' instead of array initializer", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2654 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2655 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2656 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2657 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2658 return ia;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2659
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2660 case TOKvoid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2661 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2662 if (t->value == TOKsemicolon || t->value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2663 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2664 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2665 return new VoidInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2666 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2667 goto Lexpression;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2668
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2669 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2670 Lexpression:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2671 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2672 ie = new ExpInitializer(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2673 return ie;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2674 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2675 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2676
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2677 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2678 * Parses default argument initializer expression that is an assign expression,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2679 * with special handling for __FILE__ and __LINE__.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2680 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2681
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2682 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2683 Expression *Parser::parseDefaultInitExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2684 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2685 if (token.value == TOKfile ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2686 token.value == TOKline)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2687 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2688 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2689 if (t->value == TOKcomma || t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2690 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2691
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2692 if (token.value == TOKfile)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2693 e = new FileInitExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2694 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2695 e = new LineInitExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2696 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2697 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2698 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2699 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2700
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2701 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2702 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2703 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2704 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2705
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2706 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2707 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2708 * flags PSxxxx
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2709 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2710
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2711 Statement *Parser::parseStatement(int flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2712 { Statement *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2713 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2714 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2715 Statement *ifbody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2716 Statement *elsebody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2717 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2718
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2719 //printf("parseStatement()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2720
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2721 if (flags & PScurly && token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2722 error("statement expected to be { }, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2723
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2724 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2725 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2726 case TOKidentifier:
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2727 /* A leading identifier can be a declaration, label, or expression.
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2728 * The easiest case to check first is label:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2729 */
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2730 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2731 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2732 { // It's a label
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2733
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2734 Identifier *ident = token.ident;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2735 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2736 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2737 s = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2738 s = new LabelStatement(loc, ident, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2739 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2740 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2741 // fallthrough to TOKdot
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2742 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2743 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2744 if (isDeclaration(&token, 2, TOKreserved, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2745 goto Ldeclaration;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2746 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2747 goto Lexp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2748 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2749
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2750 case TOKassert:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2751 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2752 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2753 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2754 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2755 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2756 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2757 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2758 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2759 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2760 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2761 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2762 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2763 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2764 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2765 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2766 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2767 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2768 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2769 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2770 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2771 case TOKcast:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2772 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2773 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2774 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2775 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2776 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2777 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2778 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2779 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2780 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2781 case TOKtypeid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2782 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2783 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2784 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2785 case TOKtraits:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2786 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2787 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2788 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2789 Lexp:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2790 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2791
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2792 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2793 check(TOKsemicolon, "statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2794 s = new ExpStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2795 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2796 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2797
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2798 case TOKstatic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2799 { // Look ahead to see if it's static assert() or static if()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2800 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2801
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2802 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2803 if (t->value == TOKassert)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2804 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2805 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2806 s = new StaticAssertStatement(parseStaticAssert());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2807 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2808 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2809 if (t->value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2810 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2811 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2812 condition = parseStaticIfCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2813 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2814 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2815 goto Ldeclaration;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2816 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2817
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2818 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2819 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2820 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2821 case TOKconst:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2822 case TOKauto:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2823 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2824 case TOKfinal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2825 case TOKinvariant:
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2826 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2827 case TOKimmutable:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2828 case TOKshared:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2829 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2830 // case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2831 Ldeclaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2832 { Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2833
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2834 a = parseDeclarations();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2835 if (a->dim > 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2836 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2837 Statements *as = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2838 as->reserve(a->dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2839 for (int i = 0; i < a->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2840 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2841 Dsymbol *d = (Dsymbol *)a->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2842 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2843 as->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2844 }
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
2845 s = new CompoundDeclarationStatement(loc, as);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2846 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2847 else if (a->dim == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2848 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2849 Dsymbol *d = (Dsymbol *)a->data[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2850 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2851 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2852 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2853 assert(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2854 if (flags & PSscope)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2855 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2856 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2857 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2858
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2859 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2860 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2861 case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2862 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2863 { Dsymbol *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2864
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2865 d = parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2866 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2867 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2868 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2869
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2870 case TOKenum:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2871 { Dsymbol *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2872
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2873 d = parseEnum();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2874 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2875 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2876 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2877
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2878 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2879 { t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2880 if (t->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2881 { // mixin(string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2882 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2883 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2884 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2885 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2886 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2887 s = new CompileStatement(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2888 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2889 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2890 Dsymbol *d = parseMixin();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2891 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2892 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2893 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2894
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2895 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2896 { Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2897
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2898 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2899 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2900 while (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2901 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2902 statements->push(parseStatement(PSsemi | PScurlyscope));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2903 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2904 endloc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2905 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2906 if (flags & (PSscope | PScurlyscope))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2907 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2908 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2909 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2910 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2911
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2912 case TOKwhile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2913 { Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2914 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2915
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2916 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2917 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2918 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2919 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2920 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2921 s = new WhileStatement(loc, condition, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2922 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2923 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2924
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2925 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2926 if (!(flags & PSsemi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2927 error("use '{ }' for an empty statement, not a ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2928 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2929 s = new ExpStatement(loc, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2930 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2931
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2932 case TOKdo:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2933 { Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2934 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2935
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2936 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2937 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2938 check(TOKwhile);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2939 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2940 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2941 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2942 s = new DoStatement(loc, body, condition);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2943 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2944 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2945
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2946 case TOKfor:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2947 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2948 Statement *init;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2949 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2950 Expression *increment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2951 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2952
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2953 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2954 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2955 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2956 { init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2957 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2958 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2959 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2960 { init = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2961 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2962 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2963 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2964 condition = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2965 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2966 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2967 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2968 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2969 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2970 check(TOKsemicolon, "for condition");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2971 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2972 if (token.value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2973 { increment = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2974 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2975 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2976 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2977 { increment = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2978 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2979 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2980 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2981 s = new ForStatement(loc, init, condition, increment, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2982 if (init)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2983 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2984 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2985 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2986
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2987 case TOKforeach:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2988 case TOKforeach_reverse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2989 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2990 enum TOK op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2991 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2992
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2993 Statement *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2994 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2995 Expression *aggr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2996
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2997 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2998 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2999
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3000 arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3001
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3002 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3003 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3004 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3005 Identifier *ai = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3006 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3007 unsigned storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3008 Argument *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3009
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3010 storageClass = STCin;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3011 if (token.value == TOKinout || token.value == TOKref)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3012 { storageClass = STCref;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3013 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3014 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3015 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3016 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3017 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3018 if (t->value == TOKcomma || t->value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3019 { ai = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3020 at = NULL; // infer argument type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3021 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3022 goto Larg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3023 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3024 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3025 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3026 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3027 if (!ai)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3028 error("no identifier for declarator %s", at->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3029 Larg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3030 a = new Argument(storageClass, at, ai, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3031 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3032 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3033 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3034 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3035 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3036 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3037 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3038 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3039
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3040 aggr = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3041 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3042 body = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3043 s = new ForeachStatement(loc, op, arguments, aggr, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3044 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3045 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3046
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3047 case TOKif:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3048 { Argument *arg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3049 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3050 Statement *ifbody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3051 Statement *elsebody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3052
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3053 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3054 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3055
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3056 if (token.value == TOKauto)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3057 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3058 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3059 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3060 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3061 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3062 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3063 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3064 arg = new Argument(STCin, NULL, token.ident, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3065 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3066 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3067 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3068 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3069 { error("= expected following auto identifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3070 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3071 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3072 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3073 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3074 { error("identifier expected following auto");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3075 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3076 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3077 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3078 else if (isDeclaration(&token, 2, TOKassign, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3079 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3080 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3081 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3082 Identifier *ai;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3083
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3084 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3085 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3086 check(TOKassign);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3087 arg = new Argument(STCin, at, ai, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3088 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3089
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3090 // Check for " ident;"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3091 else if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3092 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3093 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3094 if (t->value == TOKcomma || t->value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3095 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3096 arg = new Argument(STCin, NULL, token.ident, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3097 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3098 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3099 if (1 || !global.params.useDeprecated)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3100 error("if (v; e) is deprecated, use if (auto v = e)");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3101 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3102 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3103
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3104 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3105 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3106 ifbody = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3107 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3108 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3109 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3110 elsebody = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3111 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3112 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3113 elsebody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3114 s = new IfStatement(loc, arg, condition, ifbody, elsebody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3115 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3116 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3117
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3118 case TOKscope:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3119 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3120 goto Ldeclaration; // scope used as storage class
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3121 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3122 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3123 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3124 { error("scope identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3125 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3126 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3127 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3128 { TOK t = TOKon_scope_exit;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3129 Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3130
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3131 if (id == Id::exit)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3132 t = TOKon_scope_exit;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3133 else if (id == Id::failure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3134 t = TOKon_scope_failure;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3135 else if (id == Id::success)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3136 t = TOKon_scope_success;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3137 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3138 error("valid scope identifiers are exit, failure, or success, not %s", id->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3139 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3140 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3141 Statement *st = parseStatement(PScurlyscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3142 s = new OnScopeStatement(loc, t, st);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3143 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3144 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3145
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3146 case TOKdebug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3147 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3148 condition = parseDebugCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3149 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3150
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3151 case TOKversion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3152 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3153 condition = parseVersionCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3154 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3155
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3156 Lcondition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3157 ifbody = parseStatement(0 /*PSsemi*/);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3158 elsebody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3159 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3160 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3161 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3162 elsebody = parseStatement(0 /*PSsemi*/);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3163 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3164 s = new ConditionalStatement(loc, condition, ifbody, elsebody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3165 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3166
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3167 case TOKpragma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3168 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3169 Expressions *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3170 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3171
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3172 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3173 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3174 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3175 { error("pragma(identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3176 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3177 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3178 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3179 nextToken();
846
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 737
diff changeset
3180 if (token.value == TOKcomma && peekNext() != TOKrparen)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3181 args = parseArguments(); // pragma(identifier, args...);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3182 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3183 check(TOKrparen); // pragma(identifier);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3184 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3185 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3186 body = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3187 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3188 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3189 body = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3190 s = new PragmaStatement(loc, ident, args, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3191 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3192 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3193
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3194 case TOKswitch:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3195 { Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3196 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3197
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3198 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3199 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3200 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3201 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3202 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3203 s = new SwitchStatement(loc, condition, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3204 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3205 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3206
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3207 case TOKcase:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3208 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3209 Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3210 Array cases; // array of Expression's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3211
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3212 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3213 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3214 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3215 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3216 cases.push(exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3217 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3218 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3219 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3220 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3221
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3222 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3223 while (token.value != TOKcase &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3224 token.value != TOKdefault &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3225 token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3226 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3227 statements->push(parseStatement(PSsemi | PScurlyscope));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3228 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3229 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3230 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3231
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3232 // Keep cases in order by building the case statements backwards
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3233 for (int i = cases.dim; i; i--)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3234 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3235 exp = (Expression *)cases.data[i - 1];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3236 s = new CaseStatement(loc, exp, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3237 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3238 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3239 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3240
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3241 case TOKdefault:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3242 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3243 Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3244
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3245 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3246 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3247
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3248 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3249 while (token.value != TOKcase &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3250 token.value != TOKdefault &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3251 token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3252 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3253 statements->push(parseStatement(PSsemi | PScurlyscope));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3254 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3255 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3256 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3257 s = new DefaultStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3258 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3259 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3260
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3261 case TOKreturn:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3262 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3263
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3264 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3265 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3266 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3267 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3268 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3269 check(TOKsemicolon, "return statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3270 s = new ReturnStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3271 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3272 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3273
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3274 case TOKbreak:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3275 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3276
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3277 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3278 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3279 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3280 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3281 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3282 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3283 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3284 check(TOKsemicolon, "break statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3285 s = new BreakStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3286 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3287 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3288
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3289 case TOKcontinue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3290 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3291
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3292 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3293 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3294 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3295 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3296 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3297 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3298 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3299 check(TOKsemicolon, "continue statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3300 s = new ContinueStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3301 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3302 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3303
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3304 case TOKgoto:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3305 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3306
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3307 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3308 if (token.value == TOKdefault)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3309 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3310 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3311 s = new GotoDefaultStatement(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3312 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3313 else if (token.value == TOKcase)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3314 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3315 Expression *exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3316
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3317 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3318 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3319 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3320 s = new GotoCaseStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3321 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3322 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3323 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3324 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3325 { error("Identifier expected following goto");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3326 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3327 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3328 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3329 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3330 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3331 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3332 s = new GotoStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3333 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3334 check(TOKsemicolon, "goto statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3335 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3336 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3337
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3338 case TOKsynchronized:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3339 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3340 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3341
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3342 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3343 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3344 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3345 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3346 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3347 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3348 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3349 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3350 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3351 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3352 s = new SynchronizedStatement(loc, exp, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3353 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3354 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3355
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3356 case TOKwith:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3357 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3358 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3359
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3360 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3361 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3362 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3363 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3364 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3365 s = new WithStatement(loc, exp, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3366 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3367 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3368
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3369 case TOKtry:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3370 { Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3371 Array *catches = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3372 Statement *finalbody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3373
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3374 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3375 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3376 while (token.value == TOKcatch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3377 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3378 Statement *handler;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3379 Catch *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3380 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3381 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3382 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3383
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3384 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3385 if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3386 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3387 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3388 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3389 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3390 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3391 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3392 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3393 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3394 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3395 t = parseDeclarator(t, &id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3396 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3397 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3398 handler = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3399 c = new Catch(loc, t, id, handler);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3400 if (!catches)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3401 catches = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3402 catches->push(c);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3403 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3404
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3405 if (token.value == TOKfinally)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3406 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3407 finalbody = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3408 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3409
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3410 s = body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3411 if (!catches && !finalbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3412 error("catch or finally expected following try");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3413 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3414 { if (catches)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3415 s = new TryCatchStatement(loc, body, catches);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3416 if (finalbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3417 s = new TryFinallyStatement(loc, s, finalbody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3418 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3419 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3420 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3421
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3422 case TOKthrow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3423 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3424
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3425 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3426 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3427 check(TOKsemicolon, "throw statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3428 s = new ThrowStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3429 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3430 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3431
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3432 case TOKvolatile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3433 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3434 s = parseStatement(PSsemi | PScurlyscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3435 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3436 if (!global.params.useDeprecated)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3437 error("volatile statements deprecated; used synchronized statements instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3438 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3439 s = new VolatileStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3440 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3441
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3442 case TOKasm:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3443 { Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3444 Identifier *label;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3445 Loc labelloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3446 Token *toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3447 Token **ptoklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3448
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3449 // Parse the asm block into a sequence of AsmStatements,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3450 // each AsmStatement is one instruction.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3451 // Separate out labels.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3452 // Defer parsing of AsmStatements until semantic processing.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3453
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3454 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3455 check(TOKlcurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3456 toklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3457 ptoklist = &toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3458 label = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3459 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3460 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3461 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3462 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3463 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3464 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3465 if (!toklist)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3466 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3467 // Look ahead to see if it is a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3468 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3469 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3470 { // It's a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3471 label = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3472 labelloc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3473 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3474 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3475 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3476 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3477 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3478 goto Ldefault;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3479
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3480 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3481 if (toklist || label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3482 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3483 error("asm statements must end in ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3484 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3485 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3486
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3487 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3488 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3489 if (toklist || label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3490 { // Create AsmStatement from list of tokens we've saved
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3491 s = new AsmStatement(this->loc, toklist);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3492 toklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3493 ptoklist = &toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3494 if (label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3495 { s = new LabelStatement(labelloc, label, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3496 label = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3497 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3498 statements->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3499 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3500 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3501 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3502
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3503 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3504 /* { */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3505 error("matching '}' expected, not end of file");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3506 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3507
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3508 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3509 Ldefault:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3510 *ptoklist = new Token();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3511 memcpy(*ptoklist, &token, sizeof(Token));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3512 ptoklist = &(*ptoklist)->next;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3513 *ptoklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3514
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3515 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3516 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3517 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3518 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3519 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3520 s = new AsmBlockStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3521 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3522 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3523 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3524
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3525 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3526 error("found '%s' instead of statement", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3527 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3528
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3529 Lerror:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3530 while (token.value != TOKrcurly &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3531 token.value != TOKsemicolon &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3532 token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3533 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3534 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3535 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3536 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3537 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3538 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3539
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3540 return s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3541 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3542
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3543 void Parser::check(enum TOK value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3544 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3545 check(loc, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3546 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3547
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3548 void Parser::check(Loc loc, enum TOK value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3549 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3550 if (token.value != value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3551 error(loc, "found '%s' when expecting '%s'", token.toChars(), Token::toChars(value));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3552 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3553 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3554
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3555 void Parser::check(enum TOK value, const char *string)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3556 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3557 if (token.value != value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3558 error("found '%s' when expecting '%s' following '%s'",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3559 token.toChars(), Token::toChars(value), string);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3560 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3561 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3562
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3563 /************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3564 * Determine if the scanner is sitting on the start of a declaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3565 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3566 * needId 0 no identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3567 * 1 identifier optional
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3568 * 2 must have identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3569 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3570
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3571 int Parser::isDeclaration(Token *t, int needId, enum TOK endtok, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3572 {
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3573 //printf("isDeclaration(needId = %d)\n", needId);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3574 int haveId = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3575
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3576 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3577 if ((t->value == TOKconst || t->value == TOKinvariant) &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3578 peek(t)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3579 { /* const type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3580 * invariant type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3581 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3582 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3583 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3584 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3585
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3586 if (!isBasicType(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3587 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3588 if (!isDeclarator(&t, &haveId, endtok))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3589 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3590 if ( needId == 1 ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3591 (needId == 0 && !haveId) ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3592 (needId == 2 && haveId))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3593 { if (pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3594 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3595 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3596 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3597 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3598 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3599 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3600
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3601 int Parser::isBasicType(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3602 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3603 // This code parallels parseBasicType()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3604 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3605 Token *t2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3606 int parens;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3607
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3608 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3609 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3610 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3611 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3612 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3613
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3614 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3615 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3616 if (t->value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3617 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3618 goto L4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3619 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3620 goto L3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3621 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3622 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3623 L2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3624 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3625 L3:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3626 if (t->value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3627 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3628 Ldot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3629 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3630 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3631 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3632 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3633 if (t->value != TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3634 goto L3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3635 L4:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3636 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3637 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3638 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3639 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3640 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3641 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3642 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3643 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3644 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3645 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3646
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3647 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3648 goto Ldot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3649
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3650 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3651 /* typeof(exp).identifier...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3652 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3653 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3654 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3655 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3656 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3657 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3658 goto L2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3659
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3660 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3661 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3662 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3663 *pt = t;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3664 //printf("is\n");
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3665 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3666
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3667 Lfalse:
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3668 //printf("is not\n");
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3669 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3670 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3671
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3672 int Parser::isDeclarator(Token **pt, int *haveId, enum TOK endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3673 { // This code parallels parseDeclarator()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3674 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3675 int parens;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3676
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3677 //printf("Parser::isDeclarator()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3678 //t->print();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3679 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3680 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3681
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3682 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3683 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3684 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3685 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3686 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3687 case TOKmul:
717
a26b0c5d5942 Merged DMD 1.036.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 710
diff changeset
3688 //case TOKand:
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3689 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3690 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3691
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3692 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3693 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3694 if (t->value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3695 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3696 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3697 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3698 else if (isDeclaration(t, 0, TOKrbracket, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3699 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3700 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3701 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3702 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3703 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3704 // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3705 // [ expression .. expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3706 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3707 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3708 if (t->value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3709 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3710 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3711 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3712 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3713 if (t->value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3714 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3715 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3716 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3717 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3718
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3719 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3720 if (*haveId)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3721 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3722 *haveId = TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3723 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3724 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3725
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3726 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3727 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3728
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3729 if (t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3730 return FALSE; // () is not a declarator
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3731
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3732 /* Regard ( identifier ) as not a declarator
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3733 * BUG: what about ( *identifier ) in
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3734 * f(*p)(x);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3735 * where f is a class instance with overloaded () ?
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3736 * Should we just disallow C-style function pointer declarations?
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3737 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3738 if (t->value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3739 { Token *t2 = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3740 if (t2->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3741 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3742 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3743
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3744
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3745 if (!isDeclarator(&t, haveId, TOKrparen))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3746 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3747 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3748 parens = TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3749 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3750
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3751 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3752 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3753 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3754 if (!isParameters(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3755 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3756 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3757 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3758 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3759 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3760
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3761 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3762 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3763 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3764 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3765 #if CARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3766 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3767 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3768 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3769 if (t->value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3770 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3771 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3772 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3773 else if (isDeclaration(t, 0, TOKrbracket, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3774 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3775 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3776 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3777 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3778 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3779 // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3780 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3781 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3782 if (t->value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3783 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3784 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3785 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3786 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3787 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3788
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3789 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3790 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3791 if (!isParameters(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3792 return FALSE;
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3793 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3794 while (1)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3795 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3796 switch (t->value)
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3797 {
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3798 case TOKconst:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3799 case TOKinvariant:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3800 case TOKimmutable:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3801 case TOKshared:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3802 case TOKpure:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3803 case TOKnothrow:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3804 t = peek(t);
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3805 continue;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3806 default:
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3807 break;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3808 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3809 break;
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3810 }
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
3811 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3812 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3813
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3814 // Valid tokens that follow a declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3815 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3816 case TOKrbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3817 case TOKassign:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3818 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3819 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3820 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3821 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3822 // The !parens is to disallow unnecessary parentheses
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3823 if (!parens && (endtok == TOKreserved || endtok == t->value))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3824 { *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3825 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3826 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3827 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3828
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3829 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3830 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3831 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3832 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3833 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3834
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3835
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3836 int Parser::isParameters(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3837 { // This code parallels parseParameters()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3838 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3839 int tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3840
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3841 //printf("isParameters()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3842 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3843 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3844
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3845 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3846 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3847 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3848 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3849 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3850 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3851 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3852
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3853 case TOKdotdotdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3854 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3855 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3856
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3857 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3858 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3859 case TOKinout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3860 case TOKref:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3861 case TOKlazy:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3862 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3863 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3864 if (!isBasicType(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3865 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3866 tmp = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3867 if (t->value != TOKdotdotdot &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3868 !isDeclarator(&t, &tmp, TOKreserved))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3869 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3870 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3871 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3872 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3873 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3874 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3875 if (t->value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3876 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3877 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3878 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3879 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3880 if (t->value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3881 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3882 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3883 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3884 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3885 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3886 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3887 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3888 if (t->value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3889 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3890 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3891 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3892 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3893 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3894
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3895 int Parser::isExpression(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3896 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3897 // This is supposed to determine if something is an expression.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3898 // What it actually does is scan until a closing right bracket
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3899 // is found.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3900
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3901 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3902 int brnest = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3903 int panest = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3904
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3905 for (;; t = peek(t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3906 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3907 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3908 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3909 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3910 brnest++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3911 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3912
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3913 case TOKrbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3914 if (--brnest >= 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3915 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3916 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3917
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3918 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3919 panest++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3920 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3921
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3922 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3923 if (brnest || panest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3924 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3925 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3926
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3927 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3928 if (--panest >= 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3929 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3930 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3931
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3932 case TOKslice:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3933 if (brnest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3934 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3935 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3936
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3937 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3938 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3939
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3940 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3941 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3942 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3943 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3944 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3945
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3946 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3947 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3948 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3949
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3950 /**********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3951 * Skip over
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3952 * instance foo.bar(parameters...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3953 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3954 * if (pt), *pt is set to the token following the closing )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3955 * Returns:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3956 * 1 it's valid instance syntax
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3957 * 0 invalid instance syntax
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3958 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3959
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3960 int Parser::isTemplateInstance(Token *t, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3961 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3962 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3963 if (t->value != TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3964 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3965 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3966 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3967 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3968 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3969 while (t->value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3970 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3971 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3972 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3973 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3974 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3975 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3976 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3977 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3978
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3979 // Skip over the template arguments
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3980 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3981 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3982 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3983 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3984 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3985 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3986 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3987 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3988 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3989 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3990 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3991 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3992 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3993 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3994 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3995 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3996 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3997 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3998 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3999 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4000 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4001 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4002 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4003
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4004 if (t->value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4005 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4006 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4007 if (t->value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4008 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4009 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4010 if (pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4011 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4012 return 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4013
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4014 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4015 return 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4016 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4017
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4018 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4019 * Skip parens, brackets.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4020 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4021 * t is on opening (
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4022 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4023 * *pt is set to closing token, which is ')' on success
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4024 * Returns:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4025 * !=0 successful
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4026 * 0 some parsing error
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4027 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4028
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4029 int Parser::skipParens(Token *t, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4030 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4031 int parens = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4032
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4033 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4034 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4035 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4036 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4037 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4038 parens++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4039 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4040
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4041 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4042 parens--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4043 if (parens < 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4044 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4045 if (parens == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4046 goto Ldone;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4047 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4048
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4049 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4050 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4051 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4052
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4053 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4054 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4055 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4056 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4057 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4058
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4059 Ldone:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4060 if (*pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4061 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4062 return 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4063
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4064 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4065 return 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4066 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4067
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4068 /********************************* Expression Parser ***************************/
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4069
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4070 Expression *Parser::parsePrimaryExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4071 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4072 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4073 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4074 enum TOK save;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4075 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4076
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4077 //printf("parsePrimaryExp(): loc = %d\n", loc.linnum);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4078 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4079 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4080 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4081 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4082 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4083 if (token.value == TOKnot && peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4084 { // identifier!(template-argument-list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4085 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4086
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4087 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4088 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4089 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4090 e = new ScopeExp(loc, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4091 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4092 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4093 e = new IdentifierExp(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4094 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4095
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4096 case TOKdollar:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4097 if (!inBrackets)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4098 error("'$' is valid only inside [] of index or slice");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4099 e = new DollarExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4100 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4101 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4102
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4103 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4104 // Signal global scope '.' operator with "" identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4105 e = new IdentifierExp(loc, Id::empty);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4106 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4107
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4108 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4109 e = new ThisExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4110 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4111 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4112
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4113 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4114 e = new SuperExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4115 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4116 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4117
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4118 case TOKint32v:
1165
226c07c71967 This should fix integers below 64 bit on big-endian systems.
Frits van Bommel <fvbommel wxs.nl>
parents: 1103
diff changeset
4119 e = new IntegerExp(loc, (d_int32)token.int64value, Type::tint32);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4120 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4121 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4122
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4123 case TOKuns32v:
1165
226c07c71967 This should fix integers below 64 bit on big-endian systems.
Frits van Bommel <fvbommel wxs.nl>
parents: 1103
diff changeset
4124 e = new IntegerExp(loc, (d_uns32)token.uns64value, Type::tuns32);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4125 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4126 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4127
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4128 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4129 e = new IntegerExp(loc, token.int64value, Type::tint64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4130 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4131 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4132
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4133 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4134 e = new IntegerExp(loc, token.uns64value, Type::tuns64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4135 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4136 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4137
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4138 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4139 e = new RealExp(loc, token.float80value, Type::tfloat32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4140 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4141 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4142
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4143 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4144 e = new RealExp(loc, token.float80value, Type::tfloat64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4145 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4146 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4147
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4148 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4149 e = new RealExp(loc, token.float80value, Type::tfloat80);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4150 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4151 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4152
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4153 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4154 e = new RealExp(loc, token.float80value, Type::timaginary32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4155 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4156 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4157
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4158 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4159 e = new RealExp(loc, token.float80value, Type::timaginary64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4160 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4161 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4162
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4163 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4164 e = new RealExp(loc, token.float80value, Type::timaginary80);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4165 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4166 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4167
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4168 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4169 e = new NullExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4170 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4171 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4172
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4173 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4174 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4175 { char *s = loc.filename ? loc.filename : mod->ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4176 e = new StringExp(loc, s, strlen(s), 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4177 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4178 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4179 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4180
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4181 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4182 e = new IntegerExp(loc, loc.linnum, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4183 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4184 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4185 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4186
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4187 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4188 e = new IntegerExp(loc, 1, Type::tbool);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4189 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4190 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4191
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4192 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4193 e = new IntegerExp(loc, 0, Type::tbool);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4194 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4195 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4196
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4197 case TOKcharv:
1165
226c07c71967 This should fix integers below 64 bit on big-endian systems.
Frits van Bommel <fvbommel wxs.nl>
parents: 1103
diff changeset
4198 e = new IntegerExp(loc, (d_uns8)token.uns64value, Type::tchar);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4199 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4200 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4201
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4202 case TOKwcharv:
1165
226c07c71967 This should fix integers below 64 bit on big-endian systems.
Frits van Bommel <fvbommel wxs.nl>
parents: 1103
diff changeset
4203 e = new IntegerExp(loc, (d_uns16)token.uns64value, Type::twchar);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4204 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4205 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4206
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4207 case TOKdcharv:
1165
226c07c71967 This should fix integers below 64 bit on big-endian systems.
Frits van Bommel <fvbommel wxs.nl>
parents: 1103
diff changeset
4208 e = new IntegerExp(loc, (d_uns32)token.uns64value, Type::tdchar);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4209 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4210 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4211
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4212 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4213 { unsigned char *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4214 unsigned len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4215 unsigned char postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4216
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4217 // cat adjacent strings
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4218 s = token.ustring;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4219 len = token.len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4220 postfix = token.postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4221 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4222 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4223 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4224 if (token.value == TOKstring)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4225 { unsigned len1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4226 unsigned len2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4227 unsigned char *s2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4228
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4229 if (token.postfix)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4230 { if (token.postfix != postfix)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4231 error("mismatched string literal postfixes '%c' and '%c'", postfix, token.postfix);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4232 postfix = token.postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4233 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4234
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4235 len1 = len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4236 len2 = token.len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4237 len = len1 + len2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4238 s2 = (unsigned char *)mem.malloc((len + 1) * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4239 memcpy(s2, s, len1 * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4240 memcpy(s2 + len1, token.ustring, (len2 + 1) * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4241 s = s2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4242 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4243 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4244 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4245 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4246 e = new StringExp(loc, s, len, postfix);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4247 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4248 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4249
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4250 CASE_BASIC_TYPES_X(t):
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4251 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4252 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4253 check(TOKdot, t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4254 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4255 { error("found '%s' when expecting identifier following '%s.'", token.toChars(), t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4256 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4257 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4258 e = new TypeDotIdExp(loc, t, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4259 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4260 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4261
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4262 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4263 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4264
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4265 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4266 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4267 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4268 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4269 t = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4270 e = new TypeExp(loc, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4271 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4272 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4273
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4274 case TOKtypeid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4275 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4276
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4277 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4278 check(TOKlparen, "typeid");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4279 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4280 t = parseDeclarator(t,NULL); // ( type )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4281 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4282 e = new TypeidExp(loc, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4283 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4284 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4285
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4286 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4287 case TOKtraits:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4288 { /* __traits(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4289 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4290 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4291 Objects *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4292
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4293 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4294 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4295 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4296 { error("__traits(identifier, args...) expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4297 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4298 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4299 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4300 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4301 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4302 args = parseTemplateArgumentList2(); // __traits(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4303 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4304 check(TOKrparen); // __traits(identifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4305
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4306 e = new TraitsExp(loc, ident, args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4307 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4308 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4309 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4310
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4311 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4312 { Type *targ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4313 Identifier *ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4314 Type *tspec = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4315 enum TOK tok = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4316 enum TOK tok2 = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4317 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4318
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4319 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4320 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4321 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4322 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4323 targ = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4324 targ = parseDeclarator(targ, &ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4325 if (token.value == TOKcolon || token.value == TOKequal)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4326 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4327 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4328 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4329 if (tok == TOKequal &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4330 (token.value == TOKtypedef ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4331 token.value == TOKstruct ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4332 token.value == TOKunion ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4333 token.value == TOKclass ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4334 token.value == TOKsuper ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4335 token.value == TOKenum ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4336 token.value == TOKinterface ||
1195
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
4337 #if DMDV2
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
4338 token.value == TOKconst && peek(&token)->value == TOKrparen ||
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
4339 token.value == TOKinvariant && peek(&token)->value == TOKrparen ||
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
4340 token.value == TOKimmutable && peek(&token)->value == TOKrparen ||
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
4341 token.value == TOKshared && peek(&token)->value == TOKrparen ||
e961851fb8be Merged DMD 1.042.
Tomas Lindquist Olsen <tomas.l.olsen gmail.com>
parents: 1165
diff changeset
4342 #endif
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4343 token.value == TOKfunction ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4344 token.value == TOKdelegate ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4345 token.value == TOKreturn))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4346 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4347 tok2 = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4348 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4349 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4350 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4351 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4352 tspec = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4353 tspec = parseDeclarator(tspec, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4354 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4355 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4356 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4357 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4358 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4359 { error("(type identifier : specialization) expected following is");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4360 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4361 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4362 e = new IsExp(loc, targ, ident, tok, tspec, tok2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4363 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4364 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4365
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4366 case TOKassert:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4367 { Expression *msg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4368
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4369 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4370 check(TOKlparen, "assert");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4371 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4372 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4373 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4374 msg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4375 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4376 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4377 e = new AssertExp(loc, e, msg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4378 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4379 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4380
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4381 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4382 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4383 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4384 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4385 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4386 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4387 e = new CompileExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4388 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4389 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4390
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4391 case TOKimport:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4392 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4393 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4394 check(TOKlparen, "import");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4395 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4396 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4397 e = new FileExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4398 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4399 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4400
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4401 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4402 if (peekPastParen(&token)->value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4403 { // (arguments) { statements... }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4404 save = TOKdelegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4405 goto case_delegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4406 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4407 // ( expression )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4408 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4409 e = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4410 check(loc, TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4411 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4412
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4413 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4414 { /* Parse array literals and associative array literals:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4415 * [ value, value, value ... ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4416 * [ key:value, key:value, key:value ... ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4417 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4418 Expressions *values = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4419 Expressions *keys = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4420
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4421 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4422 if (token.value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4423 {
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4424 while (token.value != TOKeof)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4425 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4426 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4427 if (token.value == TOKcolon && (keys || values->dim == 0))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4428 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4429 if (!keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4430 keys = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4431 keys->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4432 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4433 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4434 else if (keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4435 { error("'key:value' expected for associative array literal");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4436 delete keys;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4437 keys = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4438 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4439 values->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4440 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4441 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4442 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4443 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4444 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4445 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4446
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4447 if (keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4448 e = new AssocArrayLiteralExp(loc, keys, values);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4449 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4450 e = new ArrayLiteralExp(loc, values);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4451 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4452 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4453
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4454 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4455 // { statements... }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4456 save = TOKdelegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4457 goto case_delegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4458
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4459 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4460 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4461 save = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4462 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4463 case_delegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4464 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4465 /* function type(parameters) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4466 * delegate type(parameters) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4467 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4468 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4469 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4470 FuncLiteralDeclaration *fd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4471 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4472
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4473 if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4474 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4475 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4476 varargs = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4477 arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4478 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4479 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4480 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4481 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4482 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4483 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4484 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4485 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4486 t = parseBasicType2(t); // function return type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4487 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4488 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4489 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4490 t = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4491 fd = new FuncLiteralDeclaration(loc, 0, t, save, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4492 parseContracts(fd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4493 e = new FuncExp(loc, fd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4494 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4495 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4496
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4497 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4498 error("expression expected, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4499 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4500 // Anything for e, as long as it's not NULL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4501 e = new IntegerExp(loc, 0, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4502 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4503 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4504 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4505 return parsePostExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4506 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4507
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4508 Expression *Parser::parsePostExp(Expression *e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4509 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4510 Loc loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4511
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4512 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4513 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4514 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4515 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4516 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4517 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4518 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4519 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4520 { Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4521
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4522 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4523 if (token.value == TOKnot && peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4524 { // identifier!(template-argument-list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4525 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4526
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4527 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4528 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4529 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4530 e = new DotTemplateInstanceExp(loc, e, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4531 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4532 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4533 e = new DotIdExp(loc, e, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4534 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4535 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4536 else if (token.value == TOKnew)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4537 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4538 e = parseNewExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4539 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4540 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4541 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4542 error("identifier expected following '.', not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4543 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4544
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4545 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4546 e = new PostExp(TOKplusplus, loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4547 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4548
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4549 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4550 e = new PostExp(TOKminusminus, loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4551 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4552
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4553 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4554 e = new CallExp(loc, e, parseArguments());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4555 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4556
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4557 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4558 { // array dereferences:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4559 // array[index]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4560 // array[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4561 // array[lwr .. upr]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4562 Expression *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4563 Expression *upr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4564
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4565 inBrackets++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4566 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4567 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4568 { // array[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4569 e = new SliceExp(loc, e, NULL, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4570 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4571 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4572 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4573 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4574 index = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4575 if (token.value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4576 { // array[lwr .. upr]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4577 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4578 upr = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4579 e = new SliceExp(loc, e, index, upr);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4580 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4581 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4582 { // array[index, i2, i3, i4, ...]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4583 Expressions *arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4584 arguments->push(index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4585 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4586 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4587 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4588 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4589 { Expression *arg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4590
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4591 arg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4592 arguments->push(arg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4593 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4594 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4595 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4596 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4597 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4598 e = new ArrayExp(loc, e, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4599 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4600 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4601 inBrackets--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4602 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4603 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4604 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4605
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4606 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4607 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4608 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4609 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4610 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4611 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4612
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4613 Expression *Parser::parseUnaryExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4614 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4615 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4616
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4617 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4618 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4619 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4620 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4621 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4622 e = new AddrExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4623 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4624
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4625 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4626 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4627 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4628 e = new AddAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4629 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4630
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4631 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4632 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4633 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4634 e = new MinAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4635 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4636
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4637 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4638 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4639 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4640 e = new PtrExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4641 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4642
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4643 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4644 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4645 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4646 e = new NegExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4647 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4648
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4649 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4650 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4651 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4652 e = new UAddExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4653 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4654
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4655 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4656 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4657 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4658 e = new NotExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4659 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4660
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4661 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4662 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4663 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4664 e = new ComExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4665 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4666
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4667 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4668 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4669 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4670 e = new DeleteExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4671 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4672
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4673 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4674 e = parseNewExp(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4675 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4676
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4677 case TOKcast: // cast(type) expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4678 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4679
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4680 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4681 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4682 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4683 t = parseDeclarator(t,NULL); // ( type )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4684 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4685
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4686 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4687 e = new CastExp(loc, e, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4688 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4689 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4690
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4691 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4692 { Token *tk;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4693
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4694 tk = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4695 #if CCASTSYNTAX
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4696 // If cast
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4697 if (isDeclaration(tk, 0, TOKrparen, &tk))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4698 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4699 tk = peek(tk); // skip over right parenthesis
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4700 switch (tk->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4701 {
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4702 case TOKnot:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4703 tk = peek(tk);
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4704 if (tk->value == TOKis) // !is
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4705 break;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4706 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4707 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4708 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4709 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4710 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4711 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4712 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4713 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4714 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4715 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4716 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4717 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4718 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4719 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4720 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4721 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4722 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4723 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4724 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4725 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4726 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4727 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4728 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4729 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4730 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4731 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4732 #if 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4733 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4734 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4735 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4736 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4737 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4738 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4739 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4740 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4741 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4742 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4743 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4744 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4745 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4746 CASE_BASIC_TYPES: // (type)int.size
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4747 { // (type) una_exp
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4748 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4749
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4750 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4751 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4752 t = parseDeclarator(t,NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4753 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4754
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4755 // if .identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4756 if (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4757 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4758 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4759 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4760 { error("Identifier expected following (type).");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4761 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4762 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4763 e = new TypeDotIdExp(loc, t, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4764 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4765 e = parsePostExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4766 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4767 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4768 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4769 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4770 e = new CastExp(loc, e, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4771 error("C style cast illegal, use %s", e->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4772 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4773 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4774 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4775 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4776 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4777 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4778 e = parsePrimaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4779 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4780 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4781 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4782 e = parsePrimaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4783 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4784 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4785 assert(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4786 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4787 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4788
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4789 Expression *Parser::parseMulExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4790 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4791 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4792 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4793
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4794 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4795 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4796 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4797 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4798 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4799 case TOKmul: nextToken(); e2 = parseUnaryExp(); e = new MulExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4800 case TOKdiv: nextToken(); e2 = parseUnaryExp(); e = new DivExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4801 case TOKmod: nextToken(); e2 = parseUnaryExp(); e = new ModExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4802
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4803 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4804 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4805 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4806 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4807 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4808 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4809 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4810
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4811 Expression *Parser::parseAddExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4812 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4813 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4814 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4815
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4816 e = parseMulExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4817 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4818 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4819 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4820 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4821 case TOKadd: nextToken(); e2 = parseMulExp(); e = new AddExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4822 case TOKmin: nextToken(); e2 = parseMulExp(); e = new MinExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4823 case TOKtilde: nextToken(); e2 = parseMulExp(); e = new CatExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4824
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4825 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4826 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4827 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4828 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4829 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4830 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4831 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4832
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4833 Expression *Parser::parseShiftExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4834 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4835 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4836 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4837
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4838 e = parseAddExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4839 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4840 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4841 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4842 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4843 case TOKshl: nextToken(); e2 = parseAddExp(); e = new ShlExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4844 case TOKshr: nextToken(); e2 = parseAddExp(); e = new ShrExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4845 case TOKushr: nextToken(); e2 = parseAddExp(); e = new UshrExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4846
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4847 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4848 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4849 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4850 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4851 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4852 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4853 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4854
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4855 Expression *Parser::parseRelExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4856 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4857 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4858 enum TOK op;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4859 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4860
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4861 e = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4862 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4863 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4864 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4865 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4866 case TOKlt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4867 case TOKle:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4868 case TOKgt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4869 case TOKge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4870 case TOKunord:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4871 case TOKlg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4872 case TOKleg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4873 case TOKule:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4874 case TOKul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4875 case TOKuge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4876 case TOKug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4877 case TOKue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4878 op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4879 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4880 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4881 e = new CmpExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4882 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4883
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4884 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4885 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4886 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4887 e = new InExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4888 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4889
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4890 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4891 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4892 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4893 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4894 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4895 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4896 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4897
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4898 Expression *Parser::parseEqualExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4899 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4900 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4901 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4902 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4903
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4904 e = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4905 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4906 { enum TOK value = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4907
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4908 switch (value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4909 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4910 case TOKequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4911 case TOKnotequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4912 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4913 e2 = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4914 e = new EqualExp(value, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4915 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4916
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4917 case TOKidentity:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4918 error("'===' is no longer legal, use 'is' instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4919 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4920
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4921 case TOKnotidentity:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4922 error("'!==' is no longer legal, use '!is' instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4923 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4924
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4925 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4926 value = TOKidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4927 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4928
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4929 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4930 // Attempt to identify '!is'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4931 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4932 if (t->value != TOKis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4933 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4934 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4935 value = TOKnotidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4936 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4937
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4938 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4939 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4940 e2 = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4941 e = new IdentityExp(value, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4942 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4943
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4944 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4945 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4946 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4947 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4948 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4949 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4950 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4951
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4952 Expression *Parser::parseCmpExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4953 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4954 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4955 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4956 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4957
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4958 e = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4959 enum TOK op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4960
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4961 switch (op)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4962 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4963 case TOKequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4964 case TOKnotequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4965 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4966 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4967 e = new EqualExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4968 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4969
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4970 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4971 op = TOKidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4972 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4973
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4974 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4975 // Attempt to identify '!is'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4976 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4977 if (t->value != TOKis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4978 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4979 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4980 op = TOKnotidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4981 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4982
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4983 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4984 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4985 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4986 e = new IdentityExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4987 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4988
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4989 case TOKlt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4990 case TOKle:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4991 case TOKgt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4992 case TOKge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4993 case TOKunord:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4994 case TOKlg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4995 case TOKleg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4996 case TOKule:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4997 case TOKul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4998 case TOKuge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4999 case TOKug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5000 case TOKue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5001 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5002 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5003 e = new CmpExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5004 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5005
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5006 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5007 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5008 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5009 e = new InExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5010 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5011
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5012 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5013 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5014 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5015 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5016 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5017
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5018 Expression *Parser::parseAndExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5019 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5020 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5021 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5022
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5023 if (global.params.Dversion == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5024 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5025 e = parseEqualExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5026 while (token.value == TOKand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5027 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5028 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5029 e2 = parseEqualExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5030 e = new AndExp(loc,e,e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5031 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5032 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5033 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5034 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5035 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5036 e = parseCmpExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5037 while (token.value == TOKand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5038 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5039 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5040 e2 = parseCmpExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5041 e = new AndExp(loc,e,e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5042 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5043 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5044 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5045 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5046 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5047
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5048 Expression *Parser::parseXorExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5049 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5050 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5051 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5052
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5053 e = parseAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5054 while (token.value == TOKxor)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5055 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5056 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5057 e2 = parseAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5058 e = new XorExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5059 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5060 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5061 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5062
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5063 Expression *Parser::parseOrExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5064 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5065 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5066 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5067
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5068 e = parseXorExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5069 while (token.value == TOKor)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5070 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5071 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5072 e2 = parseXorExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5073 e = new OrExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5074 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5075 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5076 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5077
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5078 Expression *Parser::parseAndAndExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5079 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5080 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5081 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5082
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5083 e = parseOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5084 while (token.value == TOKandand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5085 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5086 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5087 e2 = parseOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5088 e = new AndAndExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5089 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5090 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5091 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5092
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5093 Expression *Parser::parseOrOrExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5094 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5095 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5096 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5097
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5098 e = parseAndAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5099 while (token.value == TOKoror)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5100 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5101 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5102 e2 = parseAndAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5103 e = new OrOrExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5104 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5105 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5106 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5107
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5108 Expression *Parser::parseCondExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5109 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5110 Expression *e1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5111 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5112 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5113
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5114 e = parseOrOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5115 if (token.value == TOKquestion)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5116 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5117 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5118 e1 = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5119 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5120 e2 = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5121 e = new CondExp(loc, e, e1, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5122 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5123 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5124 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5125
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5126 Expression *Parser::parseAssignExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5127 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5128 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5129 Loc loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5130
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5131 e = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5132 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5133 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5134 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5135 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5136 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5137 #define X(tok,ector) \
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5138 case tok: nextToken(); e2 = parseAssignExp(); e = new ector(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5139
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5140 X(TOKassign, AssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5141 X(TOKaddass, AddAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5142 X(TOKminass, MinAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5143 X(TOKmulass, MulAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5144 X(TOKdivass, DivAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5145 X(TOKmodass, ModAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5146 X(TOKandass, AndAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5147 X(TOKorass, OrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5148 X(TOKxorass, XorAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5149 X(TOKshlass, ShlAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5150 X(TOKshrass, ShrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5151 X(TOKushrass, UshrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5152 X(TOKcatass, CatAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5153
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5154 #undef X
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5155 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5156 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5157 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5158 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5159 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5160 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5161 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5162
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5163 Expression *Parser::parseExpression()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5164 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5165 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5166 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5167
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5168 //printf("Parser::parseExpression() loc = %d\n", loc.linnum);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5169 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5170 while (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5171 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5172 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5173 e2 = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5174 e = new CommaExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5175 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5176 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5177 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5178 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5179
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5180
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5181 /*************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5182 * Collect argument list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5183 * Assume current token is '(' or '['.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5184 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5185
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5186 Expressions *Parser::parseArguments()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5187 { // function call
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5188 Expressions *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5189 Expression *arg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5190 enum TOK endtok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5191
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5192 arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5193 if (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5194 endtok = TOKrbracket;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5195 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5196 endtok = TOKrparen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5197
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5198 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5199 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5200 if (token.value != endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5201 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5202 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5203 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5204 arg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5205 arguments->push(arg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5206 if (token.value == endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5207 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5208 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5209 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5210 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5211 check(endtok);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5212 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5213 return arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5214 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5215
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5216 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5217 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5218
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5219 Expression *Parser::parseNewExp(Expression *thisexp)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5220 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5221 Expressions *newargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5222 Expressions *arguments = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5223 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5224 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5225
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5226 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5227 newargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5228 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5229 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5230 newargs = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5231 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5232
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5233 // An anonymous nested class starts with "class"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5234 if (token.value == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5235 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5236 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5237 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5238 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5239
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5240 BaseClasses *baseclasses = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5241 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5242 baseclasses = parseBaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5243
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5244 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5245 ClassDeclaration *cd = new ClassDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5246
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5247 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5248 { error("{ members } expected for anonymous class");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5249 cd->members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5250 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5251 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5252 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5253 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5254 Array *decl = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5255 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5256 error("class member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5257 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5258 cd->members = decl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5259 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5260
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5261 e = new NewAnonClassExp(loc, thisexp, newargs, cd, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5262
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5263 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5264 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5265
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5266 #if LTORARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5267 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5268 t = parseBasicType2(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5269 if (t->ty == Taarray)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5270 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5271 Type *index = ((TypeAArray *)t)->index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5272
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5273 Expression *e = index->toExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5274 if (e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5275 { arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5276 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5277 t = new TypeDArray(t->next);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5278 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5279 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5280 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5281 error("need size of rightmost array, not type %s", index->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5282 return new NullExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5283 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5284 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5285 else if (t->ty == Tsarray)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5286 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5287 TypeSArray *tsa = (TypeSArray *)t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5288 Expression *e = tsa->dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5289
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5290 arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5291 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5292 t = new TypeDArray(t->next);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5293 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5294 else if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5295 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5296 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5297 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5298 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5299 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5300 while (token.value == TOKmul)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5301 { t = new TypePointer(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5302 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5303 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5304 if (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5305 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5306 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5307
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5308 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5309 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5310 arguments = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5311 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5312 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5313 t = parseDeclarator(t, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5314 t = new TypeDArray(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5315 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5316 else if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5317 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5318 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5319 e = new NewExp(loc, thisexp, newargs, t, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5320 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5321 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5322
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5323 /**********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5324 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5325
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5326 void Parser::addComment(Dsymbol *s, unsigned char *blockComment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5327 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5328 s->addComment(combineComments(blockComment, token.lineComment));
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
5329 token.lineComment = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5330 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5331
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5332
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5333 /********************************* ***************************/
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5334