annotate dmd/parse.c @ 710:20a5180f2e80

Make align(n), n != 1 an error.
author Christian Kamm <kamm incasoftware de>
date Sat, 18 Oct 2008 14:33:11 +0200
parents 50383e476c7e
children a26b0c5d5942
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3 // Copyright (c) 1999-2008 by Digital Mars
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
16 #include "mem.h"
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"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
35
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
36 // How multiple declarations are parsed.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
37 // If 1, treat as C.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
38 // If 0, treat:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
39 // int *p, i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
40 // as:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
41 // int* p;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
42 // int* i;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
43 #define CDECLSYNTAX 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
44
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
45 // Support C cast syntax:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
46 // (type)(expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
47 #define CCASTSYNTAX 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
48
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
49 // Support postfix C array declarations, such as
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
50 // int a[3][4];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
51 #define CARRAYDECL 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
52
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
53 // Support left-to-right array declarations
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
54 #define LTORARRAYDECL 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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
57 Parser::Parser(Module *module, unsigned char *base, unsigned length, int doDocComment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
58 : Lexer(module, base, 0, length, doDocComment, 0)
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 //printf("Parser::Parser()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
61 md = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
62 linkage = LINKd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
63 endloc = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
64 inBrackets = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
65 //nextToken(); // start up the scanner
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
66 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
67
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
68 Array *Parser::parseModule()
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 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
71
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
72 // ModuleDeclation leads off
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
73 if (token.value == TOKmodule)
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 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
76
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
77 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
78 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
79 { error("Identifier expected following module");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
80 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
81 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
82 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
83 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
84 Array *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
85 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
86
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
87 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
88 while (nextToken() == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
89 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
90 if (!a)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
91 a = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
92 a->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
93 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
94 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
95 { error("Identifier expected following package");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
96 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
97 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
98 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
99 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
100
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
101 md = new ModuleDeclaration(a, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
102
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
103 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
104 error("';' expected following module declaration instead of %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
105 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
106 addComment(mod, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
107 }
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
110 decldefs = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
111 if (token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
112 { error("unrecognized declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
113 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
114 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
115 return decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
116
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
117 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
118 while (token.value != TOKsemicolon && token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
119 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
120 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
121 return new Array();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
124 Array *Parser::parseDeclDefs(int once)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
125 { Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
126 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
127 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
128 Array *aelse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
129 enum PROT prot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
130 unsigned stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
131 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
132 unsigned char *comment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
133
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
134 //printf("Parser::parseDeclDefs()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
135 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
136 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
137 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
138 comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
139 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
140 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
141 case TOKenum:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
142 s = parseEnum();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
143 break;
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 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
146 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
147 case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
148 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
149 s = parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
150 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
151
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
152 case TOKimport:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
153 s = parseImport(decldefs, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
154 break;
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 case TOKtemplate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
157 s = (Dsymbol *)parseTemplateDeclaration();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
158 break;
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 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
161 { Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
162 if (peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
163 { // mixin(string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
164 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
165 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
166 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
167 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
168 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
169 s = new CompileDeclaration(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
170 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
171 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
172 s = parseMixin();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
173 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
174 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
175
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
176 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
177 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
178 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
179 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
180 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
181 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
182 Ldeclaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
183 a = parseDeclarations();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
184 decldefs->append(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
185 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
186
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
187 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
188 s = parseCtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
189 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
190
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
191 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
192 s = parseDtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
193 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
194
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
195 case TOKinvariant:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
196 #if 1
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
197 s = parseInvariant();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
198 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
199 if (peek(&token)->value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
200 s = parseInvariant();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
201 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
202 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
203 stc = STCinvariant;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
204 goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
205 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
206 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
207 break;
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 TOKunittest:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
210 s = parseUnitTest();
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 TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
214 s = parseNew();
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 TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
218 s = parseDelete();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
219 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
220
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
221 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
222 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
223 return decldefs;
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 case TOKstatic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
226 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
227 if (token.value == TOKthis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
228 s = parseStaticCtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
229 else if (token.value == TOKtilde)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
230 s = parseStaticDtor();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
231 else if (token.value == TOKassert)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
232 s = parseStaticAssert();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
233 else if (token.value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
234 { condition = parseStaticIfCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
235 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
236 aelse = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
237 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
238 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
239 aelse = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
240 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
241 s = new StaticIfDeclaration(condition, a, aelse);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
242 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
243 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
244 else if (token.value == TOKimport)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
245 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
246 s = parseImport(decldefs, 1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
247 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
248 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
249 { stc = STCstatic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
250 goto Lstc2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
251 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
252 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
253
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
254 case TOKconst: stc = STCconst; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
255 case TOKfinal: stc = STCfinal; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
256 case TOKauto: stc = STCauto; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
257 case TOKscope: stc = STCscope; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
258 case TOKoverride: stc = STCoverride; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
259 case TOKabstract: stc = STCabstract; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
260 case TOKsynchronized: stc = STCsynchronized; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
261 case TOKdeprecated: stc = STCdeprecated; goto Lstc;
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 Lstc:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
264 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
265 Lstc2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
266 switch (token.value)
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 case TOKconst: stc |= STCconst; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
269 case TOKfinal: stc |= STCfinal; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
270 case TOKauto: stc |= STCauto; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
271 case TOKscope: stc |= STCscope; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
272 case TOKoverride: stc |= STCoverride; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
273 case TOKabstract: stc |= STCabstract; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
274 case TOKsynchronized: stc |= STCsynchronized; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
275 case TOKdeprecated: stc |= STCdeprecated; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
276 //case TOKinvariant: stc |= STCinvariant; goto Lstc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
277 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
278 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
279 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
280
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
281 /* Look for auto initializers:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
282 * storage_class identifier = initializer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
283 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
284 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
285 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
286 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
287 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
288 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
289 Identifier *ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
290 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
291 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
292 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
293 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
294 v->storage_class = stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
295 s = v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
296 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
297 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
298 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
299 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
300 else if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
301 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
302 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
303 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
304 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
305 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
306 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
307 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
308 continue;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
311 error("Identifier expected following comma");
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
314 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
315 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
316 }
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
319 { a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
320 s = new StorageClassDeclaration(stc, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
321 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
322 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
323
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
324 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
325 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
326 { stc = STCextern;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
327 goto Lstc;
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 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
330 enum LINK linksave = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
331 linkage = parseLinkage();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
332 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
333 s = new LinkDeclaration(linkage, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
334 linkage = linksave;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
335 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
336 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
337 case TOKprivate: prot = PROTprivate; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
338 case TOKpackage: prot = PROTpackage; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
339 case TOKprotected: prot = PROTprotected; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
340 case TOKpublic: prot = PROTpublic; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
341 case TOKexport: prot = PROTexport; goto Lprot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
342
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
343 Lprot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
344 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
345 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
346 s = new ProtDeclaration(prot, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
347 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
348
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
349 case TOKalign:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
350 { unsigned n;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
351
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
352 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
353 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
354 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
355 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
356 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
357 if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
358 n = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
359 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
360 { error("integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
361 n = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
362 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
363 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
364 check(TOKrparen);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
367 n = global.structalign; // default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
368
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
369 a = parseBlock();
710
20a5180f2e80 Make align(n), n != 1 an error.
Christian Kamm <kamm incasoftware de>
parents: 658
diff changeset
370 s = new AlignDeclaration(loc, n, a);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
371 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
372 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
373
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
374 case TOKpragma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
375 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
376 Expressions *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
377
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
378 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
379 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
380 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
381 { error("pragma(identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
382 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
383 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
384 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
385 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
386 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
387 args = parseArguments(); // pragma(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
388 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
389 check(TOKrparen); // pragma(identifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
390
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
391 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
392 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
393 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
394 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
395 s = new PragmaDeclaration(loc, ident, args, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
396 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
399 case TOKdebug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
400 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
401 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
402 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
403 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
404 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
405 s = new DebugSymbol(loc, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
406 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
407 s = new DebugSymbol(loc, (unsigned)token.uns64value);
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 { error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
410 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
411 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
412 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
413 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
414 error("semicolon expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
415 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
416 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
417 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
418
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
419 condition = parseDebugCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
420 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
421
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
422 case TOKversion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
423 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
424 if (token.value == TOKassign)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
427 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
428 s = new VersionSymbol(loc, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
429 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
430 s = new VersionSymbol(loc, (unsigned)token.uns64value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
431 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
432 { error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
433 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
434 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
435 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
436 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
437 error("semicolon expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
438 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
439 break;
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 condition = parseVersionCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
442 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
443
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
444 Lcondition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
445 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
446 aelse = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
447 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
448 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
449 aelse = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
450 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
451 s = new ConditionalDeclaration(condition, a, aelse);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
452 break;
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 case TOKsemicolon: // empty declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
455 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
456 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
457
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
458 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
459 error("Declaration expected, not '%s'",token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
460 Lerror:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
461 while (token.value != TOKsemicolon && token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
462 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
463 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
464 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
465 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
466 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
467 if (s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
468 { decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
469 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
470 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
471 } while (!once);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
472 return decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
473 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
474
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
475
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 * Parse declarations after an align, protection, or extern decl.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
478 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
479
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
480 Array *Parser::parseBlock()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
481 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
482 Array *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
483 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
484
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
485 //printf("parseBlock()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
486 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
487 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
488 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
489 error("declaration expected following attribute, not ';'");
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 break;
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 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
494 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
495 a = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
496 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
497 { /* { */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
498 error("matching '}' expected, not %s", token.toChars());
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
501 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
502 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
503
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
504 case TOKcolon:
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 #if 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
507 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
508 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
509 a = parseDeclDefs(0); // grab declarations up to closing curly bracket
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
510 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
511 break;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
514 a = parseDeclDefs(1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
515 break;
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 return a;
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
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 * Parse a static assertion.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
522 */
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 StaticAssert *Parser::parseStaticAssert()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
525 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
526 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
527 Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
528 Expression *msg = NULL;
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 //printf("parseStaticAssert()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
531 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
532 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
533 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
534 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
535 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
536 msg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
537 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
538 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
539 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
540 return new StaticAssert(loc, exp, msg);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
543 /***********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
544 * Parse typeof(expression).
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
545 * Current token is on the 'typeof'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
546 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
547
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
548 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
549 TypeQualified *Parser::parseTypeof()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
550 { TypeQualified *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
551 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
552
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
553 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
554 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
555 if (token.value == TOKreturn) // typeof(return)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
556 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
557 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
558 t = new TypeReturn(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
559 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
560 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
561 { Expression *exp = parseExpression(); // typeof(expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
562 t = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
563 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
564 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
565 return t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
566 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
567 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
568
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
569 /***********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
570 * Parse extern (linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
571 * The parser is on the 'extern' token.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
572 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
573
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
574 enum LINK Parser::parseLinkage()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
575 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
576 enum LINK link = LINKdefault;
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 assert(token.value == TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
579 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
580 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
581 { Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
582
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
583 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
584 if (id == Id::Windows)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
585 link = LINKwindows;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
586 else if (id == Id::Pascal)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
587 link = LINKpascal;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
588 else if (id == Id::D)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
589 link = LINKd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
590 else if (id == Id::C)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
591 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
592 link = LINKc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
593 if (token.value == TOKplusplus)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
594 { link = LINKcpp;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
597 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
598 else if (id == Id::System)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
599 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
600 #if _WIN32
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
601 link = LINKwindows;
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 link = LINKc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
604 #endif
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
607 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
608 error("valid linkage identifiers are D, C, C++, Pascal, Windows, System");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
609 link = LINKd;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
613 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
614 link = LINKd; // default
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 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
617 return link;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
618 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
619
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
620 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
621 * Parse a debug conditional
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
622 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
623
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
624 Condition *Parser::parseDebugCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
625 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
626 Condition *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
627
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
628 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
629 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
630 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
631 unsigned level = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
632 Identifier *id = NULL;
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 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
635 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
636 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
637 level = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
638 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
639 error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
640 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
641 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
642 c = new DebugCondition(mod, level, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
643 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
644 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
645 c = new DebugCondition(mod, 1, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
646 return c;
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 }
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 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
651 * Parse a version conditional
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 Condition *Parser::parseVersionCondition()
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 Condition *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
657 unsigned level = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
658 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
659
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
660 if (token.value == TOKlparen)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
663 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
664 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
665 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
666 level = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
667 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
668 /* Allow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
669 * version (unittest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
670 * even though unittest is a keyword
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 else if (token.value == TOKunittest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
673 id = Lexer::idPool(Token::toChars(TOKunittest));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
674 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
675 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
676 error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
677 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
678 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
679
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
680 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
681 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
682 error("(condition) expected following version");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
683 c = new VersionCondition(mod, level, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
684 return c;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
687
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
688 /***********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
689 * static if (expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
690 * body
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
691 * else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
692 * body
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
693 */
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 Condition *Parser::parseStaticIfCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
696 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
697 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
698 Array *aif;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
699 Array *aelse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
700 Loc loc = this->loc;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
703 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
704 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
705 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
706 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
707 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
708 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
709 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
710 { error("(expression) expected following static if");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
711 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
712 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
713 condition = new StaticIfCondition(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
714 return condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
715 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
716
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
717
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
718 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
719 * Parse a constructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
720 * this(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
721 * Current token is 'this'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
724 CtorDeclaration *Parser::parseCtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
725 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
726 CtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
727 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
728 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
729 Loc loc = this->loc;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
732 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
733 f = new CtorDeclaration(loc, 0, arguments, varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
734 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
735 return f;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
738 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
739 * Parse a destructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
740 * ~this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
741 * Current token is '~'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
742 */
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 DtorDeclaration *Parser::parseDtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
745 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
746 DtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
747 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
748
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
749 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
750 check(TOKthis);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
751 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
752 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
753
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
754 f = new DtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
755 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
756 return f;
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 * Parse a static constructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
761 * static this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
762 * Current token is 'this'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
763 */
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 StaticCtorDeclaration *Parser::parseStaticCtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
766 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
767 StaticCtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
768 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
769
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
770 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
771 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
772 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
773
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
774 f = new StaticCtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
775 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
776 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
777 }
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 * Parse a static destructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
781 * static ~this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
782 * Current token is '~'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
783 */
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 StaticDtorDeclaration *Parser::parseStaticDtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
786 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
787 StaticDtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
788 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
789
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
790 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
791 check(TOKthis);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
792 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
793 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
794
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
795 f = new StaticDtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
796 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
797 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
798 }
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 * Parse an invariant definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
802 * invariant { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
803 * Current token is 'invariant'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
804 */
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 InvariantDeclaration *Parser::parseInvariant()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
807 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
808 InvariantDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
809 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
810
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
811 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
812 if (token.value == TOKlparen) // optional ()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
813 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
814 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
815 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
816 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
817
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
818 f = new InvariantDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
819 f->fbody = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
820 return f;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
823 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
824 * Parse a unittest definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
825 * unittest { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
826 * Current token is 'unittest'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
827 */
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 UnitTestDeclaration *Parser::parseUnitTest()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
830 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
831 UnitTestDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
832 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
833 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
834
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
835 nextToken();
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 body = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
838
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
839 f = new UnitTestDeclaration(loc, this->loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
840 f->fbody = body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
841 return f;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
844 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
845 * Parse a new definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
846 * new(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
847 * Current token is 'new'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
848 */
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 NewDeclaration *Parser::parseNew()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
851 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
852 NewDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
853 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
854 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
855 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
856
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
857 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
858 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
859 f = new NewDeclaration(loc, 0, arguments, varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
860 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
861 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
862 }
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 * Parse a delete definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
866 * delete(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
867 * Current token is 'delete'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
868 */
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 DeleteDeclaration *Parser::parseDelete()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
871 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
872 DeleteDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
873 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
874 int varargs;
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 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
879 if (varargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
880 error("... not allowed in delete function parameter list");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
881 f = new DeleteDeclaration(loc, 0, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
882 parseContracts(f);
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 parameter list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
888 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
889
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
890 Arguments *Parser::parseParameters(int *pvarargs)
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 Arguments *arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
893 int varargs = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
894 int hasdefault = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
895
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
896 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
897 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
898 { Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
899 Identifier *ai = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
900 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
901 Argument *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
902 unsigned storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
903 Expression *ae;
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 storageClass = STCin; // parameter is "in" by default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
906 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
907 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
908 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
909 break;
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 case TOKdotdotdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
912 varargs = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
913 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
914 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
915
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
916 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
917 storageClass = STCin;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
918 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
919 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
920
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
921 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
922 storageClass = STCout;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
923 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
924 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
925
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
926 case TOKinout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
927 case TOKref:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
928 storageClass = STCref;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
929 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
930 goto L1;
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 case TOKlazy:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
933 storageClass = STClazy;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
934 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
935 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
936
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
937 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
938 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
939 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
940 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
941 ae = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
942 if (token.value == TOKassign) // = defaultArg
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
943 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
944 ae = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
945 hasdefault = 1;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
948 { if (hasdefault)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
949 error("default argument expected for %s",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
950 ai ? ai->toChars() : at->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
951 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
952 if (token.value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
953 { /* This is:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
954 * at ai ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
955 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
956
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
957 if (storageClass & (STCout | STCref))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
958 error("variadic argument cannot be out or ref");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
959 varargs = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
960 a = new Argument(storageClass, at, ai, ae);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
961 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
962 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
963 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
964 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
965 a = new Argument(storageClass, at, ai, ae);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
966 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
967 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
968 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
969 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
970 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
971 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
972 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
973 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
974 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
975 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
976 *pvarargs = varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
977 return arguments;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
980
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
981 /*************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
982 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
983
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
984 EnumDeclaration *Parser::parseEnum()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
985 { EnumDeclaration *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
986 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
987 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
988 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
989
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
990 //printf("Parser::parseEnum()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
991 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
992 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
993 { id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
994 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
995 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
996 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
997 id = NULL;
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 (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1000 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1001 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1002 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1003 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1004 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1005 t = NULL;
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 e = new EnumDeclaration(loc, id, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1008 if (token.value == TOKsemicolon && id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1009 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1010 else if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1011 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1012 //printf("enum definition\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1013 e->members = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1014 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1015 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1016 while (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1017 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1018 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1019 { EnumMember *em;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1020 Expression *value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1021 Identifier *ident;
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 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1024 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1025 value = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1026 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1027 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1028 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1029 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1030 value = parseAssignExp();
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 em = new EnumMember(loc, ident, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1033 e->members->push(em);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1034 if (token.value == TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1035 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1036 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1037 { addComment(em, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1038 comment = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1039 check(TOKcomma);
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 addComment(em, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1042 comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1043 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1044 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1045 { error("enum member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1046 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1047 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1048 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1049 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1050 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1051 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1052 error("enum declaration is invalid");
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("-parseEnum() %s\n", e->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1055 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1056 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1057
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1058 Dsymbol *Parser::parseAggregate()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1059 { AggregateDeclaration *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1060 int anon = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1061 enum TOK tok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1062 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1063 TemplateParameters *tpl = NULL;
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 //printf("Parser::parseAggregate()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1066 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1067 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1068 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1069 { id = NULL;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1072 { id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1073 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1074
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1075 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1076 { // Class template declaration.
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 // Gather template parameter list
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1079 tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1080 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1081 }
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 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1084 switch (tok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1085 { case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1086 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1087 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1088 if (!id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1089 error("anonymous classes not allowed");
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 // Collect base class(es)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1092 BaseClasses *baseclasses = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1093 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1094 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1095 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1096 baseclasses = parseBaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1097
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1098 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1099 error("members expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1100 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1101
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1102 if (tok == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1103 a = new ClassDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1104 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1105 a = new InterfaceDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1106 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1107 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1108
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1109 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1110 if (id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1111 a = new StructDeclaration(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1112 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1113 anon = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1114 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1115
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1116 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1117 if (id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1118 a = new UnionDeclaration(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1119 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1120 anon = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1121 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1122
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1123 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1124 assert(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1125 break;
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 if (a && token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1128 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1129 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1130 else if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1131 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1132 //printf("aggregate definition\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1133 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1134 Array *decl = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1135 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1136 error("} expected following member declarations in aggregate");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1137 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1138 if (anon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1139 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1140 /* Anonymous structs/unions are more like attributes.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1141 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1142 return new AnonDeclaration(loc, anon - 1, decl);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1145 a->members = decl;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1148 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1149 error("{ } expected following aggregate declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1150 a = new StructDeclaration(loc, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1151 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1152
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1153 if (tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1154 { Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1155 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1156
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1157 // Wrap a template around the aggregate declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1158 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1159 decldefs->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1160 tempdecl = new TemplateDeclaration(loc, id, tpl, decldefs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1161 return tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1162 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1163
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1164 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1165 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1166
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1167 /*******************************************
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1170 BaseClasses *Parser::parseBaseClasses()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1171 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1172 enum PROT protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1173 BaseClasses *baseclasses = new BaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1174
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1175 for (; 1; nextToken())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1176 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1177 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1178 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1179 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1180 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1181 case TOKprivate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1182 protection = PROTprivate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1183 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1184 case TOKpackage:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1185 protection = PROTpackage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1186 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1187 case TOKprotected:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1188 protection = PROTprotected;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1189 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1190 case TOKpublic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1191 protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1192 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1193 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1194 error("base classes expected instead of %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1195 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1196 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1197 BaseClass *b = new BaseClass(parseBasicType(), protection);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1198 baseclasses->push(b);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1199 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1200 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1201 protection = PROTpublic;
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 return baseclasses;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1204 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1205
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1206 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1207 * Parse constraint.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1208 * Constraint is of the form:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1209 * if ( ConstraintExpression )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1210 */
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 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1213 Expression *Parser::parseConstraint()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1214 { Expression *e = NULL;
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 if (token.value == TOKif)
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 nextToken(); // skip over 'if'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1219 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1220 e = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1221 check(TOKrparen);
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 return e;
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 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1226
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1227 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1228 * Parse a TemplateDeclaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1229 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1230
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1231 TemplateDeclaration *Parser::parseTemplateDeclaration()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1232 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1233 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1234 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1235 TemplateParameters *tpl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1236 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1237 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1238
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1239 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1240 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1241 { error("TemplateIdentifier expected following template");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1242 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1243 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1244 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1245 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1246 tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1247 if (!tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1248 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1249
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1250 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1251 { error("members of template declaration expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1252 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1253 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1254 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1255 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1256 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1257 decldefs = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1258 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1259 { error("template member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1260 goto Lerr;
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 nextToken();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1265 tempdecl = new TemplateDeclaration(loc, id, tpl, decldefs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1266 return tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1267
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1268 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1269 return NULL;
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
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 * Parse template parameter list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1274 */
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 TemplateParameters *Parser::parseTemplateParameterList()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1277 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1278 TemplateParameters *tpl = new TemplateParameters();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1279
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1280 if (token.value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1281 { error("parenthesized TemplateParameterList expected following TemplateIdentifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1282 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1283 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1284 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1285
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1286 // Get array of TemplateParameters
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1287 if (token.value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1288 { int isvariadic = 0;
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 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1291 { TemplateParameter *tp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1292 Identifier *tp_ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1293 Type *tp_spectype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1294 Type *tp_valtype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1295 Type *tp_defaulttype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1296 Expression *tp_specvalue = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1297 Expression *tp_defaultvalue = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1298 Token *t;
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 // Get TemplateParameter
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 // 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
1303 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1304 if (token.value == TOKalias)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1305 { // AliasParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1306 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1307 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1308 { error("Identifier expected for template parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1309 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1310 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1311 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1312 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1313 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1314 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1315 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1316 tp_spectype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1317 tp_spectype = parseDeclarator(tp_spectype, NULL);
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 if (token.value == TOKassign) // = Type
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1322 tp_defaulttype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1323 tp_defaulttype = parseDeclarator(tp_defaulttype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1324 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1325 tp = new TemplateAliasParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1326 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1327 else if (t->value == TOKcolon || t->value == TOKassign ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1328 t->value == TOKcomma || t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1329 { // TypeParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1330 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1331 { error("Identifier expected for template parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1332 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1333 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1334 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1335 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1336 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1337 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1338 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1339 tp_spectype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1340 tp_spectype = parseDeclarator(tp_spectype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1341 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1342 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1343 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1344 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1345 tp_defaulttype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1346 tp_defaulttype = parseDeclarator(tp_defaulttype, NULL);
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 tp = new TemplateTypeParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1349 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1350 else if (token.value == TOKidentifier && t->value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1351 { // ident...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1352 if (isvariadic)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1353 error("variadic template parameter must be last");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1354 isvariadic = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1355 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1356 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1357 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1358 tp = new TemplateTupleParameter(loc, tp_ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1359 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1360 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1361 else if (token.value == TOKthis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1362 { // ThisParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1363 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1364 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1365 { error("identifier expected for template this parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1366 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1367 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1368 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1369 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1370 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1371 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1372 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1373 tp_spectype = parseType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1374 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1375 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1376 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1377 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1378 tp_defaulttype = parseType();
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 = new TemplateThisParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1381 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1382 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1383 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1384 { // ValueParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1385 tp_valtype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1386 tp_valtype = parseDeclarator(tp_valtype, &tp_ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1387 if (!tp_ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1388 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1389 error("identifier expected for template value parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1390 tp_ident = new Identifier("error", TOKidentifier);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1391 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1392 if (token.value == TOKcolon) // : CondExpression
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1395 tp_specvalue = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1396 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1397 if (token.value == TOKassign) // = CondExpression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1398 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1399 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1400 tp_defaultvalue = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1401 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1402 tp = new TemplateValueParameter(loc, tp_ident, tp_valtype, tp_specvalue, tp_defaultvalue);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1403 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1404 tpl->push(tp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1405 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1406 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1407 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1408 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1409 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1410 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1411 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1412 return tpl;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1415 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1416 * Parse template mixin.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1417 * mixin Foo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1418 * mixin Foo!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1419 * mixin a.b.c!(args).Foo!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1420 * mixin Foo!(args) identifier;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1421 * mixin typeof(expr).identifier!(args);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1424 Dsymbol *Parser::parseMixin()
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 TemplateMixin *tm;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1427 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1428 Type *tqual;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1429 Objects *tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1430 Array *idents;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1431
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1432 //printf("parseMixin()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1433 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1434 tqual = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1435 if (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1436 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1437 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1438 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1439 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1440 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1441 if (token.value == TOKtypeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1442 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1443
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1444 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1445 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1446 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1447 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1448 tqual = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1449 check(TOKdot);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1450 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1451 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1452 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1453 error("identifier expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1454 id = Id::empty;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1457 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1458 nextToken();
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 idents = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1462 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1463 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1464 tiargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1465 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1466 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1467 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1468 tiargs = parseTemplateArgumentList();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1471 if (token.value != TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1472 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1473
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1474 if (tiargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1475 { TemplateInstance *tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1476 tempinst->tiargs = tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1477 id = (Identifier *)tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1478 tiargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1479 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1480 idents->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1481
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1482 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1483 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1484 { error("identifier expected following '.' instead of '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1485 break;
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 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1488 nextToken();
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 idents->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1491
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1492 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1493 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1494 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1495 nextToken();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1498 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1499
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1500 tm = new TemplateMixin(loc, id, tqual, idents, tiargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1501 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1502 error("';' expected after mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1503 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1504
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1505 return tm;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1508 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1509 * Parse template argument list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1510 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1511 * current token is opening '('
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1512 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1513 * current token is one after closing ')'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1514 */
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 Objects *Parser::parseTemplateArgumentList()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1517 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1518 //printf("Parser::parseTemplateArgumentList()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1519 Objects *tiargs = new Objects();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1520 if (token.value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1521 { error("!(TemplateArgumentList) expected following TemplateIdentifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1522 return tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1523 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1524 nextToken();
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 // Get TemplateArgumentList
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1527 if (token.value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1528 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1529 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1530 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1531 // See if it is an Expression or a Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1532 if (isDeclaration(&token, 0, TOKreserved, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1533 { // Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1534 Type *ta;
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 // Get TemplateArgument
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1537 ta = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1538 ta = parseDeclarator(ta, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1539 tiargs->push(ta);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1540 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1541 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1542 { // Expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1543 Expression *ea;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1544
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1545 ea = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1546 tiargs->push(ea);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1547 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1548 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1549 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1550 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1551 }
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 check(TOKrparen, "template argument list");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1554 return tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1555 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1556
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1557 Import *Parser::parseImport(Array *decldefs, int isstatic)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1558 { Import *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1559 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1560 Identifier *aliasid = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1561 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1562 Loc loc;
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::parseImport()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1565 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1566 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1567 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1568 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1569 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1570 { error("Identifier expected following import");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1571 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1572 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1573
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1574 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1575 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1576 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1577 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1578 if (!aliasid && token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1579 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1580 aliasid = id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1581 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1582 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1583 while (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1584 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1585 if (!a)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1586 a = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1587 a->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1588 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1589 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1590 { error("Identifier expected following package");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1591 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1592 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1593 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1594 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1595 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1596
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1597 s = new Import(loc, a, token.ident, aliasid, isstatic);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1598 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1599
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1600 /* Look for
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1601 * : alias=name, alias=name;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1602 * syntax.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1603 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1604 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1605 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1606 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1607 { Identifier *name;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1608 Identifier *alias;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1611 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1612 { error("Identifier expected following :");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1613 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1614 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1615 alias = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1616 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1617 if (token.value == TOKassign)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1620 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1621 { error("Identifier expected following %s=", alias->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1622 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1623 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1624 name = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1625 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1626 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1627 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1628 { name = alias;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1629 alias = NULL;
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 s->addAlias(name, alias);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1632 } while (token.value == TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1633 break; // no comma-separated imports of this form
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1634 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1635
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1636 aliasid = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1637 } while (token.value == TOKcomma);
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 if (token.value == TOKsemicolon)
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 else
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 error("';' expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1644 nextToken();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1647 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1648 }
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 Type *Parser::parseBasicType()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1651 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1652 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1653 TypeQualified *tid;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1654 TemplateInstance *tempinst;
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 //printf("parseBasicType()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1657 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1658 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1659 CASE_BASIC_TYPES_X(t):
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1660 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1661 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1662
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1663 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1664 id = token.ident;
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 == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1667 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1668 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1669 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1670 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1671 tid = new TypeInstance(loc, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1672 goto Lident2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1673 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1674 Lident:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1675 tid = new TypeIdentifier(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1676 Lident2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1677 while (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1678 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1679 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1680 { error("identifier expected following '.' instead of '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1681 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1682 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1683 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1684 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1685 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1686 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1687 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1688 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1689 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1690 tid->addIdent((Identifier *)tempinst);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1693 tid->addIdent(id);
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 t = tid;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1696 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1697
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1698 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1699 // Leading . as in .foo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1700 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1701 goto Lident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1702
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1703 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1704 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1705
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1706 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1707 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1708 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1709 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1710 tid = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1711 goto Lident2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1712 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1713
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1714 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1715 error("basic type expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1716 t = Type::tint32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1717 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1718 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1719 return t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1720 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1721
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1722 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1723 * Parse things that follow the initial type t.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1724 * t *
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1725 * t []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1726 * t [type]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1727 * t [expression]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1728 * t [expression .. expression]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1729 * t function
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1730 * t delegate
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1731 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1732
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1733 Type *Parser::parseBasicType2(Type *t)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1734 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1735 Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1736 Type *ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1737
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1738 //printf("parseBasicType2()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1739 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1740 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1741 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1742 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1743 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1744 t = new TypePointer(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1745 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1746 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1747
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1748 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1749 #if LTORARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1750 // Handle []. Make sure things like
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1751 // int[3][1] a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1752 // is (array[1] of array[3] of int)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1753 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1754 if (token.value == TOKrbracket)
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 t = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1757 nextToken();
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 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1760 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1761 Type *index;
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 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1764 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1765 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1766 t = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1767 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1768 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1769 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1770 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1771 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1772 inBrackets++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1773 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1774 if (token.value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1775 { Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1776
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1777 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1778 e2 = parseExpression(); // [ exp .. exp ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1779 t = new TypeSlice(t, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1780 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1781 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1782 t = new TypeSArray(t,e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1783 inBrackets--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1784 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1785 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1786 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1787 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1788 // Handle []. Make sure things like
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1789 // int[3][1] a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1790 // is (array[3] of array[1] of int)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1791 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1792 while (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1793 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1794 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1795 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1796 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1797 ta = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1798 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1799 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1800 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1801 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1802 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1803
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1804 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1805 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1806 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1807 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1808 ta = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1809 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1810 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1811 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1812 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1813 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1814 ta = new TypeSArray(t,e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1815 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1816 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1817 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1818 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1819 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1820 *pt = ta;
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 t = ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1823 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1824 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1825
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1826 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1827 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1828 { // Handle delegate declaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1829 // t delegate(parameter list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1830 // t function(parameter list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1831 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1832 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1833 enum TOK save = token.value;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1836 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1837 t = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1838 if (save == TOKdelegate)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1839 t = new TypeDelegate(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1840 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1841 t = new TypePointer(t); // pointer to function
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1842 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1843 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1844
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1845 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1846 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1847 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1848 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1849 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1850 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1851 return ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1852 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1853
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1854 Type *Parser::parseDeclarator(Type *t, Identifier **pident, TemplateParameters **tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1855 { Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1856 Type *ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1857
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1858 //printf("parseDeclarator(tpl = %p)\n", tpl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1859 t = parseBasicType2(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1860
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1861 switch (token.value)
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1864 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1865 if (pident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1866 *pident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1867 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1868 error("unexpected identifer '%s' in declarator", token.ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1869 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1870 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1871 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1872
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1873 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1874 /* Parse things with parentheses around the identifier, like:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1875 * int (*ident[3])[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1876 * although the D style would be:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1877 * int[]*[3] ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1878 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1879 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1880 ts = parseDeclarator(t, pident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1881 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1882 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1883
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1884 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1885 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1886 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1887 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1888
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1889 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1890 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1891 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1892 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1893 #if CARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1894 /* Support C style array syntax:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1895 * int ident[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1896 * as opposed to D-style:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1897 * int[] ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1898 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1899 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1900 { // This is the old C-style post [] syntax.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1901 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1902 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1903 { // It's a dynamic array
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1904 ta = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1905 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1906 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1907 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1908 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1909 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1910
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1911 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1912 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1913 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1914 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1915 ta = new TypeAArray(t, index);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1918 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1919 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1920 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1921 ta = new TypeSArray(t, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1922 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1923 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1924 /* Insert ta into
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1925 * ts -> ... -> t
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1926 * so that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1927 * ts -> ... -> ta -> t
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1928 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1929 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1930 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1931 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1932 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1933 continue;
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 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1936 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1937 { Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1938 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1939
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1940 if (tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1941 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1942 /* Look ahead to see if this is (...)(...),
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1943 * i.e. a function template declaration
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 if (peekPastParen(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1946 { // It's a function template declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1947 //printf("function template declaration\n");
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 // Gather template parameter list
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1950 *tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1951 }
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 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1955 Type *ta = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1956 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1957 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1958 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1959 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1960 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1961 }
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1964 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1965
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1966 return ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1967 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1968
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1969 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1970 * Parse Declarations.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1971 * These can be:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1972 * 1. declarations at global/class level
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1973 * 2. declarations at statement level
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1974 * Return array of Declaration *'s.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1975 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1976
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1977 Array *Parser::parseDeclarations()
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 enum STC storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1980 enum STC stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1981 Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1982 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1983 Type *tfirst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1984 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1985 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1986 enum TOK tok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1987 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1988 enum LINK link = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1989
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1990 //printf("parseDeclarations()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1991 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1992 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1993 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1994 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1995 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1996 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1997 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1998
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1999 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2000 tok = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2001 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2002 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2003
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2004 storage_class = STCundefined;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2005 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2006 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2007 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2008 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2009 case TOKconst: stc = STCconst; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2010 case TOKstatic: stc = STCstatic; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2011 case TOKfinal: stc = STCfinal; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2012 case TOKauto: stc = STCauto; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2013 case TOKscope: stc = STCscope; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2014 case TOKoverride: stc = STCoverride; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2015 case TOKabstract: stc = STCabstract; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2016 case TOKsynchronized: stc = STCsynchronized; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2017 case TOKdeprecated: stc = STCdeprecated; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2018 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2019 if (storage_class & stc)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2020 error("redundant storage class '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2021 storage_class = (STC) (storage_class | stc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2022 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2023 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2024
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2025 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2026 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2027 { stc = STCextern;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2028 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2029 }
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 link = parseLinkage();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2032 continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2035 break;
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2038 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2039
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2040 a = new Array();
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 /* Look for auto initializers:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2043 * storage_class identifier = initializer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2044 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2045 while (storage_class &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2046 token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2047 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2048 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2049 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2050 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2051 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2052 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2053 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2054 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2055 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2056 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2057 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2058 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2059 addComment(v, comment);
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 else if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2062 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2063 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2064 if (!(token.value == TOKidentifier && peek(&token)->value == TOKassign))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2065 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2066 error("Identifier expected following comma");
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2069 continue;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2072 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2073 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2074 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2075
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2076 if (token.value == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2077 { AggregateDeclaration *s;
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 s = (AggregateDeclaration *)parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2080 s->storage_class |= storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2081 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2082 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2083 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2084 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2085
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2086 ts = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2087 ts = parseBasicType2(ts);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2088 tfirst = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2089
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2090 while (1)
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 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2093 TemplateParameters *tpl = NULL;
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 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2096 t = parseDeclarator(ts, &ident, &tpl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2097 assert(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2098 if (!tfirst)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2099 tfirst = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2100 else if (t != tfirst)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2101 error("multiple declarations must have the same type, not %s and %s",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2102 tfirst->toChars(), t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2103 if (!ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2104 error("no identifier for declarator %s", t->toChars());
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 if (tok == TOKtypedef || tok == TOKalias)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2107 { Declaration *v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2108 Initializer *init;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2109
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2110 init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2111 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2112 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2113 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2114 init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2115 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2116 if (tok == TOKtypedef)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2117 v = new TypedefDeclaration(loc, ident, t, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2118 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2119 { if (init)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2120 error("alias cannot have initializer");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2121 v = new AliasDeclaration(loc, ident, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2122 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2123 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2124 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2125 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2126 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2127 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2128 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2129 ax->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2130 Dsymbol *s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2131 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2132 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2133 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2134 { case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2135 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2136 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2137 break;
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 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2140 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2141 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2142 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2143
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2144 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2145 error("semicolon expected to close %s declaration", Token::toChars(tok));
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 else if (t->ty == Tfunction)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2150 { FuncDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2151 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2152
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2153 f = new FuncDeclaration(loc, 0, ident, storage_class, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2154 addComment(f, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2155 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2156 addComment(f, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2157 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2158 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2159 s = f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2160 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2161 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2162 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2163 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2164 ax->push(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2165 s = new LinkDeclaration(link, ax);
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 if (tpl) // it's a function template
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2168 { Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2169 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2170
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2171 // Wrap a template around the aggregate declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2172 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2173 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2174 tempdecl = new TemplateDeclaration(loc, s->ident, tpl, decldefs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2175 s = tempdecl;
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 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2178 a->push(s);
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 { VarDeclaration *v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2182 Initializer *init;
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 init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2185 if (token.value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2186 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2187 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2188 init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2189 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2190 v = new VarDeclaration(loc, t, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2191 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2192 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2193 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2194 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2195 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2196 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2197 ax->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2198 Dsymbol *s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2199 a->push(s);
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 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2202 { case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2203 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2204 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2205 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2206
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2207 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2208 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2209 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2210 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2211
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2212 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2213 error("semicolon expected, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2214 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2215 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2216 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2217 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2218 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2219 return a;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2222 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2223 * Parse auto declarations of the form:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2224 * storageClass ident = init, ident = init, ... ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2225 * and return the array of them.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2226 * Starts with token on the first ident.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2227 * Ends with scanner past closing ';'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2228 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2229
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2230 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2231 Array *Parser::parseAutoDeclarations(unsigned storageClass, unsigned char *comment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2232 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2233 Array *a = new Array;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2234
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2235 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2236 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2237 Identifier *ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2238 nextToken(); // skip over ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2239 assert(token.value == TOKassign);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2240 nextToken(); // skip over '='
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2241 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2242 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2243 v->storage_class = storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2244 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2245 if (token.value == TOKsemicolon)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2248 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2249 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2250 else if (token.value == TOKcomma)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2253 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2254 peek(&token)->value == TOKassign)
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 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2257 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2258 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2259 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2260 error("Identifier expected following comma");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2261 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2262 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2263 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2264 break;
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 return a;
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 #endif
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 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2271 * Parse contracts following function declaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2272 */
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 void Parser::parseContracts(FuncDeclaration *f)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2275 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2276 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2277 enum LINK linksave = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2278
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2279 // The following is irrelevant, as it is overridden by sc->linkage in
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2280 // TypeFunction::semantic
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2281 linkage = LINKd; // nested functions have D linkage
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2282 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2283 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2284 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2285 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2286 if (f->frequire || f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2287 error("missing body { ... } after in or out");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2288 f->fbody = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2289 f->endloc = endloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2290 break;
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 case TOKbody:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2293 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2294 f->fbody = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2295 f->endloc = endloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2296 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2297
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2298 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2299 if (f->frequire || f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2300 error("missing body { ... } after in or out");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2301 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2302 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2303
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2304 #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
2305 // int x, y, foo(), z;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2306 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2307 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2308 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2309 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2310
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2311 #if 0 // Dumped feature
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2312 case TOKthrow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2313 if (!f->fthrows)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2314 f->fthrows = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2315 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2316 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2317 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2318 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2319 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2320 f->fthrows->push(tb);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2321 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2322 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2323 continue;
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 break;
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 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2328 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2329 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2330
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2331 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2332 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2333 if (f->frequire)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2334 error("redundant 'in' statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2335 f->frequire = parseStatement(PScurly | PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2336 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2337
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2338 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2339 // parse: out (identifier) { statement }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2340 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2341 if (token.value != TOKlcurly)
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 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2344 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2345 error("(identifier) following 'out' expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2346 f->outId = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2347 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2348 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2349 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2350 if (f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2351 error("redundant 'out' statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2352 f->fensure = parseStatement(PScurly | PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2353 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2354
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2355 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2356 error("semicolon expected following function declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2357 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2358 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2359 linkage = linksave;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2360 }
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 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2363 */
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 Initializer *Parser::parseInitializer()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2366 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2367 StructInitializer *is;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2368 ArrayInitializer *ia;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2369 ExpInitializer *ie;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2370 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2371 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2372 Initializer *value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2373 int comma;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2374 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2375 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2376 int braces;
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2377 int brackets;
336
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 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2380 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2381 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2382 /* Scan ahead to see if it is a struct initializer or
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2383 * a function literal.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2384 * If it contains a ';', it is a function literal.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2385 * Treat { } as a struct initializer.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2386 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2387 braces = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2388 for (t = peek(&token); 1; t = peek(t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2389 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2390 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2391 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2392 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2393 case TOKreturn:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2394 goto Lexpression;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2395
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2396 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2397 braces++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2398 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2399
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2400 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2401 if (--braces == 0)
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 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2404
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2405 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2406 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2407
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2408 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2409 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2410 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2411 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2412 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2413
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2414 is = new StructInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2415 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2416 comma = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2417 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2418 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2419 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2420 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2421 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2422 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2423 error("comma expected separating field initializers");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2424 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2425 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2426 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2427 id = token.ident;
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 nextToken(); // skip over ':'
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2432 { id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2433 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2434 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2435 is->addInit(id, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2436 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2437 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2438
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2439 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2440 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2441 comma = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2442 continue;
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 TOKrcurly: // allow trailing comma's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2445 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2446 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2447
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2448 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2449 error("found EOF instead of initializer");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2450 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2451
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2452 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2453 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2454 is->addInit(NULL, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2455 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2456 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2457 //error("found '%s' instead of field initializer", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2458 //break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2459 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2460 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2461 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2462 return is;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2463
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2464 case TOKlbracket:
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2465 /* 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
2466 * an expression.
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2467 * 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
2468 */
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2469 brackets = 1;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2470 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
2471 {
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2472 switch (t->value)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2473 {
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2474 case TOKlbracket:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2475 brackets++;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2476 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2477
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2478 case TOKrbracket:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2479 if (--brackets == 0)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2480 { t = peek(t);
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2481 if (t->value != TOKsemicolon &&
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2482 t->value != TOKcomma &&
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2483 t->value != TOKrcurly)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2484 goto Lexpression;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2485 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2486 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2487 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2488
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2489 case TOKeof:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2490 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2491
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2492 default:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2493 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2494 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2495 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2496 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2497
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2498 ia = new ArrayInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2499 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2500 comma = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2501 while (1)
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 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2504 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2505 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2506 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2507 { error("comma expected separating array initializers, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2508 nextToken();
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2511 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2512 if (!e)
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 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2515 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2516 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2517 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2518 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2519 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2520 { value = new ExpInitializer(e->loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2521 e = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2522 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2523 ia->addInit(e, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2524 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2525 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2526
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2527 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2528 case TOKlbracket:
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 array initializers, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2531 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2532 ia->addInit(NULL, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2533 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2534 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2535
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2536 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2537 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2538 comma = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2539 continue;
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 case TOKrbracket: // allow trailing comma's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2542 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2543 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2544
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2545 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2546 error("found '%s' instead of array initializer", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2547 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2548 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2549 break;
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 return ia;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2552
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2553 case TOKvoid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2554 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2555 if (t->value == TOKsemicolon || t->value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2556 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2557 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2558 return new VoidInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2559 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2560 goto Lexpression;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2561
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2562 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2563 Lexpression:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2564 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2565 ie = new ExpInitializer(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2566 return ie;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2567 }
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
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 * Parses default argument initializer expression that is an assign expression,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2572 * with special handling for __FILE__ and __LINE__.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2573 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2574
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2575 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2576 Expression *Parser::parseDefaultInitExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2577 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2578 if (token.value == TOKfile ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2579 token.value == TOKline)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2580 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2581 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2582 if (t->value == TOKcomma || t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2583 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2584
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2585 if (token.value == TOKfile)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2586 e = new FileInitExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2587 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2588 e = new LineInitExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2589 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2590 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2591 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2592 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2593
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2594 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2595 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2596 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2597 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2598
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2599 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2600 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2601 * flags PSxxxx
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2602 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2603
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2604 Statement *Parser::parseStatement(int flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2605 { Statement *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2606 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2607 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2608 Statement *ifbody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2609 Statement *elsebody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2610 Loc loc = this->loc;
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 //printf("parseStatement()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2613
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2614 if (flags & PScurly && token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2615 error("statement expected to be { }, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2616
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2617 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2618 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2619 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2620 // Need to look ahead to see if it is a declaration, label, or expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2621 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2622 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2623 { // It's a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2624 Identifier *ident;
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 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2627 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2628 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2629 s = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2630 s = new LabelStatement(loc, ident, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2631 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2632 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2633 // fallthrough to TOKdot
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2634 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2635 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2636 if (isDeclaration(&token, 2, TOKreserved, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2637 goto Ldeclaration;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2638 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2639 goto Lexp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2640 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2641
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2642 case TOKassert:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2643 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2644 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2645 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2646 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2647 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2648 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2649 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2650 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2651 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2652 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2653 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2654 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2655 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2656 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2657 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2658 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2659 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2660 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2661 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2662 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2663 case TOKcast:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2664 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2665 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2666 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2667 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2668 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2669 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2670 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2671 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2672 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2673 case TOKtypeid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2674 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2675 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2676 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2677 case TOKtraits:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2678 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2679 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2680 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2681 Lexp:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2682 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2683
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2684 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2685 check(TOKsemicolon, "statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2686 s = new ExpStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2687 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2688 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2689
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2690 case TOKstatic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2691 { // Look ahead to see if it's static assert() or static if()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2692 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2693
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2694 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2695 if (t->value == TOKassert)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2696 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2697 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2698 s = new StaticAssertStatement(parseStaticAssert());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2699 break;
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 if (t->value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2702 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2703 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2704 condition = parseStaticIfCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2705 goto Lcondition;
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 goto Ldeclaration;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2708 }
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 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2711 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2712 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2713 case TOKconst:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2714 case TOKauto:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2715 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2716 case TOKfinal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2717 case TOKinvariant:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2718 // case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2719 Ldeclaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2720 { Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2721
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2722 a = parseDeclarations();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2723 if (a->dim > 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2724 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2725 Statements *as = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2726 as->reserve(a->dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2727 for (int i = 0; i < a->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2728 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2729 Dsymbol *d = (Dsymbol *)a->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2730 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2731 as->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2732 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2733 s = new CompoundStatement(loc, as);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2734 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2735 else if (a->dim == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2736 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2737 Dsymbol *d = (Dsymbol *)a->data[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2738 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2739 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2740 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2741 assert(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2742 if (flags & PSscope)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2743 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2744 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2745 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2746
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2747 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2748 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2749 case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2750 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2751 { Dsymbol *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2752
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2753 d = parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2754 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2755 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2756 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2757
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2758 case TOKenum:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2759 { Dsymbol *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2760
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2761 d = parseEnum();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2762 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2763 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2764 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2765
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2766 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2767 { t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2768 if (t->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2769 { // mixin(string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2770 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2771 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2772 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2773 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2774 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2775 s = new CompileStatement(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2776 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2777 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2778 Dsymbol *d = parseMixin();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2779 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2780 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2781 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2782
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2783 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2784 { Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2785
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2786 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2787 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2788 while (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2789 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2790 statements->push(parseStatement(PSsemi | PScurlyscope));
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 endloc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2793 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2794 if (flags & (PSscope | PScurlyscope))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2795 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2796 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2797 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2798 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2799
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2800 case TOKwhile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2801 { Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2802 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2803
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2804 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2805 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2806 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2807 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2808 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2809 s = new WhileStatement(loc, condition, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2810 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2811 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2812
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2813 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2814 if (!(flags & PSsemi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2815 error("use '{ }' for an empty statement, not a ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2816 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2817 s = new ExpStatement(loc, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2818 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2819
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2820 case TOKdo:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2821 { Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2822 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2823
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2824 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2825 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2826 check(TOKwhile);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2827 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2828 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2829 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2830 s = new DoStatement(loc, body, condition);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2831 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2832 }
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 case TOKfor:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2835 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2836 Statement *init;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2837 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2838 Expression *increment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2839 Statement *body;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2842 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2843 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2844 { init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2845 nextToken();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2848 { init = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2849 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2850 if (token.value == TOKsemicolon)
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 condition = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2853 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2854 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2855 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2856 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2857 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2858 check(TOKsemicolon, "for condition");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2859 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2860 if (token.value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2861 { increment = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2862 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2863 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2864 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2865 { increment = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2866 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2867 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2868 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2869 s = new ForStatement(loc, init, condition, increment, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2870 if (init)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2871 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2872 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2873 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2874
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2875 case TOKforeach:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2876 case TOKforeach_reverse:
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 enum TOK op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2879 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2880
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2881 Statement *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2882 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2883 Expression *aggr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2884
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2885 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2886 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2887
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2888 arguments = new Arguments();
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 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2891 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2892 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2893 Identifier *ai = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2894 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2895 unsigned storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2896 Argument *a;
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 storageClass = STCin;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2899 if (token.value == TOKinout || token.value == TOKref)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2900 { storageClass = STCref;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2901 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2902 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2903 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2904 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2905 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2906 if (t->value == TOKcomma || t->value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2907 { ai = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2908 at = NULL; // infer argument type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2909 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2910 goto Larg;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2913 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2914 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2915 if (!ai)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2916 error("no identifier for declarator %s", at->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2917 Larg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2918 a = new Argument(storageClass, at, ai, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2919 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2920 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2921 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2922 continue;
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2925 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2926 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2927
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2928 aggr = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2929 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2930 body = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2931 s = new ForeachStatement(loc, op, arguments, aggr, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2932 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2933 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2934
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2935 case TOKif:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2936 { Argument *arg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2937 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2938 Statement *ifbody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2939 Statement *elsebody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2940
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2941 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2942 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2943
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2944 if (token.value == TOKauto)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2947 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2948 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2949 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2950 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2951 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2952 arg = new Argument(STCin, NULL, token.ident, NULL);
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2955 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2956 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2957 { error("= expected following auto identifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2958 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2959 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2960 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2961 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2962 { error("identifier expected following auto");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2963 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2964 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2965 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2966 else if (isDeclaration(&token, 2, TOKassign, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2967 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2968 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2969 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2970 Identifier *ai;
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 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2973 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2974 check(TOKassign);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2975 arg = new Argument(STCin, at, ai, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2976 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2977
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2978 // Check for " ident;"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2979 else if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2980 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2981 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2982 if (t->value == TOKcomma || t->value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2983 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2984 arg = new Argument(STCin, NULL, token.ident, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2985 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2986 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2987 if (1 || !global.params.useDeprecated)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2988 error("if (v; e) is deprecated, use if (auto v = e)");
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2991
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2992 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2993 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2994 ifbody = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2995 if (token.value == TOKelse)
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 elsebody = parseStatement(PSscope);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3001 elsebody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3002 s = new IfStatement(loc, arg, condition, ifbody, elsebody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3003 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3004 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3005
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3006 case TOKscope:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3007 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3008 goto Ldeclaration; // scope used as storage class
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3009 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3010 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3011 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3012 { error("scope identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3013 goto Lerror;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3016 { TOK t = TOKon_scope_exit;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3017 Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3018
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3019 if (id == Id::exit)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3020 t = TOKon_scope_exit;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3021 else if (id == Id::failure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3022 t = TOKon_scope_failure;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3023 else if (id == Id::success)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3024 t = TOKon_scope_success;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3025 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3026 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
3027 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3028 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3029 Statement *st = parseStatement(PScurlyscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3030 s = new OnScopeStatement(loc, t, st);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3031 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3032 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3033
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3034 case TOKdebug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3035 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3036 condition = parseDebugCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3037 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3038
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3039 case TOKversion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3040 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3041 condition = parseVersionCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3042 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3043
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3044 Lcondition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3045 ifbody = parseStatement(0 /*PSsemi*/);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3046 elsebody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3047 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3048 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3049 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3050 elsebody = parseStatement(0 /*PSsemi*/);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3051 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3052 s = new ConditionalStatement(loc, condition, ifbody, elsebody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3053 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3054
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3055 case TOKpragma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3056 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3057 Expressions *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3058 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3059
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3060 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3061 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3062 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3063 { error("pragma(identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3064 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3065 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3066 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3067 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3068 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3069 args = parseArguments(); // pragma(identifier, args...);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3070 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3071 check(TOKrparen); // pragma(identifier);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3072 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3073 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3074 body = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3075 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3076 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3077 body = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3078 s = new PragmaStatement(loc, ident, args, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3079 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3080 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3081
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3082 case TOKswitch:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3083 { Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3084 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3085
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3086 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3087 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3088 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3089 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3090 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3091 s = new SwitchStatement(loc, condition, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3092 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3093 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3094
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3095 case TOKcase:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3096 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3097 Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3098 Array cases; // array of Expression's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3099
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3100 while (1)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3103 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3104 cases.push(exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3105 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3106 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3107 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3108 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3109
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3110 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3111 while (token.value != TOKcase &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3112 token.value != TOKdefault &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3113 token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3114 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3115 statements->push(parseStatement(PSsemi | PScurlyscope));
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 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3118 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3119
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3120 // Keep cases in order by building the case statements backwards
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3121 for (int i = cases.dim; i; i--)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3122 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3123 exp = (Expression *)cases.data[i - 1];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3124 s = new CaseStatement(loc, exp, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3125 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3126 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3127 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3128
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3129 case TOKdefault:
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 Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3132
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3133 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3134 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3135
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3136 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3137 while (token.value != TOKcase &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3138 token.value != TOKdefault &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3139 token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3140 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3141 statements->push(parseStatement(PSsemi | PScurlyscope));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3142 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3143 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3144 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3145 s = new DefaultStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3146 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3147 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3148
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3149 case TOKreturn:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3150 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3151
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 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3154 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3155 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3156 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3157 check(TOKsemicolon, "return statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3158 s = new ReturnStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3159 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3162 case TOKbreak:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3163 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3164
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3165 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3166 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3167 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3168 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3169 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3170 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3171 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3172 check(TOKsemicolon, "break statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3173 s = new BreakStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3174 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3175 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3176
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3177 case TOKcontinue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3178 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3179
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3180 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3181 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3182 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3183 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3184 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3185 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3186 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3187 check(TOKsemicolon, "continue statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3188 s = new ContinueStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3189 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3190 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3191
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3192 case TOKgoto:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3193 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3194
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3195 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3196 if (token.value == TOKdefault)
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 s = new GotoDefaultStatement(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3200 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3201 else if (token.value == TOKcase)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3202 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3203 Expression *exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3204
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3205 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3206 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3207 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3208 s = new GotoCaseStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3209 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3210 else
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 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3213 { error("Identifier expected following goto");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3214 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3215 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3216 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3217 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3218 nextToken();
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 s = new GotoStatement(loc, ident);
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 check(TOKsemicolon, "goto statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3223 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3224 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3225
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3226 case TOKsynchronized:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3227 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3228 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3229
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3230 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3231 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3232 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3233 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3234 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3235 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3236 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3237 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3238 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3239 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3240 s = new SynchronizedStatement(loc, exp, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3241 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3244 case TOKwith:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3245 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3246 Statement *body;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3249 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3250 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3251 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3252 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3253 s = new WithStatement(loc, exp, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3254 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3255 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3256
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3257 case TOKtry:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3258 { Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3259 Array *catches = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3260 Statement *finalbody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3261
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3262 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3263 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3264 while (token.value == TOKcatch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3265 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3266 Statement *handler;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3267 Catch *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3268 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3269 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3270 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3271
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3272 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3273 if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3274 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3275 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3276 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3277 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3278 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3279 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3280 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3281 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3282 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3283 t = parseDeclarator(t, &id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3284 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3285 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3286 handler = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3287 c = new Catch(loc, t, id, handler);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3288 if (!catches)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3289 catches = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3290 catches->push(c);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3293 if (token.value == TOKfinally)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3294 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3295 finalbody = parseStatement(0);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3298 s = body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3299 if (!catches && !finalbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3300 error("catch or finally expected following try");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3301 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3302 { if (catches)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3303 s = new TryCatchStatement(loc, body, catches);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3304 if (finalbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3305 s = new TryFinallyStatement(loc, s, finalbody);
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3308 }
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 case TOKthrow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3311 { Expression *exp;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3314 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3315 check(TOKsemicolon, "throw statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3316 s = new ThrowStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3317 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3318 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3319
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3320 case TOKvolatile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3321 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3322 s = parseStatement(PSsemi | PScurlyscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3323 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3324 if (!global.params.useDeprecated)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3325 error("volatile statements deprecated; used synchronized statements instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3326 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3327 s = new VolatileStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3328 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3329
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3330 case TOKasm:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3331 { Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3332 Identifier *label;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3333 Loc labelloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3334 Token *toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3335 Token **ptoklist;
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 // Parse the asm block into a sequence of AsmStatements,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3338 // each AsmStatement is one instruction.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3339 // Separate out labels.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3340 // Defer parsing of AsmStatements until semantic processing.
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 check(TOKlcurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3344 toklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3345 ptoklist = &toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3346 label = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3347 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3348 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3349 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3350 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3351 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3352 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3353 if (!toklist)
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 // Look ahead to see if it is a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3356 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3357 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3358 { // It's a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3359 label = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3360 labelloc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3361 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3362 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3363 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3364 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3365 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3366 goto Ldefault;
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 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3369 if (toklist || label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3370 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3371 error("asm statements must end in ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3372 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3373 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3374
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3375 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3376 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3377 if (toklist || label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3378 { // Create AsmStatement from list of tokens we've saved
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3379 s = new AsmStatement(this->loc, toklist);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3380 toklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3381 ptoklist = &toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3382 if (label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3383 { s = new LabelStatement(labelloc, label, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3384 label = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3385 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3386 statements->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3387 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3388 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3389 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3390
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3391 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3392 /* { */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3393 error("matching '}' expected, not end of file");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3394 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3395
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3396 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3397 Ldefault:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3398 *ptoklist = new Token();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3399 memcpy(*ptoklist, &token, sizeof(Token));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3400 ptoklist = &(*ptoklist)->next;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3401 *ptoklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3402
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3403 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3404 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3405 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3406 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3407 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3408 s = new AsmBlockStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3409 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3410 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3411 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3412
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3413 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3414 error("found '%s' instead of statement", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3415 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3416
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3417 Lerror:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3418 while (token.value != TOKrcurly &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3419 token.value != TOKsemicolon &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3420 token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3421 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3422 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3423 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3424 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3425 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3426 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3427
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3428 return s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3429 }
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 void Parser::check(enum TOK value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3432 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3433 check(loc, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3434 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3435
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3436 void Parser::check(Loc loc, enum TOK value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3437 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3438 if (token.value != value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3439 error(loc, "found '%s' when expecting '%s'", token.toChars(), Token::toChars(value));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3440 nextToken();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3443 void Parser::check(enum TOK value, char *string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3444 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3445 if (token.value != value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3446 error("found '%s' when expecting '%s' following '%s'",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3447 token.toChars(), Token::toChars(value), string);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3448 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3449 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3450
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3451 /************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3452 * Determine if the scanner is sitting on the start of a declaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3453 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3454 * needId 0 no identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3455 * 1 identifier optional
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3456 * 2 must have identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3457 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3458
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3459 int Parser::isDeclaration(Token *t, int needId, enum TOK endtok, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3460 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3461 int haveId = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3462
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3463 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3464 if ((t->value == TOKconst || t->value == TOKinvariant) &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3465 peek(t)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3466 { /* const type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3467 * invariant type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3468 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3469 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3470 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3471 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3472
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3473 if (!isBasicType(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3474 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3475 if (!isDeclarator(&t, &haveId, endtok))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3476 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3477 if ( needId == 1 ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3478 (needId == 0 && !haveId) ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3479 (needId == 2 && haveId))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3480 { if (pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3481 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3482 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3483 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3484 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3485 return FALSE;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3488 int Parser::isBasicType(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3489 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3490 // This code parallels parseBasicType()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3491 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3492 Token *t2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3493 int parens;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3494
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3495 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3496 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3497 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3498 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3499 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3500
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3501 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3502 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3503 if (t->value == TOKnot)
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 goto L4;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3506 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3507 goto L3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3508 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3509 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3510 L2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3511 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3512 L3:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3513 if (t->value == TOKdot)
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 Ldot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3516 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3517 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3518 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3519 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3520 if (t->value != TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3521 goto L3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3522 L4:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3523 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3524 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3525 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3526 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3527 goto Lfalse;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3530 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3531 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3532 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3533
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3534 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3535 goto Ldot;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3536
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3537 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3538 /* typeof(exp).identifier...
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3541 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3542 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3543 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3544 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3545 goto L2;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3548 goto Lfalse;
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 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3551 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3552
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3553 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3554 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3555 }
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 int Parser::isDeclarator(Token **pt, int *haveId, enum TOK endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3558 { // This code parallels parseDeclarator()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3559 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3560 int parens;
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 //printf("Parser::isDeclarator()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3563 //t->print();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3564 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3565 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3566
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3567 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3568 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3569 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3570 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3571 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3572 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3573 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3574 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3575 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3576
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3577 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3578 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3579 if (t->value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3580 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3581 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3582 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3583 else if (isDeclaration(t, 0, TOKrbracket, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3584 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3585 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3586 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3587 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3588 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3589 // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3590 // [ expression .. expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3591 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3592 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3593 if (t->value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3594 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3595 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3596 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3597 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3598 if (t->value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3599 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3600 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3601 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3602 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3603
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3604 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3605 if (*haveId)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3606 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3607 *haveId = TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3608 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3609 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3610
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3611 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3612 t = peek(t);
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 if (t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3615 return FALSE; // () is not a declarator
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3616
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3617 /* Regard ( identifier ) as not a declarator
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3618 * BUG: what about ( *identifier ) in
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3619 * f(*p)(x);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3620 * where f is a class instance with overloaded () ?
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3621 * Should we just disallow C-style function pointer declarations?
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 if (t->value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3624 { Token *t2 = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3625 if (t2->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3626 return FALSE;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3629
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3630 if (!isDeclarator(&t, haveId, TOKrparen))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3631 return FALSE;
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 parens = TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3634 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3635
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3636 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3637 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3638 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3639 if (!isParameters(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3640 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3641 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3642 }
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3646 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3647 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3648 switch (t->value)
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 #if CARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3651 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3652 parens = FALSE;
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 == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3655 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3656 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3657 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3658 else if (isDeclaration(t, 0, TOKrbracket, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3659 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3660 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3661 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3662 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3663 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3664 // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3665 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3666 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3667 if (t->value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3668 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3669 t = peek(t);
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 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3672 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3673
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3674 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3675 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3676 if (!isParameters(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3677 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3678 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3679
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3680 // Valid tokens that follow a declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3681 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3682 case TOKrbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3683 case TOKassign:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3684 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3685 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3686 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3687 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3688 // The !parens is to disallow unnecessary parentheses
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3689 if (!parens && (endtok == TOKreserved || endtok == t->value))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3690 { *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3691 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3692 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3693 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3694
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3695 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3696 return FALSE;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3699 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3700
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 int Parser::isParameters(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3703 { // This code parallels parseParameters()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3704 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3705 int tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3706
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3707 //printf("isParameters()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3708 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3709 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3710
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3711 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3712 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3713 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3714 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3715 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3716 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3717 break;
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 TOKdotdotdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3720 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3721 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3722
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3723 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3724 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3725 case TOKinout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3726 case TOKref:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3727 case TOKlazy:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3728 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3729 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3730 if (!isBasicType(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3731 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3732 tmp = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3733 if (t->value != TOKdotdotdot &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3734 !isDeclarator(&t, &tmp, TOKreserved))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3735 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3736 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3737 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3738 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3739 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3740 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3741 if (t->value == TOKdotdotdot)
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3744 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3745 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3746 if (t->value == TOKcomma)
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 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3749 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3750 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3751 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3752 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3753 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3754 if (t->value != TOKrparen)
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3757 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3758 return TRUE;
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 int Parser::isExpression(Token **pt)
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 // This is supposed to determine if something is an expression.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3764 // What it actually does is scan until a closing right bracket
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3765 // is found.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3766
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3767 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3768 int brnest = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3769 int panest = 0;
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 for (;; 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 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3774 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3775 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3776 brnest++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3777 continue;
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 case TOKrbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3780 if (--brnest >= 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3781 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3782 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3783
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3784 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3785 panest++;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3788 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3789 if (brnest || panest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3790 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3791 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3792
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3793 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3794 if (--panest >= 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3795 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3796 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3797
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3798 case TOKslice:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3799 if (brnest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3800 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3801 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3802
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3803 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3804 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3805
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3806 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3807 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3808 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3809 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3810 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3811
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3812 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3813 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3814 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3815
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3816 /**********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3817 * Skip over
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3818 * instance foo.bar(parameters...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3819 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3820 * if (pt), *pt is set to the token following the closing )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3821 * Returns:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3822 * 1 it's valid instance syntax
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3823 * 0 invalid instance syntax
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3824 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3825
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3826 int Parser::isTemplateInstance(Token *t, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3827 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3828 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3829 if (t->value != TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3830 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3831 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3832 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3833 t = peek(t);
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 while (t->value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3836 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3837 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3838 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3839 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3840 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3841 }
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 goto Lfalse;
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 // Skip over the template arguments
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 while (1)
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3851 switch (t->value)
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 TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3854 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3855 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3856 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3857 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3858 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3859 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3860 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3861 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3862 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3863 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3864 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3865 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3866 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3867 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3868 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3869
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3870 if (t->value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3871 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3872 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3873 if (t->value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3874 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3875 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3876 if (pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3877 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3878 return 1;
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 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3881 return 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3882 }
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 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3885 * Skip parens, brackets.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3886 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3887 * t is on opening (
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3888 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3889 * *pt is set to closing token, which is ')' on success
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3890 * Returns:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3891 * !=0 successful
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3892 * 0 some parsing error
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::skipParens(Token *t, 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 int parens = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3898
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3899 while (1)
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 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3902 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3903 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3904 parens++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3905 break;
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 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3908 parens--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3909 if (parens < 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3910 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3911 if (parens == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3912 goto Ldone;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3913 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3914
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3915 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3916 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3917 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3918
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3919 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3920 break;
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3923 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3924
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3925 Ldone:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3926 if (*pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3927 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3928 return 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3929
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3930 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3931 return 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3932 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3933
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3934 /********************************* Expression Parser ***************************/
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3935
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3936 Expression *Parser::parsePrimaryExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3937 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3938 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3939 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3940 enum TOK save;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3941 Loc loc = this->loc;
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 //printf("parsePrimaryExp(): loc = %d\n", loc.linnum);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3944 switch (token.value)
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 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3947 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3948 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3949 if (token.value == TOKnot && peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3950 { // identifier!(template-argument-list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3951 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3952
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3953 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3954 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3955 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3956 e = new ScopeExp(loc, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3957 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3958 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3959 e = new IdentifierExp(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3960 break;
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 case TOKdollar:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3963 if (!inBrackets)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3964 error("'$' is valid only inside [] of index or slice");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3965 e = new DollarExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3966 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3967 break;
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 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3970 // Signal global scope '.' operator with "" identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3971 e = new IdentifierExp(loc, Id::empty);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3972 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3973
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3974 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3975 e = new ThisExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3976 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3977 break;
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 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3980 e = new SuperExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3981 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3982 break;
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 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3985 e = new IntegerExp(loc, token.int32value, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3986 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3987 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3988
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3989 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3990 e = new IntegerExp(loc, token.uns32value, Type::tuns32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3991 nextToken();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3994 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3995 e = new IntegerExp(loc, token.int64value, Type::tint64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3996 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3997 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3998
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3999 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4000 e = new IntegerExp(loc, token.uns64value, Type::tuns64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4001 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4002 break;
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 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4005 e = new RealExp(loc, token.float80value, Type::tfloat32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4006 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4007 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4008
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4009 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4010 e = new RealExp(loc, token.float80value, Type::tfloat64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4011 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4012 break;
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 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4015 e = new RealExp(loc, token.float80value, Type::tfloat80);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4016 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4017 break;
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 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4020 e = new RealExp(loc, token.float80value, Type::timaginary32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4021 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4022 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4023
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4024 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4025 e = new RealExp(loc, token.float80value, Type::timaginary64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4026 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4027 break;
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 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4030 e = new RealExp(loc, token.float80value, Type::timaginary80);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4031 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4032 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4033
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4034 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4035 e = new NullExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4036 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4037 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4038
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4039 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4040 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4041 { char *s = loc.filename ? loc.filename : mod->ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4042 e = new StringExp(loc, s, strlen(s), 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4043 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4044 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4045 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4046
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4047 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4048 e = new IntegerExp(loc, loc.linnum, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4049 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4050 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4051 #endif
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 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4054 e = new IntegerExp(loc, 1, Type::tbool);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4055 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4056 break;
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 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4059 e = new IntegerExp(loc, 0, Type::tbool);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4060 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4061 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4062
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4063 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4064 e = new IntegerExp(loc, token.uns32value, Type::tchar);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4065 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4066 break;
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 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4069 e = new IntegerExp(loc, token.uns32value, Type::twchar);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4070 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4071 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4072
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4073 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4074 e = new IntegerExp(loc, token.uns32value, Type::tdchar);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4075 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4076 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4077
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4078 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4079 { unsigned char *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4080 unsigned len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4081 unsigned char postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4082
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4083 // cat adjacent strings
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4084 s = token.ustring;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4085 len = token.len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4086 postfix = token.postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4087 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4088 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4089 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4090 if (token.value == TOKstring)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4091 { unsigned len1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4092 unsigned len2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4093 unsigned char *s2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4094
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4095 if (token.postfix)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4096 { if (token.postfix != postfix)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4097 error("mismatched string literal postfixes '%c' and '%c'", postfix, token.postfix);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4098 postfix = token.postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4099 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4100
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4101 len1 = len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4102 len2 = token.len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4103 len = len1 + len2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4104 s2 = (unsigned char *)mem.malloc((len + 1) * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4105 memcpy(s2, s, len1 * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4106 memcpy(s2 + len1, token.ustring, (len2 + 1) * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4107 s = s2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4108 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4109 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4110 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4111 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4112 e = new StringExp(loc, s, len, postfix);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4113 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4114 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4115
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4116 CASE_BASIC_TYPES_X(t):
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4117 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4118 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4119 check(TOKdot, t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4120 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4121 { error("found '%s' when expecting identifier following '%s.'", token.toChars(), t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4122 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4123 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4124 e = new TypeDotIdExp(loc, t, token.ident);
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 TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4129 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4130
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4131 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4132 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4133 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4134 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4135 t = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4136 e = new TypeExp(loc, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4137 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4138 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4139
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4140 case TOKtypeid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4141 { Type *t;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4144 check(TOKlparen, "typeid");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4145 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4146 t = parseDeclarator(t,NULL); // ( type )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4147 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4148 e = new TypeidExp(loc, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4149 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4150 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4151
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4152 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4153 case TOKtraits:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4154 { /* __traits(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4155 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4156 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4157 Objects *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4158
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4159 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4160 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4161 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4162 { error("__traits(identifier, args...) expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4163 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4164 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4165 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4166 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4167 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4168 args = parseTemplateArgumentList2(); // __traits(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4169 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4170 check(TOKrparen); // __traits(identifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4171
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4172 e = new TraitsExp(loc, ident, args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4173 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4174 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4175 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4176
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4177 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4178 { Type *targ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4179 Identifier *ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4180 Type *tspec = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4181 enum TOK tok = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4182 enum TOK tok2 = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4183 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4184
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4185 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4186 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4187 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4188 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4189 targ = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4190 targ = parseDeclarator(targ, &ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4191 if (token.value == TOKcolon || token.value == TOKequal)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4192 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4193 tok = token.value;
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 if (tok == TOKequal &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4196 (token.value == TOKtypedef ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4197 token.value == TOKstruct ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4198 token.value == TOKunion ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4199 token.value == TOKclass ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4200 token.value == TOKsuper ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4201 token.value == TOKenum ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4202 token.value == TOKinterface ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4203 token.value == TOKfunction ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4204 token.value == TOKdelegate ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4205 token.value == TOKreturn))
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 tok2 = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4208 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4209 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4210 else
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 tspec = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4213 tspec = parseDeclarator(tspec, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4214 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4215 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4216 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4217 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4218 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4219 { error("(type identifier : specialization) expected following is");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4220 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4221 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4222 e = new IsExp(loc, targ, ident, tok, tspec, tok2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4223 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4224 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4225
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4226 case TOKassert:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4227 { Expression *msg = NULL;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4230 check(TOKlparen, "assert");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4231 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4232 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4233 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4234 msg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4235 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4236 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4237 e = new AssertExp(loc, e, msg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4238 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4239 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4240
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4241 case TOKmixin:
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4244 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4245 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4246 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4247 e = new CompileExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4248 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4251 case TOKimport:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4252 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4253 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4254 check(TOKlparen, "import");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4255 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4256 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4257 e = new FileExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4258 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4259 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4260
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4261 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4262 if (peekPastParen(&token)->value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4263 { // (arguments) { statements... }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4264 save = TOKdelegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4265 goto case_delegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4266 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4267 // ( expression )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4268 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4269 e = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4270 check(loc, TOKrparen);
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 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4274 { /* Parse array literals and associative array literals:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4275 * [ value, value, value ... ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4276 * [ key:value, key:value, key:value ... ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4277 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4278 Expressions *values = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4279 Expressions *keys = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4280
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4281 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4282 if (token.value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4283 {
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4284 while (token.value != TOKeof)
336
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 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4287 if (token.value == TOKcolon && (keys || values->dim == 0))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4288 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4289 if (!keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4290 keys = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4291 keys->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4292 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4293 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4294 else if (keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4295 { error("'key:value' expected for associative array literal");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4296 delete keys;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4297 keys = NULL;
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 values->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4300 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4301 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4302 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4303 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4304 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4305 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4306
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4307 if (keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4308 e = new AssocArrayLiteralExp(loc, keys, values);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4309 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4310 e = new ArrayLiteralExp(loc, values);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4311 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4312 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4313
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4314 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4315 // { statements... }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4316 save = TOKdelegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4317 goto case_delegate;
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 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4320 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4321 save = token.value;
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 case_delegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4324 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4325 /* function type(parameters) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4326 * delegate type(parameters) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4327 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4328 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4329 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4330 FuncLiteralDeclaration *fd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4331 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4332
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4333 if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4334 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4335 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4336 varargs = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4337 arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4338 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4339 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4340 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4341 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4342 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4343 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4344 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4345 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4346 t = parseBasicType2(t); // function return type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4347 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4348 arguments = parseParameters(&varargs);
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 t = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4351 fd = new FuncLiteralDeclaration(loc, 0, t, save, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4352 parseContracts(fd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4353 e = new FuncExp(loc, fd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4354 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4357 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4358 error("expression expected, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4359 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4360 // Anything for e, as long as it's not NULL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4361 e = new IntegerExp(loc, 0, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4362 nextToken();
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 return parsePostExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4366 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4367
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4368 Expression *Parser::parsePostExp(Expression *e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4369 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4370 Loc loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4371
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4372 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4373 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4374 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4375 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4376 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4377 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4378 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4379 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4380 { Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4381
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4382 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4383 if (token.value == TOKnot && peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4384 { // identifier!(template-argument-list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4385 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4386
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4387 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4388 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4389 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4390 e = new DotTemplateInstanceExp(loc, e, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4391 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4392 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4393 e = new DotIdExp(loc, e, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4394 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4395 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4396 else if (token.value == TOKnew)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4397 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4398 e = parseNewExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4399 continue;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4402 error("identifier expected following '.', not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4403 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4404
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4405 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4406 e = new PostExp(TOKplusplus, loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4407 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4408
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4409 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4410 e = new PostExp(TOKminusminus, loc, e);
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 TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4414 e = new CallExp(loc, e, parseArguments());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4415 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4416
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4417 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4418 { // array dereferences:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4419 // array[index]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4420 // array[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4421 // array[lwr .. upr]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4422 Expression *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4423 Expression *upr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4424
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4425 inBrackets++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4426 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4427 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4428 { // array[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4429 e = new SliceExp(loc, e, NULL, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4430 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4431 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4432 else
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 index = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4435 if (token.value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4436 { // array[lwr .. upr]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4437 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4438 upr = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4439 e = new SliceExp(loc, e, index, upr);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4440 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4441 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4442 { // array[index, i2, i3, i4, ...]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4443 Expressions *arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4444 arguments->push(index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4445 if (token.value == TOKcomma)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4448 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4449 { Expression *arg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4450
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4451 arg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4452 arguments->push(arg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4453 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4454 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4455 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4456 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4457 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4458 e = new ArrayExp(loc, e, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4459 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4460 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4461 inBrackets--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4462 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4463 continue;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4466 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4467 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4468 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4469 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4470 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4471 }
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 Expression *Parser::parseUnaryExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4474 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4475 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4476
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4477 switch (token.value)
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 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4480 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4481 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4482 e = new AddrExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4483 break;
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 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4486 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4487 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4488 e = new AddAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4489 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4490
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4491 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4492 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4493 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4494 e = new MinAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4495 break;
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 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4498 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4499 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4500 e = new PtrExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4501 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4502
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4503 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4504 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4505 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4506 e = new NegExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4507 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4508
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4509 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4510 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4511 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4512 e = new UAddExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4513 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4514
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4515 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4516 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4517 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4518 e = new NotExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4519 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4520
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4521 case TOKtilde:
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 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4524 e = new ComExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4525 break;
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 case TOKdelete:
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 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4530 e = new DeleteExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4531 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4532
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4533 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4534 e = parseNewExp(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4535 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4536
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4537 case TOKcast: // cast(type) expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4538 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4539
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4540 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4541 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4542 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4543 t = parseDeclarator(t,NULL); // ( type )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4544 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4545
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4546 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4547 e = new CastExp(loc, e, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4548 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4549 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4550
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4551 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4552 { Token *tk;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4553
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4554 tk = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4555 #if CCASTSYNTAX
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4556 // If cast
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4557 if (isDeclaration(tk, 0, TOKrparen, &tk))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4558 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4559 tk = peek(tk); // skip over right parenthesis
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4560 switch (tk->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4561 {
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4562 case TOKnot:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4563 tk = peek(tk);
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4564 if (tk->value == TOKis) // !is
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4565 break;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4566 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4567 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4568 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4569 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4570 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4571 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4572 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4573 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4574 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4575 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4576 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4577 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4578 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4579 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4580 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4581 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4582 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4583 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4584 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4585 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4586 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4587 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4588 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4589 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4590 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4591 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4592 #if 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4593 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4594 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4595 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4596 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4597 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4598 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4599 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4600 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4601 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4602 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4603 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4604 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4605 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4606 CASE_BASIC_TYPES: // (type)int.size
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4607 { // (type) una_exp
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4608 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4609
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4610 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4611 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4612 t = parseDeclarator(t,NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4613 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4614
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4615 // if .identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4616 if (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4617 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4618 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4619 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4620 { error("Identifier expected following (type).");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4621 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4622 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4623 e = new TypeDotIdExp(loc, t, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4624 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4625 e = parsePostExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4626 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4627 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4628 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4629 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4630 e = new CastExp(loc, e, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4631 error("C style cast illegal, use %s", e->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4632 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4633 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4634 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4635 }
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 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4638 e = parsePrimaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4639 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4640 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4641 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4642 e = parsePrimaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4643 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4644 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4645 assert(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4646 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4647 }
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 Expression *Parser::parseMulExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4650 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4651 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4652 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4653
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4654 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4655 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4656 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4657 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4658 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4659 case TOKmul: nextToken(); e2 = parseUnaryExp(); e = new MulExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4660 case TOKdiv: nextToken(); e2 = parseUnaryExp(); e = new DivExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4661 case TOKmod: nextToken(); e2 = parseUnaryExp(); e = new ModExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4662
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4663 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4664 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4665 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4666 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4667 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4668 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4669 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4670
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4671 Expression *Parser::parseAddExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4672 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4673 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4674 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4675
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4676 e = parseMulExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4677 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4678 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4679 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4680 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4681 case TOKadd: nextToken(); e2 = parseMulExp(); e = new AddExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4682 case TOKmin: nextToken(); e2 = parseMulExp(); e = new MinExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4683 case TOKtilde: nextToken(); e2 = parseMulExp(); e = new CatExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4684
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4685 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4686 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4687 }
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4691 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4692
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4693 Expression *Parser::parseShiftExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4694 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4695 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4696 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4697
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4698 e = parseAddExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4699 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4700 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4701 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4702 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4703 case TOKshl: nextToken(); e2 = parseAddExp(); e = new ShlExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4704 case TOKshr: nextToken(); e2 = parseAddExp(); e = new ShrExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4705 case TOKushr: nextToken(); e2 = parseAddExp(); e = new UshrExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4706
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4707 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4708 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4709 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4710 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4711 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4712 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4713 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4714
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4715 Expression *Parser::parseRelExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4716 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4717 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4718 enum TOK op;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4719 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4720
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4721 e = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4722 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4723 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4724 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4725 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4726 case TOKlt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4727 case TOKle:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4728 case TOKgt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4729 case TOKge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4730 case TOKunord:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4731 case TOKlg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4732 case TOKleg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4733 case TOKule:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4734 case TOKul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4735 case TOKuge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4736 case TOKug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4737 case TOKue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4738 op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4739 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4740 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4741 e = new CmpExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4742 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4743
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4744 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4745 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4746 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4747 e = new InExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4748 continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4751 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4752 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4753 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4756 }
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 Expression *Parser::parseEqualExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4759 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4760 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4761 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4762 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4763
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4764 e = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4765 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4766 { enum TOK value = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4767
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4768 switch (value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4769 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4770 case TOKequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4771 case TOKnotequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4772 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4773 e2 = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4774 e = new EqualExp(value, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4775 continue;
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 case TOKidentity:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4778 error("'===' is no longer legal, use 'is' instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4779 goto L1;
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 case TOKnotidentity:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4782 error("'!==' is no longer legal, use '!is' instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4783 goto L1;
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 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4786 value = TOKidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4787 goto L1;
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 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4790 // Attempt to identify '!is'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4791 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4792 if (t->value != TOKis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4793 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4794 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4795 value = TOKnotidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4796 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4797
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4798 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4799 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4800 e2 = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4801 e = new IdentityExp(value, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4802 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4803
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4804 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4805 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4806 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4807 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4808 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4809 return e;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4812 Expression *Parser::parseCmpExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4813 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4814 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4815 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4816 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4817
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4818 e = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4819 enum TOK op = 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 switch (op)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4822 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4823 case TOKequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4824 case TOKnotequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4825 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4826 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4827 e = new EqualExp(op, loc, e, e2);
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 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4831 op = TOKidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4832 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4833
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4834 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4835 // Attempt to identify '!is'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4836 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4837 if (t->value != TOKis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4838 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4839 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4840 op = TOKnotidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4841 goto L1;
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 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4844 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4845 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4846 e = new IdentityExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4847 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4848
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4849 case TOKlt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4850 case TOKle:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4851 case TOKgt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4852 case TOKge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4853 case TOKunord:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4854 case TOKlg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4855 case TOKleg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4856 case TOKule:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4857 case TOKul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4858 case TOKuge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4859 case TOKug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4860 case TOKue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4861 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4862 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4863 e = new CmpExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4864 break;
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 TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4867 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4868 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4869 e = new InExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4870 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4871
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4872 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4873 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4874 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4875 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4876 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4877
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4878 Expression *Parser::parseAndExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4879 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4880 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4881 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4882
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4883 if (global.params.Dversion == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4884 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4885 e = parseEqualExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4886 while (token.value == TOKand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4887 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4888 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4889 e2 = parseEqualExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4890 e = new AndExp(loc,e,e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4891 loc = this->loc;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4894 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4895 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4896 e = parseCmpExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4897 while (token.value == TOKand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4898 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4899 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4900 e2 = parseCmpExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4901 e = new AndExp(loc,e,e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4902 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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4905 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4906 }
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 Expression *Parser::parseXorExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4909 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4910 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4911 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4912
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4913 e = parseAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4914 while (token.value == TOKxor)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4915 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4916 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4917 e2 = parseAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4918 e = new XorExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4919 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4920 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4921 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4922
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4923 Expression *Parser::parseOrExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4924 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4925 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4926 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4927
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4928 e = parseXorExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4929 while (token.value == TOKor)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4930 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4931 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4932 e2 = parseXorExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4933 e = new OrExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4934 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4935 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4936 }
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 Expression *Parser::parseAndAndExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4939 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4940 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4941 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4942
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4943 e = parseOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4944 while (token.value == TOKandand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4945 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4946 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4947 e2 = parseOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4948 e = new AndAndExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4949 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4950 return e;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4953 Expression *Parser::parseOrOrExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4954 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4955 Expression *e2;
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 = parseAndAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4959 while (token.value == TOKoror)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4962 e2 = parseAndAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4963 e = new OrOrExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4964 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4965 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4966 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4967
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4968 Expression *Parser::parseCondExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4969 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4970 Expression *e1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4971 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4972 Loc loc = this->loc;
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 e = parseOrOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4975 if (token.value == TOKquestion)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4976 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4977 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4978 e1 = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4979 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4980 e2 = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4981 e = new CondExp(loc, e, e1, e2);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4984 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4985
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4986 Expression *Parser::parseAssignExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4987 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4988 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4989 Loc loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4990
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4991 e = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4992 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4993 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4994 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4995 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4996 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4997 #define X(tok,ector) \
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4998 case tok: nextToken(); e2 = parseAssignExp(); e = new ector(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4999
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5000 X(TOKassign, AssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5001 X(TOKaddass, AddAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5002 X(TOKminass, MinAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5003 X(TOKmulass, MulAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5004 X(TOKdivass, DivAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5005 X(TOKmodass, ModAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5006 X(TOKandass, AndAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5007 X(TOKorass, OrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5008 X(TOKxorass, XorAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5009 X(TOKshlass, ShlAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5010 X(TOKshrass, ShrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5011 X(TOKushrass, UshrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5012 X(TOKcatass, CatAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5013
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5014 #undef X
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5015 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5016 break;
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5019 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5020 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5021 }
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 Expression *Parser::parseExpression()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5024 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5025 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5026 Loc loc = this->loc;
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 //printf("Parser::parseExpression() loc = %d\n", loc.linnum);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5029 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5030 while (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5031 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5032 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5033 e2 = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5034 e = new CommaExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5035 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5036 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5037 return e;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5040
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5041 /*************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5042 * Collect argument list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5043 * Assume current token is '(' or '['.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5046 Expressions *Parser::parseArguments()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5047 { // function call
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5048 Expressions *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5049 Expression *arg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5050 enum TOK endtok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5051
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5052 arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5053 if (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5054 endtok = TOKrbracket;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5055 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5056 endtok = TOKrparen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5057
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5058 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5059 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5060 if (token.value != endtok)
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 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5063 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5064 arg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5065 arguments->push(arg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5066 if (token.value == endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5067 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5068 check(TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5069 }
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 check(endtok);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5072 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5073 return arguments;
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
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5079 Expression *Parser::parseNewExp(Expression *thisexp)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5080 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5081 Expressions *newargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5082 Expressions *arguments = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5083 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5084 Loc loc = this->loc;
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 newargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5088 if (token.value == TOKlparen)
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 newargs = parseArguments();
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 // An anonymous nested class starts with "class"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5094 if (token.value == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5095 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5096 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5097 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5098 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5099
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5100 BaseClasses *baseclasses = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5101 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5102 baseclasses = parseBaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5103
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5104 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5105 ClassDeclaration *cd = new ClassDeclaration(loc, id, baseclasses);
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 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5108 { error("{ members } expected for anonymous class");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5109 cd->members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5110 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5111 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5112 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5113 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5114 Array *decl = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5115 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5116 error("class member expected");
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 cd->members = decl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5119 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5120
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5121 e = new NewAnonClassExp(loc, thisexp, newargs, cd, arguments);
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 #if LTORARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5127 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5128 t = parseBasicType2(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5129 if (t->ty == Taarray)
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 Type *index = ((TypeAArray *)t)->index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5132
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5133 Expression *e = index->toExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5134 if (e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5135 { arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5136 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5137 t = new TypeDArray(t->next);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5138 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5139 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5140 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5141 error("need size of rightmost array, not type %s", index->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5142 return new NullExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5143 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5144 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5145 else if (t->ty == Tsarray)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5146 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5147 TypeSArray *tsa = (TypeSArray *)t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5148 Expression *e = tsa->dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5149
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5150 arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5151 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5152 t = new TypeDArray(t->next);
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 else if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5155 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5156 arguments = parseArguments();
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 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5159 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5160 while (token.value == TOKmul)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5161 { t = new TypePointer(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5162 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5163 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5164 if (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5165 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5166 Expression *e;
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 nextToken();
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 arguments = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5171 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5172 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5173 t = parseDeclarator(t, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5174 t = new TypeDArray(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5175 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5176 else if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5177 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5178 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5179 e = new NewExp(loc, thisexp, newargs, t, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5180 return e;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5183 /**********************************************
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 void Parser::addComment(Dsymbol *s, unsigned char *blockComment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5187 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5188 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
5189 token.lineComment = NULL;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5190 }
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5193 /********************************* ***************************/
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5194