annotate dmd/parse.c @ 846:bc982f1ad106

Merged DMD 1.037 frontend
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Sat, 13 Dec 2008 13:15:31 +0100
parents 041c1596d217
children b30fe7e1dbb9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 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
737
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
352 // LDC better align code locations
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
353 Loc alignloc = loc;
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
354
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
355 s = NULL;
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 == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
358 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
359 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
360 if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
361 n = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
362 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
363 { error("integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
364 n = 1;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
367 check(TOKrparen);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
370 n = global.structalign; // default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
371
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
372 a = parseBlock();
737
041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... }
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 721
diff changeset
373 s = new AlignDeclaration(alignloc, n, a);
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
374 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
375 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
376
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
377 case TOKpragma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
378 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
379 Expressions *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
380
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
381 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
382 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
383 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
384 { error("pragma(identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
385 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
386 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
387 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
388 nextToken();
846
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 737
diff changeset
389 if (token.value == TOKcomma && peekNext() != TOKrparen)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
390 args = parseArguments(); // pragma(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
391 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
392 check(TOKrparen); // pragma(identifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
393
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
394 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
395 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
396 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
397 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
398 s = new PragmaDeclaration(loc, ident, args, a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
399 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
400 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
401
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
402 case TOKdebug:
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 == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
405 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
406 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
407 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
408 s = new DebugSymbol(loc, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
409 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
410 s = new DebugSymbol(loc, (unsigned)token.uns64value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
411 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
412 { error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
413 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
414 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
415 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
416 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
417 error("semicolon expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
418 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
419 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
420 }
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 condition = parseDebugCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
423 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
424
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
425 case TOKversion:
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 == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
428 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
429 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
430 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
431 s = new VersionSymbol(loc, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
432 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
433 s = new VersionSymbol(loc, (unsigned)token.uns64value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
434 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
435 { error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
436 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
437 }
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 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
440 error("semicolon expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
441 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
442 break;
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 condition = parseVersionCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
445 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
446
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
447 Lcondition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
448 a = parseBlock();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
449 aelse = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
450 if (token.value == TOKelse)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
451 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
452 aelse = parseBlock();
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 s = new ConditionalDeclaration(condition, a, aelse);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
455 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
456
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
457 case TOKsemicolon: // empty declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
458 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
459 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
460
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
461 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
462 error("Declaration expected, not '%s'",token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
463 Lerror:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
464 while (token.value != TOKsemicolon && token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
465 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
466 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
467 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
468 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
469 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
470 if (s)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
471 { decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
472 addComment(s, comment);
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 } while (!once);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
475 return decldefs;
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
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 * Parse declarations after an align, protection, or extern decl.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
483 Array *Parser::parseBlock()
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 Array *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
486 Dsymbol *s;
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 //printf("parseBlock()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
489 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
490 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
491 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
492 error("declaration expected following attribute, not ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
493 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
494 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
495
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
496 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
497 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
498 a = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
499 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
500 { /* { */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
501 error("matching '}' expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
502 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
503 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
504 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
505 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
506
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
507 case TOKcolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
508 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
509 #if 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
510 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
511 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
512 a = parseDeclDefs(0); // grab declarations up to closing curly bracket
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
513 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
514 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
515
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
516 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
517 a = parseDeclDefs(1);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
518 break;
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 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
521 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
522
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 * Parse a static assertion.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
527 StaticAssert *Parser::parseStaticAssert()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
528 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
529 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
530 Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
531 Expression *msg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
532
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
533 //printf("parseStaticAssert()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
534 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
535 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
536 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
537 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
538 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
539 msg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
540 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
541 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
542 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
543 return new StaticAssert(loc, exp, msg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
544 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
545
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
546 /***********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
547 * Parse typeof(expression).
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
548 * Current token is on the 'typeof'.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
549 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
550
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
551 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
552 TypeQualified *Parser::parseTypeof()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
553 { TypeQualified *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
554 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
555
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
556 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
557 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
558 if (token.value == TOKreturn) // typeof(return)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
561 t = new TypeReturn(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
562 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
563 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
564 { Expression *exp = parseExpression(); // typeof(expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
565 t = new TypeTypeof(loc, exp);
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 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
568 return t;
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 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
571
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
572 /***********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
573 * Parse extern (linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
574 * The parser is on the 'extern' token.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
577 enum LINK Parser::parseLinkage()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
578 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
579 enum LINK link = LINKdefault;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
580 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
581 assert(token.value == TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
582 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
583 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
584 { Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
585
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
586 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
587 if (id == Id::Windows)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
588 link = LINKwindows;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
589 else if (id == Id::Pascal)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
590 link = LINKpascal;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
591 else if (id == Id::D)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
592 link = LINKd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
593 else if (id == Id::C)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
594 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
595 link = LINKc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
596 if (token.value == TOKplusplus)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
597 { link = LINKcpp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
598 nextToken();
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
601 else if (id == Id::System)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
602 {
721
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
603 // LDC we configure target at runtime
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
604 if (global.params.os == OSWindows)
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
605 link = LINKwindows;
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
606 else
51797efb6975 Make extern(System) configure the calling convention on LDC runtime, not when building LDC.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 717
diff changeset
607 link = LINKc;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
608 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
609 else
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 error("valid linkage identifiers are D, C, C++, Pascal, Windows, System");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
612 link = LINKd;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
615 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
616 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
617 link = LINKd; // default
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 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
620 return link;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
621 }
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 * Parse a debug conditional
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
627 Condition *Parser::parseDebugCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
628 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
629 Condition *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
630
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
631 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
632 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
633 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
634 unsigned level = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
635 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
636
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
637 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
638 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
639 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
640 level = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
641 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
642 error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
643 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
644 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
645 c = new DebugCondition(mod, level, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
646 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
647 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
648 c = new DebugCondition(mod, 1, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
649 return c;
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 }
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 * Parse a version conditional
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
657 Condition *Parser::parseVersionCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
658 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
659 Condition *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
660 unsigned level = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
661 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
662
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
663 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
664 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
665 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
666 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
667 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
668 else if (token.value == TOKint32v)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
669 level = (unsigned)token.uns64value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
670 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
671 /* Allow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
672 * version (unittest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
673 * even though unittest is a keyword
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
674 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
675 else if (token.value == TOKunittest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
676 id = Lexer::idPool(Token::toChars(TOKunittest));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
677 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
678 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
679 error("identifier or integer expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
680 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
681 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
682
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
683 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
684 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
685 error("(condition) expected following version");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
686 c = new VersionCondition(mod, level, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
687 return c;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
690
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
691 /***********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
692 * static if (expression)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
693 * body
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
694 * else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
695 * body
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
696 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
697
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
698 Condition *Parser::parseStaticIfCondition()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
699 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
700 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
701 Array *aif;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
702 Array *aelse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
703 Loc loc = this->loc;
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 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
707 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
708 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
709 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
710 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
711 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
712 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
713 { error("(expression) expected following static if");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
714 exp = NULL;
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 condition = new StaticIfCondition(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
717 return condition;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
720
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
721 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
722 * Parse a constructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
723 * this(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
724 * Current token is 'this'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
727 CtorDeclaration *Parser::parseCtor()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
728 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
729 CtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
730 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
731 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
732 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
733
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
734 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
735 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
736 f = new CtorDeclaration(loc, 0, arguments, varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
737 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
738 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
739 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
740
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
741 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
742 * Parse a destructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
743 * ~this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
744 * Current token is '~'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
747 DtorDeclaration *Parser::parseDtor()
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 DtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
750 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
751
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
752 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
753 check(TOKthis);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
754 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
755 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
756
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
757 f = new DtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
758 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
759 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
760 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
761
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
762 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
763 * Parse a static constructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
764 * static this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
765 * Current token is 'this'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
768 StaticCtorDeclaration *Parser::parseStaticCtor()
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 StaticCtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
771 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
772
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
773 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
774 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
775 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
776
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
777 f = new StaticCtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
778 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
779 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
780 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
781
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
782 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
783 * Parse a static destructor definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
784 * static ~this() { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
785 * Current token is '~'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
788 StaticDtorDeclaration *Parser::parseStaticDtor()
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 StaticDtorDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
791 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
792
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
793 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
794 check(TOKthis);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
795 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
796 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
797
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
798 f = new StaticDtorDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
799 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
800 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
801 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
802
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
803 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
804 * Parse an invariant definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
805 * invariant { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
806 * Current token is 'invariant'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
809 InvariantDeclaration *Parser::parseInvariant()
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 InvariantDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
812 Loc loc = this->loc;
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 if (token.value == TOKlparen) // optional ()
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
818 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
819 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
820
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
821 f = new InvariantDeclaration(loc, 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
822 f->fbody = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
823 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
824 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
825
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
826 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
827 * Parse a unittest definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
828 * unittest { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
829 * Current token is 'unittest'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
832 UnitTestDeclaration *Parser::parseUnitTest()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
833 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
834 UnitTestDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
835 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
836 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
837
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
838 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
839
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
840 body = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
841
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
842 f = new UnitTestDeclaration(loc, this->loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
843 f->fbody = body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
844 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
845 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
846
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
847 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
848 * Parse a new definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
849 * new(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
850 * Current token is 'new'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
853 NewDeclaration *Parser::parseNew()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
854 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
855 NewDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
856 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
857 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
858 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
859
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
860 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
861 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
862 f = new NewDeclaration(loc, 0, arguments, varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
863 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
864 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
865 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
866
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
867 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
868 * Parse a delete definition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
869 * delete(arguments) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
870 * Current token is 'delete'.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
873 DeleteDeclaration *Parser::parseDelete()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
874 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
875 DeleteDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
876 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
877 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
878 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
879
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
880 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
881 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
882 if (varargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
883 error("... not allowed in delete function parameter list");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
884 f = new DeleteDeclaration(loc, 0, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
885 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
886 return f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
887 }
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 * Parse parameter list.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
893 Arguments *Parser::parseParameters(int *pvarargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
894 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
895 Arguments *arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
896 int varargs = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
897 int hasdefault = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
898
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
899 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
900 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
901 { Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
902 Identifier *ai = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
903 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
904 Argument *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
905 unsigned storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
906 Expression *ae;
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 storageClass = STCin; // parameter is "in" by default
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
909 switch (token.value)
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 TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
912 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
913
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
914 case TOKdotdotdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
915 varargs = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
916 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
917 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
918
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
919 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
920 storageClass = STCin;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
921 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
922 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
923
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
924 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
925 storageClass = STCout;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
926 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
927 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
928
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
929 case TOKinout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
930 case TOKref:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
931 storageClass = STCref;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
932 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
933 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
934
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
935 case TOKlazy:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
936 storageClass = STClazy;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
937 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
938 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
939
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
940 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
941 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
942 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
943 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
944 ae = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
945 if (token.value == TOKassign) // = defaultArg
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
946 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
947 ae = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
948 hasdefault = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
949 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
950 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
951 { if (hasdefault)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
952 error("default argument expected for %s",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
953 ai ? ai->toChars() : at->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
954 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
955 if (token.value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
956 { /* This is:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
957 * at ai ...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
958 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
959
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
960 if (storageClass & (STCout | STCref))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
961 error("variadic argument cannot be out or ref");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
962 varargs = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
963 a = new Argument(storageClass, at, ai, ae);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
964 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
965 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
966 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
967 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
968 a = new Argument(storageClass, at, ai, ae);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
969 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
970 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
971 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
972 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
973 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
974 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
975 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
976 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
977 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
978 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
979 *pvarargs = varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
980 return arguments;
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 /*************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
985 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
986
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
987 EnumDeclaration *Parser::parseEnum()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
988 { EnumDeclaration *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
989 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
990 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
991 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
992
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
993 //printf("Parser::parseEnum()\n");
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 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
996 { id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
997 nextToken();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1000 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1001
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1002 if (token.value == TOKcolon)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1005 t = parseBasicType();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1008 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1009
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1010 e = new EnumDeclaration(loc, id, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1011 if (token.value == TOKsemicolon && id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1012 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1013 else if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1014 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1015 //printf("enum definition\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1016 e->members = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1017 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1018 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1019 while (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1020 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1021 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1022 { EnumMember *em;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1023 Expression *value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1024 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1025
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1026 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1027 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1028 value = NULL;
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 if (token.value == TOKassign)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1033 value = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1034 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1035 em = new EnumMember(loc, ident, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1036 e->members->push(em);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1037 if (token.value == TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1038 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1039 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1040 { addComment(em, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1041 comment = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1042 check(TOKcomma);
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 addComment(em, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1045 comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1046 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1047 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1048 { error("enum member expected");
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1052 nextToken();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1055 error("enum declaration is invalid");
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 //printf("-parseEnum() %s\n", e->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1058 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1059 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1060
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1061 Dsymbol *Parser::parseAggregate()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1062 { AggregateDeclaration *a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1063 int anon = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1064 enum TOK tok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1065 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1066 TemplateParameters *tpl = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1067
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1068 //printf("Parser::parseAggregate()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1069 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1070 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1071 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1072 { id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1073 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1074 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1075 { id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1076 nextToken();
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 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1079 { // Class template declaration.
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 // Gather template parameter list
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1082 tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1083 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1084 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1085
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1086 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1087 switch (tok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1088 { case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1089 case TOKinterface:
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 if (!id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1092 error("anonymous classes not allowed");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1093
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1094 // Collect base class(es)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1095 BaseClasses *baseclasses = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1096 if (token.value == TOKcolon)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1099 baseclasses = parseBaseClasses();
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 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1102 error("members expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1103 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1104
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1105 if (tok == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1106 a = new ClassDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1107 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1108 a = new InterfaceDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1109 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1110 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1111
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1112 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1113 if (id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1114 a = new StructDeclaration(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1115 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1116 anon = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1117 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1118
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1119 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1120 if (id)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1121 a = new UnionDeclaration(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1122 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1123 anon = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1124 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1125
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1126 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1127 assert(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1128 break;
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 if (a && token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1131 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1132 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1133 else if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1134 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1135 //printf("aggregate definition\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1136 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1137 Array *decl = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1138 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1139 error("} expected following member declarations in aggregate");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1140 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1141 if (anon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1142 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1143 /* Anonymous structs/unions are more like attributes.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1144 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1145 return new AnonDeclaration(loc, anon - 1, 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 a->members = decl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1149 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1150 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1151 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1152 error("{ } expected following aggregate declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1153 a = new StructDeclaration(loc, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1154 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1155
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1156 if (tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1157 { Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1158 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1159
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1160 // Wrap a template around the aggregate declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1161 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1162 decldefs->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1163 tempdecl = new TemplateDeclaration(loc, id, tpl, decldefs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1164 return tempdecl;
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 return a;
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 /*******************************************
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1173 BaseClasses *Parser::parseBaseClasses()
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 enum PROT protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1176 BaseClasses *baseclasses = new BaseClasses();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1177
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1178 for (; 1; nextToken())
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1179 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1180 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1181 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1182 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1183 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1184 case TOKprivate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1185 protection = PROTprivate;
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 TOKpackage:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1188 protection = PROTpackage;
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 TOKprotected:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1191 protection = PROTprotected;
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 case TOKpublic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1194 protection = PROTpublic;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1195 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1196 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1197 error("base classes expected instead of %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1198 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1199 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1200 BaseClass *b = new BaseClass(parseBasicType(), protection);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1201 baseclasses->push(b);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1202 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1203 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1204 protection = PROTpublic;
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 return baseclasses;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1207 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1208
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1209 /**************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1210 * Parse constraint.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1211 * Constraint is of the form:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1212 * if ( ConstraintExpression )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1213 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1214
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1215 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1216 Expression *Parser::parseConstraint()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1217 { Expression *e = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1218
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1219 if (token.value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1220 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1221 nextToken(); // skip over 'if'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1222 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1223 e = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1224 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1225 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1226 return e;
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 #endif
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 * Parse a TemplateDeclaration.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1234 TemplateDeclaration *Parser::parseTemplateDeclaration()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1235 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1236 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1237 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1238 TemplateParameters *tpl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1239 Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1240 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1241
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1242 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1243 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1244 { error("TemplateIdentifier expected following template");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1245 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1246 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1247 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1248 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1249 tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1250 if (!tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1251 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1252
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1253 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1254 { error("members of template declaration expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1255 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1256 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1257 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1258 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1259 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1260 decldefs = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1261 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1262 { error("template member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1263 goto Lerr;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1266 }
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 tempdecl = new TemplateDeclaration(loc, id, tpl, decldefs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1269 return tempdecl;
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 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1272 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1273 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1274
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 * Parse template parameter list.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1279 TemplateParameters *Parser::parseTemplateParameterList()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1280 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1281 TemplateParameters *tpl = new TemplateParameters();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1282
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1283 if (token.value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1284 { error("parenthesized TemplateParameterList expected following TemplateIdentifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1285 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1286 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1287 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1288
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1289 // Get array of TemplateParameters
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1290 if (token.value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1291 { int isvariadic = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1292
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1293 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1294 { TemplateParameter *tp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1295 Identifier *tp_ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1296 Type *tp_spectype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1297 Type *tp_valtype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1298 Type *tp_defaulttype = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1299 Expression *tp_specvalue = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1300 Expression *tp_defaultvalue = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1301 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1302
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1303 // Get TemplateParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1304
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1305 // 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
1306 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1307 if (token.value == TOKalias)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1308 { // AliasParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1309 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1310 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1311 { error("Identifier expected for template parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1312 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1313 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1314 tp_ident = token.ident;
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 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1317 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1318 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1319 tp_spectype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1320 tp_spectype = parseDeclarator(tp_spectype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1321 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1322 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1323 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1324 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1325 tp_defaulttype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1326 tp_defaulttype = parseDeclarator(tp_defaulttype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1327 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1328 tp = new TemplateAliasParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1329 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1330 else if (t->value == TOKcolon || t->value == TOKassign ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1331 t->value == TOKcomma || t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1332 { // TypeParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1333 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1334 { error("Identifier expected for template parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1335 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1336 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1337 tp_ident = token.ident;
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 if (token.value == TOKcolon) // : Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1340 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1341 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1342 tp_spectype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1343 tp_spectype = parseDeclarator(tp_spectype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1344 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1345 if (token.value == TOKassign) // = Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1346 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1347 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1348 tp_defaulttype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1349 tp_defaulttype = parseDeclarator(tp_defaulttype, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1350 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1351 tp = new TemplateTypeParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1352 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1353 else if (token.value == TOKidentifier && t->value == TOKdotdotdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1354 { // ident...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1355 if (isvariadic)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1356 error("variadic template parameter must be last");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1357 isvariadic = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1358 tp_ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1359 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1360 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1361 tp = new TemplateTupleParameter(loc, tp_ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1362 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1363 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1364 else if (token.value == TOKthis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1365 { // ThisParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1366 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1367 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1368 { error("identifier expected for template this parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1369 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1370 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1371 tp_ident = token.ident;
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 if (token.value == TOKcolon) // : Type
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1376 tp_spectype = parseType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1377 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1378 if (token.value == TOKassign) // = Type
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1381 tp_defaulttype = parseType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1382 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1383 tp = new TemplateThisParameter(loc, tp_ident, tp_spectype, tp_defaulttype);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1384 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1385 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1386 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1387 { // ValueParameter
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1388 tp_valtype = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1389 tp_valtype = parseDeclarator(tp_valtype, &tp_ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1390 if (!tp_ident)
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 error("identifier expected for template value parameter");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1393 tp_ident = new Identifier("error", TOKidentifier);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1394 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1395 if (token.value == TOKcolon) // : CondExpression
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1398 tp_specvalue = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1399 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1400 if (token.value == TOKassign) // = CondExpression
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1403 tp_defaultvalue = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1404 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1405 tp = new TemplateValueParameter(loc, tp_ident, tp_valtype, tp_specvalue, tp_defaultvalue);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1406 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1407 tpl->push(tp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1408 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1409 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1410 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1411 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1412 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1413 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1414 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1415 return tpl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1416 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1417
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1418 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1419 * Parse template mixin.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1420 * mixin Foo;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1421 * mixin Foo!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1422 * mixin a.b.c!(args).Foo!(args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1423 * mixin Foo!(args) identifier;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1424 * mixin typeof(expr).identifier!(args);
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1427 Dsymbol *Parser::parseMixin()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1428 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1429 TemplateMixin *tm;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1430 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1431 Type *tqual;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1432 Objects *tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1433 Array *idents;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1434
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1435 //printf("parseMixin()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1436 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1437 tqual = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1438 if (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1439 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1440 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1441 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1442 else
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 if (token.value == TOKtypeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1445 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1446
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1447 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1448 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1449 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1450 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1451 tqual = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1452 check(TOKdot);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1453 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1454 if (token.value != TOKidentifier)
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 error("identifier expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1457 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1458 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1459 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1460 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1461 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1462 }
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 idents = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1465 while (1)
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 tiargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1468 if (token.value == TOKnot)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1471 tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1472 }
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 (token.value != TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1475 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1476
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1477 if (tiargs)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1478 { TemplateInstance *tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1479 tempinst->tiargs = tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1480 id = (Identifier *)tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1481 tiargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1482 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1483 idents->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1484
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1485 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1486 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1487 { error("identifier expected following '.' instead of '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1488 break;
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 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1491 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1492 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1493 idents->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1494
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1495 if (token.value == TOKidentifier)
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 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1498 nextToken();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1501 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1502
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1503 tm = new TemplateMixin(loc, id, tqual, idents, tiargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1504 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1505 error("';' expected after mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1506 nextToken();
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 return tm;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1509 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1510
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1511 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1512 * Parse template argument list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1513 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1514 * current token is opening '('
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1515 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1516 * current token is one after closing ')'
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1519 Objects *Parser::parseTemplateArgumentList()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1520 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1521 //printf("Parser::parseTemplateArgumentList()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1522 Objects *tiargs = new Objects();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1523 if (token.value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1524 { error("!(TemplateArgumentList) expected following TemplateIdentifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1525 return tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1526 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1527 nextToken();
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 // Get TemplateArgumentList
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1530 if (token.value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1531 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1532 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1533 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1534 // See if it is an Expression or a Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1535 if (isDeclaration(&token, 0, TOKreserved, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1536 { // Type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1537 Type *ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1538
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1539 // Get TemplateArgument
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1540 ta = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1541 ta = parseDeclarator(ta, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1542 tiargs->push(ta);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1543 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1544 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1545 { // Expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1546 Expression *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 ea = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1549 tiargs->push(ea);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1550 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1551 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1552 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1553 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1554 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1555 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1556 check(TOKrparen, "template argument list");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1557 return tiargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1558 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1559
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1560 Import *Parser::parseImport(Array *decldefs, int isstatic)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1561 { Import *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1562 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1563 Identifier *aliasid = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1564 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1565 Loc loc;
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 //printf("Parser::parseImport()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1568 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1569 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1570 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1571 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1572 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1573 { error("Identifier expected following import");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1574 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1575 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1576
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1577 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1578 a = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1579 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1580 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1581 if (!aliasid && token.value == TOKassign)
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 aliasid = id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1584 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1585 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1586 while (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1587 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1588 if (!a)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1589 a = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1590 a->push(id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1591 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1592 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1593 { error("Identifier expected following package");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1594 break;
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 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1597 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1598 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1599
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1600 s = new Import(loc, a, token.ident, aliasid, isstatic);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1601 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1602
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1603 /* Look for
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1604 * : alias=name, alias=name;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1605 * syntax.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1606 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1607 if (token.value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1608 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1609 do
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1610 { Identifier *name;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1611 Identifier *alias;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1612
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1613 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1614 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1615 { error("Identifier expected following :");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1616 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1617 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1618 alias = token.ident;
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 == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1621 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1622 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1623 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1624 { error("Identifier expected following %s=", alias->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1625 break;
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 name = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1628 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1629 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1630 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1631 { name = alias;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1632 alias = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1633 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1634 s->addAlias(name, alias);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1635 } while (token.value == TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1636 break; // no comma-separated imports of this form
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1637 }
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 aliasid = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1640 } while (token.value == TOKcomma);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1641
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1642 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1643 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1644 else
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 error("';' expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1647 nextToken();
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 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1651 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1652
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1653 Type *Parser::parseBasicType()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1654 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1655 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1656 TypeQualified *tid;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1657 TemplateInstance *tempinst;
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 //printf("parseBasicType()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1660 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1661 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1662 CASE_BASIC_TYPES_X(t):
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1663 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1664 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1665
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1666 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1667 id = token.ident;
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 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1670 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1671 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1672 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1673 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1674 tid = new TypeInstance(loc, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1675 goto Lident2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1676 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1677 Lident:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1678 tid = new TypeIdentifier(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1679 Lident2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1680 while (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1681 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1682 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1683 { error("identifier expected following '.' instead of '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1684 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1685 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1686 id = token.ident;
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 if (token.value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1689 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1690 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1691 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1692 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1693 tid->addIdent((Identifier *)tempinst);
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1696 tid->addIdent(id);
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 t = tid;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1699 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1700
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1701 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1702 // Leading . as in .foo
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1703 id = Id::empty;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1704 goto Lident;
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 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1707 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1708
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1709 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1710 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1711 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1712 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1713 tid = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1714 goto Lident2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1715 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1716
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1717 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1718 error("basic type expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1719 t = Type::tint32;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1720 break;
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 return t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1723 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1724
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1725 /******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1726 * Parse things that follow the initial type t.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1727 * t *
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1728 * t []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1729 * t [type]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1730 * t [expression]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1731 * t [expression .. expression]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1732 * t function
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1733 * t delegate
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1736 Type *Parser::parseBasicType2(Type *t)
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 Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1739 Type *ta;
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 //printf("parseBasicType2()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1742 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1743 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1744 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1745 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1746 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1747 t = new TypePointer(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1748 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1749 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1750
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1751 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1752 #if LTORARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1753 // Handle []. Make sure things like
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1754 // int[3][1] a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1755 // is (array[1] of array[3] of int)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1756 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1757 if (token.value == TOKrbracket)
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 t = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1760 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1761 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1762 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1763 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1764 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1765
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1766 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1767 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1768 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1769 t = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1770 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1771 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1772 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1773 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1774 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1775 inBrackets++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1776 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1777 if (token.value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1778 { Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1779
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1780 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1781 e2 = parseExpression(); // [ exp .. exp ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1782 t = new TypeSlice(t, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1783 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1784 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1785 t = new TypeSArray(t,e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1786 inBrackets--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1787 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1788 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1789 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1790 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1791 // Handle []. Make sure things like
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1792 // int[3][1] a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1793 // is (array[3] of array[1] of int)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1794 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1795 while (token.value == TOKlbracket)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1798 if (token.value == TOKrbracket)
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 ta = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1801 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1802 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1803 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1804 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1805 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1806
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1807 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1808 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1809 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1810 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1811 ta = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1812 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1813 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1814 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1815 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1816 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1817 ta = new TypeSArray(t,e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1818 check(TOKrbracket);
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 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1821 for (pt = &ts; *pt != t; pt = &(*pt)->next)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1822 ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1823 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1824 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1825 t = ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1826 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1827 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1828
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1829 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1830 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1831 { // Handle delegate declaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1832 // t delegate(parameter list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1833 // t function(parameter list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1834 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1835 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1836 enum TOK save = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1837
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1838 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1839 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1840 t = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1841 if (save == TOKdelegate)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1842 t = new TypeDelegate(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1843 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1844 t = new TypePointer(t); // pointer to function
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1845 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1846 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1847
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1848 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1849 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1850 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1851 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1852 break;
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 return ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1855 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1856
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1857 Type *Parser::parseDeclarator(Type *t, Identifier **pident, TemplateParameters **tpl)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1858 { Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1859 Type *ta;
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 //printf("parseDeclarator(tpl = %p)\n", tpl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1862 t = parseBasicType2(t);
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 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1865 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1866
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1867 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1868 if (pident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1869 *pident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1870 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1871 error("unexpected identifer '%s' in declarator", token.ident->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1872 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1873 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1874 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1875
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1876 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1877 /* Parse things with parentheses around the identifier, like:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1878 * int (*ident[3])[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1879 * although the D style would be:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1880 * int[]*[3] ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1881 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1882 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1883 ts = parseDeclarator(t, pident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1884 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1885 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1886
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1887 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1888 ts = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1889 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1892 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1893 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1894 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1895 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1896 #if CARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1897 /* Support C style array syntax:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1898 * int ident[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1899 * as opposed to D-style:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1900 * int[] ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1901 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1902 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1903 { // This is the old C-style post [] syntax.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1904 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1905 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1906 { // It's a dynamic array
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1907 ta = new TypeDArray(t); // []
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1908 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1909 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1910 else if (isDeclaration(&token, 0, TOKrbracket, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1911 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1912 Type *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1913
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1914 //printf("it's an associative array\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1915 index = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1916 index = parseDeclarator(index, NULL); // [ type ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1917 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1918 ta = new TypeAArray(t, index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1919 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1920 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1921 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1922 //printf("it's [expression]\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1923 Expression *e = parseExpression(); // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1924 ta = new TypeSArray(t, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1925 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1926 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1927 /* Insert ta into
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1928 * ts -> ... -> t
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1929 * so that
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1930 * ts -> ... -> ta -> t
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 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1933 for (pt = &ts; *pt != t; pt = &(*pt)->next)
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 *pt = ta;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1936 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1937 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1938 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1939 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1940 { Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1941 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1942
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1943 if (tpl)
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 /* Look ahead to see if this is (...)(...),
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1946 * i.e. a function template declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1947 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1948 if (peekPastParen(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1949 { // It's a function template declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1950 //printf("function template declaration\n");
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 // Gather template parameter list
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1953 *tpl = parseTemplateParameterList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1954 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1955 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1956
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1957 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1958 Type *ta = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1959 Type **pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1960 for (pt = &ts; *pt != t; pt = &(*pt)->next)
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 *pt = ta;
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 break;
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 return ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1970 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1971
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1972 /**********************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1973 * Parse Declarations.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1974 * These can be:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1975 * 1. declarations at global/class level
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1976 * 2. declarations at statement level
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1977 * Return array of Declaration *'s.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1980 Array *Parser::parseDeclarations()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1981 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1982 enum STC storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1983 enum STC stc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1984 Type *ts;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1985 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1986 Type *tfirst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1987 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1988 Array *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1989 enum TOK tok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1990 unsigned char *comment = token.blockComment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1991 enum LINK link = linkage;
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 //printf("parseDeclarations()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1994 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1995 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1996 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1997 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1998 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
1999 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2000 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2001
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2002 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2003 tok = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2004 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2005 }
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 storage_class = STCundefined;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2008 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2009 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2010 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2011 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2012 case TOKconst: stc = STCconst; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2013 case TOKstatic: stc = STCstatic; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2014 case TOKfinal: stc = STCfinal; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2015 case TOKauto: stc = STCauto; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2016 case TOKscope: stc = STCscope; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2017 case TOKoverride: stc = STCoverride; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2018 case TOKabstract: stc = STCabstract; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2019 case TOKsynchronized: stc = STCsynchronized; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2020 case TOKdeprecated: stc = STCdeprecated; goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2021 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2022 if (storage_class & stc)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2023 error("redundant storage class '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2024 storage_class = (STC) (storage_class | stc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2025 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2026 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2027
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2028 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2029 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2030 { stc = STCextern;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2031 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2032 }
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 link = parseLinkage();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2035 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2036
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2037 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2038 break;
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 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2043 a = new Array();
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 /* Look for auto initializers:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2046 * storage_class identifier = initializer;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2047 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2048 while (storage_class &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2049 token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2050 peek(&token)->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2051 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2052 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2053 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2054 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2055 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2056 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2057 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2058 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2059 if (token.value == TOKsemicolon)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2062 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2063 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2064 else if (token.value == TOKcomma)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2067 if (!(token.value == TOKidentifier && peek(&token)->value == TOKassign))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2068 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2069 error("Identifier expected following comma");
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 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2073 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2074 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2075 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2076 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2077 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2078
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2079 if (token.value == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2080 { AggregateDeclaration *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2081
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2082 s = (AggregateDeclaration *)parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2083 s->storage_class |= storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2084 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2085 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2086 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2087 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2088
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2089 ts = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2090 ts = parseBasicType2(ts);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2091 tfirst = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2092
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2093 while (1)
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 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2096 TemplateParameters *tpl = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2097
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2098 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2099 t = parseDeclarator(ts, &ident, &tpl);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2100 assert(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2101 if (!tfirst)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2102 tfirst = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2103 else if (t != tfirst)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2104 error("multiple declarations must have the same type, not %s and %s",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2105 tfirst->toChars(), t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2106 if (!ident)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2107 error("no identifier for declarator %s", t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2108
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2109 if (tok == TOKtypedef || tok == TOKalias)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2110 { Declaration *v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2111 Initializer *init;
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 init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2114 if (token.value == TOKassign)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2117 init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2118 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2119 if (tok == TOKtypedef)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2120 v = new TypedefDeclaration(loc, ident, t, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2121 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2122 { if (init)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2123 error("alias cannot have initializer");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2124 v = new AliasDeclaration(loc, ident, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2125 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2126 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2127 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2128 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2129 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2130 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2131 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2132 ax->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2133 Dsymbol *s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2134 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2135 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2136 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2137 { case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2138 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2139 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2140 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2141
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2142 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2143 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2144 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2145 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2146
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2147 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2148 error("semicolon expected to close %s declaration", Token::toChars(tok));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2149 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2150 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2151 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2152 else if (t->ty == Tfunction)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2153 { FuncDeclaration *f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2154 Dsymbol *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2155
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2156 f = new FuncDeclaration(loc, 0, ident, storage_class, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2157 addComment(f, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2158 parseContracts(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2159 addComment(f, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2160 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2161 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2162 s = f;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2163 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2164 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2165 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2166 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2167 ax->push(f);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2168 s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2169 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2170 if (tpl) // it's a function template
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2171 { Array *decldefs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2172 TemplateDeclaration *tempdecl;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2173
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2174 // Wrap a template around the aggregate declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2175 decldefs = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2176 decldefs->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2177 tempdecl = new TemplateDeclaration(loc, s->ident, tpl, decldefs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2178 s = tempdecl;
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 addComment(s, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2181 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2182 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2183 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2184 { VarDeclaration *v;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2185 Initializer *init;
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 init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2188 if (token.value == TOKassign)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2191 init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2192 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2193 v = new VarDeclaration(loc, t, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2194 v->storage_class = storage_class;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2195 if (link == linkage)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2196 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2197 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2198 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2199 Array *ax = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2200 ax->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2201 Dsymbol *s = new LinkDeclaration(link, ax);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2202 a->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2203 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2204 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2205 { case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2206 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2207 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2208 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2209
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2210 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2211 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2212 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2213 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2214
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2215 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2216 error("semicolon expected, not '%s'", token.toChars());
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2220 break;
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 return a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2223 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2224
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2225 /*****************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2226 * Parse auto declarations of the form:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2227 * storageClass ident = init, ident = init, ... ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2228 * and return the array of them.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2229 * Starts with token on the first ident.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2230 * Ends with scanner past closing ';'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2231 */
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 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2234 Array *Parser::parseAutoDeclarations(unsigned storageClass, unsigned char *comment)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2235 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2236 Array *a = new Array;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2237
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2238 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2239 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2240 Identifier *ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2241 nextToken(); // skip over ident
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2242 assert(token.value == TOKassign);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2243 nextToken(); // skip over '='
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2244 Initializer *init = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2245 VarDeclaration *v = new VarDeclaration(loc, NULL, ident, init);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2246 v->storage_class = storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2247 a->push(v);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2248 if (token.value == TOKsemicolon)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2251 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2252 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2253 else if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2254 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2255 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2256 if (token.value == TOKidentifier &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2257 peek(&token)->value == TOKassign)
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 addComment(v, comment);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2260 continue;
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("Identifier expected following comma");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2264 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2265 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2266 error("semicolon expected following auto declaration, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2267 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2268 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2269 return a;
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 #endif
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 * Parse contracts following function declaration.
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2277 void Parser::parseContracts(FuncDeclaration *f)
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 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2280 enum LINK linksave = linkage;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2281
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2282 // The following is irrelevant, as it is overridden by sc->linkage in
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2283 // TypeFunction::semantic
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2284 linkage = LINKd; // nested functions have D linkage
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2285 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2286 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2287 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2288 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2289 if (f->frequire || f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2290 error("missing body { ... } after in or out");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2291 f->fbody = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2292 f->endloc = endloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2293 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2294
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2295 case TOKbody:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2296 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2297 f->fbody = parseStatement(PScurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2298 f->endloc = endloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2299 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2300
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2301 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2302 if (f->frequire || f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2303 error("missing body { ... } after in or out");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2304 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2305 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2306
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2307 #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
2308 // int x, y, foo(), z;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2309 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2310 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2311 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2312 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2313
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2314 #if 0 // Dumped feature
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2315 case TOKthrow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2316 if (!f->fthrows)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2317 f->fthrows = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2318 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2319 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2320 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2321 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2322 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2323 f->fthrows->push(tb);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2324 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2325 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2326 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2327 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2328 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2329 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2330 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2331 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2332 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2333
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2334 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2335 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2336 if (f->frequire)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2337 error("redundant 'in' statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2338 f->frequire = parseStatement(PScurly | PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2339 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2340
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2341 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2342 // parse: out (identifier) { statement }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2343 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2344 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2345 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2346 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2347 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2348 error("(identifier) following 'out' expected, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2349 f->outId = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2350 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2351 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2352 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2353 if (f->fensure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2354 error("redundant 'out' statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2355 f->fensure = parseStatement(PScurly | PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2356 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2357
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2358 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2359 error("semicolon expected following function declaration");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2360 break;
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 linkage = linksave;
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 /*****************************************
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2368 Initializer *Parser::parseInitializer()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2369 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2370 StructInitializer *is;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2371 ArrayInitializer *ia;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2372 ExpInitializer *ie;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2373 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2374 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2375 Initializer *value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2376 int comma;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2377 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2378 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2379 int braces;
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2380 int brackets;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2381
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2382 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2383 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2384 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2385 /* Scan ahead to see if it is a struct initializer or
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2386 * a function literal.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2387 * If it contains a ';', it is a function literal.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2388 * Treat { } as a struct initializer.
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 braces = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2391 for (t = peek(&token); 1; t = peek(t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2392 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2393 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2394 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2395 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2396 case TOKreturn:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2397 goto Lexpression;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2398
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2399 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2400 braces++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2401 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2402
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2403 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2404 if (--braces == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2405 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2406 continue;
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 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2409 break;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2412 continue;
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2415 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2416
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2417 is = new StructInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2418 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2419 comma = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2420 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2421 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2422 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2423 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2424 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2425 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2426 error("comma expected separating field initializers");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2427 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2428 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2429 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2430 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2431 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2432 nextToken(); // skip over ':'
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2435 { id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2436 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2437 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2438 is->addInit(id, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2439 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2440 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2441
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2442 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2443 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2444 comma = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2445 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2446
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2447 case TOKrcurly: // allow trailing comma's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2448 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2449 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2450
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2451 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2452 error("found EOF instead of initializer");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2453 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2454
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2455 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2456 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2457 is->addInit(NULL, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2458 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2459 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2460 //error("found '%s' instead of field initializer", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2461 //break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2462 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2463 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2464 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2465 return is;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2466
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2467 case TOKlbracket:
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2468 /* 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
2469 * an expression.
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2470 * 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
2471 */
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2472 brackets = 1;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2473 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
2474 {
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2475 switch (t->value)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2476 {
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2477 case TOKlbracket:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2478 brackets++;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2479 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2480
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2481 case TOKrbracket:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2482 if (--brackets == 0)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2483 { t = peek(t);
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2484 if (t->value != TOKsemicolon &&
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2485 t->value != TOKcomma &&
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2486 t->value != TOKrcurly)
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2487 goto Lexpression;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2488 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2489 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2490 continue;
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 case TOKeof:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2493 break;
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 default:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2496 continue;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2497 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2498 break;
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2499 }
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
2500
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2501 ia = new ArrayInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2502 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2503 comma = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2504 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2505 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2506 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2507 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2508 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2509 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2510 { error("comma expected separating array initializers, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2511 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2512 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2513 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2514 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2515 if (!e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2516 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2517 if (token.value == TOKcolon)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2520 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2521 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2522 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2523 { value = new ExpInitializer(e->loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2524 e = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2525 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2526 ia->addInit(e, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2527 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2528 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2529
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2530 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2531 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2532 if (comma == 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2533 error("comma expected separating array initializers, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2534 value = parseInitializer();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2535 ia->addInit(NULL, value);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2536 comma = 1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2537 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2538
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2539 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2540 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2541 comma = 2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2542 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2543
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2544 case TOKrbracket: // allow trailing comma's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2545 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2546 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2547
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2548 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2549 error("found '%s' instead of array initializer", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2550 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2551 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2552 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2553 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2554 return ia;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2555
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2556 case TOKvoid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2557 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2558 if (t->value == TOKsemicolon || t->value == TOKcomma)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2561 return new VoidInitializer(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2562 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2563 goto Lexpression;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2564
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2565 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2566 Lexpression:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2567 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2568 ie = new ExpInitializer(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2569 return ie;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2572
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 * Parses default argument initializer expression that is an assign expression,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2575 * with special handling for __FILE__ and __LINE__.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2576 */
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 DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2579 Expression *Parser::parseDefaultInitExp()
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 if (token.value == TOKfile ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2582 token.value == TOKline)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2583 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2584 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2585 if (t->value == TOKcomma || t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2586 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2587
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2588 if (token.value == TOKfile)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2589 e = new FileInitExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2590 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2591 e = new LineInitExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2592 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2593 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2594 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2595 }
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 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2598 return e;
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 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2601
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 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2604 * flags PSxxxx
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2605 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2606
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2607 Statement *Parser::parseStatement(int flags)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2608 { Statement *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2609 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2610 Condition *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2611 Statement *ifbody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2612 Statement *elsebody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2613 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2614
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2615 //printf("parseStatement()\n");
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 if (flags & PScurly && token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2618 error("statement expected to be { }, not %s", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2619
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2620 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2621 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2622 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2623 // 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
2624 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2625 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2626 { // It's a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2627 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2628
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2629 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2630 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2631 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2632 s = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2633 s = new LabelStatement(loc, ident, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2634 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2635 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2636 // fallthrough to TOKdot
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2637 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2638 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2639 if (isDeclaration(&token, 2, TOKreserved, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2640 goto Ldeclaration;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2641 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2642 goto Lexp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2643 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2644
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2645 case TOKassert:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2646 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2647 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2648 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2649 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2650 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2651 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2652 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2653 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2654 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2655 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2656 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2657 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2658 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2659 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2660 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2661 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2662 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2663 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2664 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2665 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2666 case TOKcast:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2667 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2668 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2669 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2670 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2671 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2672 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2673 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2674 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2675 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2676 case TOKtypeid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2677 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2678 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2679 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2680 case TOKtraits:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2681 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2682 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2683 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2684 Lexp:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2685 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2686
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2687 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2688 check(TOKsemicolon, "statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2689 s = new ExpStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2690 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2691 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2692
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2693 case TOKstatic:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2694 { // Look ahead to see if it's static assert() or static if()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2695 Token *t;
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 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2698 if (t->value == TOKassert)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2699 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2700 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2701 s = new StaticAssertStatement(parseStaticAssert());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2702 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2703 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2704 if (t->value == TOKif)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2705 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2706 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2707 condition = parseStaticIfCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2708 goto Lcondition;
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 goto Ldeclaration;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2711 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2712
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2713 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2714 case TOKtypedef:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2715 case TOKalias:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2716 case TOKconst:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2717 case TOKauto:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2718 case TOKextern:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2719 case TOKfinal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2720 case TOKinvariant:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2721 // case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2722 Ldeclaration:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2723 { Array *a;
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 a = parseDeclarations();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2726 if (a->dim > 1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2727 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2728 Statements *as = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2729 as->reserve(a->dim);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2730 for (int i = 0; i < a->dim; i++)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2731 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2732 Dsymbol *d = (Dsymbol *)a->data[i];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2733 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2734 as->push(s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2735 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2736 s = new CompoundStatement(loc, as);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2737 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2738 else if (a->dim == 1)
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 Dsymbol *d = (Dsymbol *)a->data[0];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2741 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2742 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2743 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2744 assert(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2745 if (flags & PSscope)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2746 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2747 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2748 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2749
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2750 case TOKstruct:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2751 case TOKunion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2752 case TOKclass:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2753 case TOKinterface:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2754 { Dsymbol *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2755
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2756 d = parseAggregate();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2757 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2758 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2759 }
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 case TOKenum:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2762 { Dsymbol *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2763
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2764 d = parseEnum();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2765 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2766 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2767 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2768
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2769 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2770 { t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2771 if (t->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2772 { // mixin(string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2773 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2774 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2775 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2776 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2777 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2778 s = new CompileStatement(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2779 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2780 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2781 Dsymbol *d = parseMixin();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2782 s = new DeclarationStatement(loc, d);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2783 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2784 }
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 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2787 { Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2788
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2789 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2790 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2791 while (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2792 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2793 statements->push(parseStatement(PSsemi | PScurlyscope));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2794 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2795 endloc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2796 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2797 if (flags & (PSscope | PScurlyscope))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2798 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2799 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2800 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2801 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2802
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2803 case TOKwhile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2804 { Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2805 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2806
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2807 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2808 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2809 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2810 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2811 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2812 s = new WhileStatement(loc, condition, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2813 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2814 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2815
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2816 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2817 if (!(flags & PSsemi))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2818 error("use '{ }' for an empty statement, not a ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2819 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2820 s = new ExpStatement(loc, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2821 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2822
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2823 case TOKdo:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2824 { Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2825 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2826
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2827 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2828 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2829 check(TOKwhile);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2830 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2831 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2832 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2833 s = new DoStatement(loc, body, condition);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2834 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2837 case TOKfor:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2838 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2839 Statement *init;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2840 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2841 Expression *increment;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2842 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2843
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2844 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2845 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2846 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2847 { init = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2848 nextToken();
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2851 { init = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2852 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2853 if (token.value == TOKsemicolon)
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 condition = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2856 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2857 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2858 else
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 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2861 check(TOKsemicolon, "for condition");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2862 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2863 if (token.value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2864 { increment = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2865 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2866 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2867 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2868 { increment = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2869 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2870 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2871 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2872 s = new ForStatement(loc, init, condition, increment, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2873 if (init)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2874 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2875 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2876 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2877
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2878 case TOKforeach:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2879 case TOKforeach_reverse:
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 enum TOK op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2882 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2883
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2884 Statement *d;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2885 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2886 Expression *aggr;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2889 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2890
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2891 arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2892
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2893 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2894 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2895 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2896 Identifier *ai = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2897 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2898 unsigned storageClass;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2899 Argument *a;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2900
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2901 storageClass = STCin;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2902 if (token.value == TOKinout || token.value == TOKref)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2903 { storageClass = STCref;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2904 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2905 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2906 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2907 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2908 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2909 if (t->value == TOKcomma || t->value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2910 { ai = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2911 at = NULL; // infer argument type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2912 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2913 goto Larg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2914 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2915 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2916 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2917 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2918 if (!ai)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2919 error("no identifier for declarator %s", at->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2920 Larg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2921 a = new Argument(storageClass, at, ai, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2922 arguments->push(a);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2923 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2924 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2925 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2926 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2927 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2928 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2929 check(TOKsemicolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2930
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2931 aggr = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2932 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2933 body = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2934 s = new ForeachStatement(loc, op, arguments, aggr, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2935 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2936 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2937
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2938 case TOKif:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2939 { Argument *arg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2940 Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2941 Statement *ifbody;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2942 Statement *elsebody;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2945 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2946
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2947 if (token.value == TOKauto)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2950 if (token.value == TOKidentifier)
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 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2953 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2954 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2955 arg = new Argument(STCin, NULL, token.ident, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2956 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2957 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2958 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2959 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2960 { error("= expected following auto identifier");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2961 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2962 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2963 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2964 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2965 { error("identifier expected following auto");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2966 goto Lerror;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2969 else if (isDeclaration(&token, 2, TOKassign, NULL))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2970 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2971 Type *tb;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2972 Type *at;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2973 Identifier *ai;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2974
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2975 tb = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2976 at = parseDeclarator(tb, &ai);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2977 check(TOKassign);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2978 arg = new Argument(STCin, at, ai, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2979 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2980
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2981 // Check for " ident;"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2982 else if (token.value == TOKidentifier)
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 Token *t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2985 if (t->value == TOKcomma || t->value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2986 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2987 arg = new Argument(STCin, NULL, token.ident, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2988 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2989 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2990 if (1 || !global.params.useDeprecated)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2991 error("if (v; e) is deprecated, use if (auto v = e)");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2992 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2993 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2994
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2995 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2996 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2997 ifbody = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
2998 if (token.value == TOKelse)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3001 elsebody = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3002 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3003 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3004 elsebody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3005 s = new IfStatement(loc, arg, condition, ifbody, elsebody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3006 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3007 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3008
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3009 case TOKscope:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3010 if (peek(&token)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3011 goto Ldeclaration; // scope used as storage class
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3012 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3013 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3014 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3015 { error("scope identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3016 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3017 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3018 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3019 { TOK t = TOKon_scope_exit;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3020 Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3021
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3022 if (id == Id::exit)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3023 t = TOKon_scope_exit;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3024 else if (id == Id::failure)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3025 t = TOKon_scope_failure;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3026 else if (id == Id::success)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3027 t = TOKon_scope_success;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3028 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3029 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
3030 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3031 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3032 Statement *st = parseStatement(PScurlyscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3033 s = new OnScopeStatement(loc, t, st);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3034 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3035 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3036
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3037 case TOKdebug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3038 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3039 condition = parseDebugCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3040 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3041
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3042 case TOKversion:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3043 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3044 condition = parseVersionCondition();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3045 goto Lcondition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3046
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3047 Lcondition:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3048 ifbody = parseStatement(0 /*PSsemi*/);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3049 elsebody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3050 if (token.value == TOKelse)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3053 elsebody = parseStatement(0 /*PSsemi*/);
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 s = new ConditionalStatement(loc, condition, ifbody, elsebody);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3056 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3057
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3058 case TOKpragma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3059 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3060 Expressions *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3061 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3062
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3063 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3064 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3065 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3066 { error("pragma(identifier expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3067 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3068 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3069 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3070 nextToken();
846
bc982f1ad106 Merged DMD 1.037 frontend
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 737
diff changeset
3071 if (token.value == TOKcomma && peekNext() != TOKrparen)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3072 args = parseArguments(); // pragma(identifier, args...);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3073 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3074 check(TOKrparen); // pragma(identifier);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3075 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3076 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3077 body = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3078 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3079 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3080 body = parseStatement(PSsemi);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3081 s = new PragmaStatement(loc, ident, args, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3082 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3083 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3084
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3085 case TOKswitch:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3086 { Expression *condition;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3087 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3088
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3089 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3090 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3091 condition = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3092 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3093 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3094 s = new SwitchStatement(loc, condition, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3095 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3096 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3097
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3098 case TOKcase:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3099 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3100 Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3101 Array cases; // array of Expression's
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3102
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3103 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3104 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3105 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3106 exp = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3107 cases.push(exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3108 if (token.value != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3109 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3110 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3111 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3112
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3113 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3114 while (token.value != TOKcase &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3115 token.value != TOKdefault &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3116 token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3117 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3118 statements->push(parseStatement(PSsemi | PScurlyscope));
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 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3121 s = new ScopeStatement(loc, s);
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 // Keep cases in order by building the case statements backwards
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3124 for (int i = cases.dim; i; i--)
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 exp = (Expression *)cases.data[i - 1];
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3127 s = new CaseStatement(loc, exp, s);
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 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3132 case TOKdefault:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3133 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3134 Statements *statements;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3137 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3138
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3139 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3140 while (token.value != TOKcase &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3141 token.value != TOKdefault &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3142 token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3143 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3144 statements->push(parseStatement(PSsemi | PScurlyscope));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3145 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3146 s = new CompoundStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3147 s = new ScopeStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3148 s = new DefaultStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3149 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3150 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3151
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3152 case TOKreturn:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3153 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3154
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3155 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3156 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3157 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3158 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3159 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3160 check(TOKsemicolon, "return statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3161 s = new ReturnStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3162 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3163 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3164
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3165 case TOKbreak:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3166 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3167
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 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3170 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3171 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3172 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3173 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3174 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3175 check(TOKsemicolon, "break statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3176 s = new BreakStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3177 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3178 }
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 case TOKcontinue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3181 { Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3182
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 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3185 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3186 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3187 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3188 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3189 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3190 check(TOKsemicolon, "continue statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3191 s = new ContinueStatement(loc, ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3192 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3193 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3194
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3195 case TOKgoto:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3196 { Identifier *ident;
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 if (token.value == TOKdefault)
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3202 s = new GotoDefaultStatement(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3203 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3204 else if (token.value == TOKcase)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3205 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3206 Expression *exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3207
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3208 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3209 if (token.value != TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3210 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3211 s = new GotoCaseStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3212 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3213 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3214 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3215 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3216 { error("Identifier expected following goto");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3217 ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3218 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3219 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3220 { ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3221 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3222 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3223 s = new GotoStatement(loc, ident);
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 check(TOKsemicolon, "goto statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3226 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3227 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3228
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3229 case TOKsynchronized:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3230 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3231 Statement *body;
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 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3235 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3236 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3237 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3238 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3239 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3240 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3241 exp = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3242 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3243 s = new SynchronizedStatement(loc, exp, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3244 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3245 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3246
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3247 case TOKwith:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3248 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3249 Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3250
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3251 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3252 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3253 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3254 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3255 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3256 s = new WithStatement(loc, exp, body);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3257 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3258 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3259
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3260 case TOKtry:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3261 { Statement *body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3262 Array *catches = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3263 Statement *finalbody = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3264
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3265 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3266 body = parseStatement(PSscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3267 while (token.value == TOKcatch)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3268 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3269 Statement *handler;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3270 Catch *c;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3271 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3272 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3273 Loc loc = this->loc;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3276 if (token.value == TOKlcurly)
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 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3279 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3280 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3281 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3282 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3283 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3284 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3285 id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3286 t = parseDeclarator(t, &id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3287 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3288 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3289 handler = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3290 c = new Catch(loc, t, id, handler);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3291 if (!catches)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3292 catches = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3293 catches->push(c);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3294 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3295
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3296 if (token.value == TOKfinally)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3297 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3298 finalbody = parseStatement(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3299 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3300
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3301 s = body;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3302 if (!catches && !finalbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3303 error("catch or finally expected following try");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3304 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3305 { if (catches)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3306 s = new TryCatchStatement(loc, body, catches);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3307 if (finalbody)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3308 s = new TryFinallyStatement(loc, s, finalbody);
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3311 }
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 case TOKthrow:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3314 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3315
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3316 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3317 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3318 check(TOKsemicolon, "throw statement");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3319 s = new ThrowStatement(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3320 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3321 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3322
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3323 case TOKvolatile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3324 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3325 s = parseStatement(PSsemi | PScurlyscope);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3326 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3327 if (!global.params.useDeprecated)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3328 error("volatile statements deprecated; used synchronized statements instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3329 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3330 s = new VolatileStatement(loc, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3331 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3332
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3333 case TOKasm:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3334 { Statements *statements;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3335 Identifier *label;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3336 Loc labelloc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3337 Token *toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3338 Token **ptoklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3339
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3340 // Parse the asm block into a sequence of AsmStatements,
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3341 // each AsmStatement is one instruction.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3342 // Separate out labels.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3343 // Defer parsing of AsmStatements until semantic processing.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3344
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3345 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3346 check(TOKlcurly);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3347 toklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3348 ptoklist = &toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3349 label = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3350 statements = new Statements();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3351 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3352 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3353 switch (token.value)
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 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3356 if (!toklist)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3357 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3358 // Look ahead to see if it is a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3359 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3360 if (t->value == TOKcolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3361 { // It's a label
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3362 label = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3363 labelloc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3364 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3365 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3366 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3367 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3368 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3369 goto Ldefault;
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 case TOKrcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3372 if (toklist || label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3373 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3374 error("asm statements must end in ';'");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3375 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3376 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3377
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3378 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3379 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3380 if (toklist || label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3381 { // Create AsmStatement from list of tokens we've saved
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3382 s = new AsmStatement(this->loc, toklist);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3383 toklist = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3384 ptoklist = &toklist;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3385 if (label)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3386 { s = new LabelStatement(labelloc, label, s);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3387 label = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3388 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3389 statements->push(s);
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3392 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3393
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3394 case TOKeof:
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 error("matching '}' expected, not end of file");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3397 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3398
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3399 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3400 Ldefault:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3401 *ptoklist = new Token();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3402 memcpy(*ptoklist, &token, sizeof(Token));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3403 ptoklist = &(*ptoklist)->next;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3404 *ptoklist = NULL;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3407 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3408 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3409 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3410 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3411 s = new AsmBlockStatement(loc, statements);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3412 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3413 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3414 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3415
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3416 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3417 error("found '%s' instead of statement", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3418 goto Lerror;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3419
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3420 Lerror:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3421 while (token.value != TOKrcurly &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3422 token.value != TOKsemicolon &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3423 token.value != TOKeof)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3424 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3425 if (token.value == TOKsemicolon)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3426 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3427 s = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3428 break;
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 return s;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3434 void Parser::check(enum TOK value)
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 check(loc, 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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3439 void Parser::check(Loc loc, enum TOK value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3440 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3441 if (token.value != value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3442 error(loc, "found '%s' when expecting '%s'", token.toChars(), Token::toChars(value));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3443 nextToken();
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3446 void Parser::check(enum TOK value, char *string)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3447 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3448 if (token.value != value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3449 error("found '%s' when expecting '%s' following '%s'",
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3450 token.toChars(), Token::toChars(value), string);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3451 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3452 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3453
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3454 /************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3455 * Determine if the scanner is sitting on the start of a declaration.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3456 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3457 * needId 0 no identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3458 * 1 identifier optional
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3459 * 2 must have identifier
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3462 int Parser::isDeclaration(Token *t, int needId, enum TOK endtok, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3463 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3464 int haveId = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3465
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3466 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3467 if ((t->value == TOKconst || t->value == TOKinvariant) &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3468 peek(t)->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3469 { /* const type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3470 * invariant type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3471 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3472 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3473 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3474 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3475
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3476 if (!isBasicType(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3477 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3478 if (!isDeclarator(&t, &haveId, endtok))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3479 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3480 if ( needId == 1 ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3481 (needId == 0 && !haveId) ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3482 (needId == 2 && haveId))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3483 { if (pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3484 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3485 return TRUE;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3488 return FALSE;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3491 int Parser::isBasicType(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3492 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3493 // This code parallels parseBasicType()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3494 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3495 Token *t2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3496 int parens;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3497
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3498 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3499 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3500 CASE_BASIC_TYPES:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3501 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3502 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3503
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3504 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3505 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3506 if (t->value == TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3507 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3508 goto L4;
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 goto L3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3511 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3512 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3513 L2:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3514 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3515 L3:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3516 if (t->value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3517 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3518 Ldot:
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 != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3521 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3522 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3523 if (t->value != TOKnot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3524 goto L3;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3525 L4:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3526 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3527 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3528 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3529 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3530 goto Lfalse;
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 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3533 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3534 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3535 break;
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 TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3538 goto Ldot;
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 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3541 /* typeof(exp).identifier...
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3542 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3543 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3544 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3545 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3546 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3547 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3548 goto L2;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3551 goto Lfalse;
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 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3554 return TRUE;
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 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3557 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3558 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3559
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3560 int Parser::isDeclarator(Token **pt, int *haveId, enum TOK endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3561 { // This code parallels parseDeclarator()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3562 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3563 int parens;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3564
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3565 //printf("Parser::isDeclarator()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3566 //t->print();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3567 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3568 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3569
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3570 while (1)
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 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3573 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3574 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3575 case TOKmul:
717
a26b0c5d5942 Merged DMD 1.036.
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 710
diff changeset
3576 //case TOKand:
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3577 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3578 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3579
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3580 case TOKlbracket:
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 if (t->value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3583 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3584 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3585 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3586 else if (isDeclaration(t, 0, TOKrbracket, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3587 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3588 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3589 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3590 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3591 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3592 // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3593 // [ expression .. expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3594 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3595 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3596 if (t->value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3597 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3598 if (!isExpression(&t))
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3601 if (t->value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3602 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3603 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3604 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3605 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3606
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3607 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3608 if (*haveId)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3609 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3610 *haveId = TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3611 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3612 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3613
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3614 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3615 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3616
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3617 if (t->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3618 return FALSE; // () is not a declarator
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3619
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3620 /* Regard ( identifier ) as not a declarator
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3621 * BUG: what about ( *identifier ) in
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3622 * f(*p)(x);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3623 * where f is a class instance with overloaded () ?
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3624 * Should we just disallow C-style function pointer declarations?
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3625 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3626 if (t->value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3627 { Token *t2 = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3628 if (t2->value == TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3629 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3630 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3631
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3632
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3633 if (!isDeclarator(&t, haveId, TOKrparen))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3634 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3635 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3636 parens = TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3637 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3638
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3639 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3640 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3641 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3642 if (!isParameters(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3643 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3644 continue;
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 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3649 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3650 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3651 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3652 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3653 #if CARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3654 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3655 parens = FALSE;
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 if (t->value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3658 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3659 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3660 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3661 else if (isDeclaration(t, 0, TOKrbracket, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3662 { // It's an associative array declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3663 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3664 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3665 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3666 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3667 // [ expression ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3668 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3669 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3670 if (t->value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3671 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3672 t = peek(t);
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 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3675 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3676
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3677 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3678 parens = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3679 if (!isParameters(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3680 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3681 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3682
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3683 // Valid tokens that follow a declaration
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3684 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3685 case TOKrbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3686 case TOKassign:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3687 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3688 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3689 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3690 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3691 // The !parens is to disallow unnecessary parentheses
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3692 if (!parens && (endtok == TOKreserved || endtok == t->value))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3693 { *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3694 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3695 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3696 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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3699 return FALSE;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3703
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3704
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3705 int Parser::isParameters(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3706 { // This code parallels parseParameters()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3707 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3708 int tmp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3709
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3710 //printf("isParameters()\n");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3711 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3712 return FALSE;
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3715 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3716 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3717 switch (t->value)
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 TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3720 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3721
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3722 case TOKdotdotdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3723 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3724 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3725
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3726 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3727 case TOKout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3728 case TOKinout:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3729 case TOKref:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3730 case TOKlazy:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3731 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3732 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3733 if (!isBasicType(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3734 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3735 tmp = FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3736 if (t->value != TOKdotdotdot &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3737 !isDeclarator(&t, &tmp, TOKreserved))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3738 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3739 if (t->value == TOKassign)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3740 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3741 if (!isExpression(&t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3742 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3743 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3744 if (t->value == TOKdotdotdot)
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3747 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3748 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3749 if (t->value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3750 { t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3751 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3752 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3753 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3754 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3755 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3756 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3757 if (t->value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3758 return FALSE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3759 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3760 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3761 return TRUE;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3764 int Parser::isExpression(Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3765 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3766 // This is supposed to determine if something is an expression.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3767 // What it actually does is scan until a closing right bracket
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3768 // is found.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3769
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3770 Token *t = *pt;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3771 int brnest = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3772 int panest = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3773
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3774 for (;; t = peek(t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3775 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3776 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3777 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3778 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3779 brnest++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3780 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3781
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3782 case TOKrbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3783 if (--brnest >= 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3784 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3785 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3786
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3787 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3788 panest++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3789 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3790
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3791 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3792 if (brnest || panest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3793 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3794 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3795
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3796 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3797 if (--panest >= 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3798 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3799 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3800
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3801 case TOKslice:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3802 if (brnest)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3803 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3804 break;
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 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3807 return FALSE;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3810 continue;
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3813 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3814
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3815 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3816 return TRUE;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3817 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3818
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3819 /**********************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3820 * Skip over
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3821 * instance foo.bar(parameters...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3822 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3823 * if (pt), *pt is set to the token following the closing )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3824 * Returns:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3825 * 1 it's valid instance syntax
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3826 * 0 invalid instance syntax
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3829 int Parser::isTemplateInstance(Token *t, Token **pt)
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3832 if (t->value != TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3833 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3834 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3835 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3836 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3837 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3838 while (t->value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3839 {
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 if (t->value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3842 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3843 t = peek(t);
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 if (t->value != TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3846 goto Lfalse;
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 // Skip over the template arguments
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3849 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3850 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3851 while (1)
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3854 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3855 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3856 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3857 if (!skipParens(t, &t))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3858 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3859 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3860 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3861 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3862 case TOKcomma:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3863 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3864 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3865 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3866 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3867 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3868 continue;
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 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3871 }
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 != TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3874 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3875 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3876 if (t->value != TOKrparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3877 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3878 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3879 if (pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3880 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3881 return 1;
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 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3884 return 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3885 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3886
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3887 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3888 * Skip parens, brackets.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3889 * Input:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3890 * t is on opening (
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3891 * Output:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3892 * *pt is set to closing token, which is ')' on success
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3893 * Returns:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3894 * !=0 successful
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3895 * 0 some parsing error
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3898 int Parser::skipParens(Token *t, Token **pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3899 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3900 int parens = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3901
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3902 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3903 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3904 switch (t->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3905 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3906 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3907 parens++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3908 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3909
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3910 case TOKrparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3911 parens--;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3912 if (parens < 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3913 goto Lfalse;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3914 if (parens == 0)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3915 goto Ldone;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3916 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3917
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3918 case TOKeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3919 case TOKsemicolon:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3920 goto Lfalse;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3923 break;
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 t = peek(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3926 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3927
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3928 Ldone:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3929 if (*pt)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3930 *pt = t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3931 return 1;
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 Lfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3934 return 0;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3937 /********************************* Expression Parser ***************************/
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3938
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3939 Expression *Parser::parsePrimaryExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3940 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3941 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3942 Identifier *id;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3943 enum TOK save;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3944 Loc loc = this->loc;
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 //printf("parsePrimaryExp(): loc = %d\n", loc.linnum);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3947 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3948 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3949 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3950 id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3951 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3952 if (token.value == TOKnot && peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3953 { // identifier!(template-argument-list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3954 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3955
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3956 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3957 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3958 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3959 e = new ScopeExp(loc, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3960 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3961 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3962 e = new IdentifierExp(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3963 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3964
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3965 case TOKdollar:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3966 if (!inBrackets)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3967 error("'$' is valid only inside [] of index or slice");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3968 e = new DollarExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3969 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3970 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3971
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3972 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3973 // Signal global scope '.' operator with "" identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3974 e = new IdentifierExp(loc, Id::empty);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3975 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3976
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3977 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3978 e = new ThisExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3979 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3980 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3981
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3982 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3983 e = new SuperExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3984 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3985 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3986
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3987 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3988 e = new IntegerExp(loc, token.int32value, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3989 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3990 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3991
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3992 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3993 e = new IntegerExp(loc, token.uns32value, Type::tuns32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3994 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3995 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3996
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3997 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3998 e = new IntegerExp(loc, token.int64value, Type::tint64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
3999 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4000 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4001
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4002 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4003 e = new IntegerExp(loc, token.uns64value, Type::tuns64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4004 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4005 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4006
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4007 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4008 e = new RealExp(loc, token.float80value, Type::tfloat32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4009 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4010 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4011
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4012 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4013 e = new RealExp(loc, token.float80value, Type::tfloat64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4014 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4015 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4016
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4017 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4018 e = new RealExp(loc, token.float80value, Type::tfloat80);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4019 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4020 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4021
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4022 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4023 e = new RealExp(loc, token.float80value, Type::timaginary32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4024 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4025 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4026
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4027 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4028 e = new RealExp(loc, token.float80value, Type::timaginary64);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4029 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4030 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4031
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4032 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4033 e = new RealExp(loc, token.float80value, Type::timaginary80);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4034 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4035 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4036
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4037 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4038 e = new NullExp(loc);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4039 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4040 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4041
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4042 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4043 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4044 { char *s = loc.filename ? loc.filename : mod->ident->toChars();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4045 e = new StringExp(loc, s, strlen(s), 0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4046 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4047 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4048 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4049
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4050 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4051 e = new IntegerExp(loc, loc.linnum, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4052 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4053 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4054 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4055
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4056 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4057 e = new IntegerExp(loc, 1, Type::tbool);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4058 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4059 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4060
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4061 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4062 e = new IntegerExp(loc, 0, Type::tbool);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4063 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4064 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4065
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4066 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4067 e = new IntegerExp(loc, token.uns32value, Type::tchar);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4068 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4069 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4070
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4071 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4072 e = new IntegerExp(loc, token.uns32value, Type::twchar);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4073 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4074 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4075
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4076 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4077 e = new IntegerExp(loc, token.uns32value, Type::tdchar);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4078 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4079 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4080
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4081 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4082 { unsigned char *s;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4083 unsigned len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4084 unsigned char postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4085
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4086 // cat adjacent strings
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4087 s = token.ustring;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4088 len = token.len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4089 postfix = token.postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4090 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4091 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4092 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4093 if (token.value == TOKstring)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4094 { unsigned len1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4095 unsigned len2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4096 unsigned char *s2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4097
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4098 if (token.postfix)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4099 { if (token.postfix != postfix)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4100 error("mismatched string literal postfixes '%c' and '%c'", postfix, token.postfix);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4101 postfix = token.postfix;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4102 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4103
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4104 len1 = len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4105 len2 = token.len;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4106 len = len1 + len2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4107 s2 = (unsigned char *)mem.malloc((len + 1) * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4108 memcpy(s2, s, len1 * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4109 memcpy(s2 + len1, token.ustring, (len2 + 1) * sizeof(unsigned char));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4110 s = s2;
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 else
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 e = new StringExp(loc, s, len, postfix);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4116 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4117 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4118
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4119 CASE_BASIC_TYPES_X(t):
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4120 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4121 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4122 check(TOKdot, t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4123 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4124 { error("found '%s' when expecting identifier following '%s.'", token.toChars(), t->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4125 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4126 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4127 e = new TypeDotIdExp(loc, t, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4128 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4129 break;
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 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4132 { Expression *exp;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4133
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4134 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4135 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4136 exp = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4137 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4138 t = new TypeTypeof(loc, exp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4139 e = new TypeExp(loc, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4140 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4141 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4142
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4143 case TOKtypeid:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4144 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4145
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4146 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4147 check(TOKlparen, "typeid");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4148 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4149 t = parseDeclarator(t,NULL); // ( type )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4150 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4151 e = new TypeidExp(loc, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4152 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4153 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4154
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4155 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4156 case TOKtraits:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4157 { /* __traits(identifier, args...)
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 Identifier *ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4160 Objects *args = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4161
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4162 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4163 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4164 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4165 { error("__traits(identifier, args...) expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4166 goto Lerr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4167 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4168 ident = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4169 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4170 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4171 args = parseTemplateArgumentList2(); // __traits(identifier, args...)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4172 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4173 check(TOKrparen); // __traits(identifier)
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 e = new TraitsExp(loc, ident, args);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4176 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4177 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4178 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4179
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4180 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4181 { Type *targ;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4182 Identifier *ident = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4183 Type *tspec = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4184 enum TOK tok = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4185 enum TOK tok2 = TOKreserved;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4186 Loc loc = this->loc;
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 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4190 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4191 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4192 targ = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4193 targ = parseDeclarator(targ, &ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4194 if (token.value == TOKcolon || token.value == TOKequal)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4195 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4196 tok = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4197 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4198 if (tok == TOKequal &&
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4199 (token.value == TOKtypedef ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4200 token.value == TOKstruct ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4201 token.value == TOKunion ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4202 token.value == TOKclass ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4203 token.value == TOKsuper ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4204 token.value == TOKenum ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4205 token.value == TOKinterface ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4206 token.value == TOKfunction ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4207 token.value == TOKdelegate ||
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4208 token.value == TOKreturn))
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 tok2 = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4211 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4212 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4213 else
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 tspec = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4216 tspec = parseDeclarator(tspec, NULL);
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4219 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4220 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4221 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4222 { error("(type identifier : specialization) expected following is");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4223 goto Lerr;
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 e = new IsExp(loc, targ, ident, tok, tspec, tok2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4226 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4227 }
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 case TOKassert:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4230 { Expression *msg = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4231
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4232 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4233 check(TOKlparen, "assert");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4234 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4235 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4236 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4237 msg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4238 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4239 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4240 e = new AssertExp(loc, e, msg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4241 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4244 case TOKmixin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4245 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4246 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4247 check(TOKlparen, "mixin");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4248 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4249 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4250 e = new CompileExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4251 break;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4254 case TOKimport:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4255 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4256 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4257 check(TOKlparen, "import");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4258 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4259 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4260 e = new FileExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4261 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4262 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4263
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4264 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4265 if (peekPastParen(&token)->value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4266 { // (arguments) { statements... }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4267 save = TOKdelegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4268 goto case_delegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4269 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4270 // ( expression )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4271 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4272 e = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4273 check(loc, TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4274 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4275
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4276 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4277 { /* Parse array literals and associative array literals:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4278 * [ value, value, value ... ]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4279 * [ key:value, key:value, key:value ... ]
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 Expressions *values = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4282 Expressions *keys = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4283
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4284 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4285 if (token.value != TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4286 {
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4287 while (token.value != TOKeof)
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4288 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4289 Expression *e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4290 if (token.value == TOKcolon && (keys || values->dim == 0))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4291 { nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4292 if (!keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4293 keys = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4294 keys->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4295 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4296 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4297 else if (keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4298 { error("'key:value' expected for associative array literal");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4299 delete keys;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4300 keys = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4301 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4302 values->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4303 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4304 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4305 check(TOKcomma);
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4308 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4309
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4310 if (keys)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4311 e = new AssocArrayLiteralExp(loc, keys, values);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4312 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4313 e = new ArrayLiteralExp(loc, values);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4314 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4315 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4316
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4317 case TOKlcurly:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4318 // { statements... }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4319 save = TOKdelegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4320 goto case_delegate;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4321
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4322 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4323 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4324 save = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4325 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4326 case_delegate:
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 /* function type(parameters) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4329 * delegate type(parameters) { body }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4330 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4331 Arguments *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4332 int varargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4333 FuncLiteralDeclaration *fd;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4334 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4335
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4336 if (token.value == TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4337 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4338 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4339 varargs = 0;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4340 arguments = new Arguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4341 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4342 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4343 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4344 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4345 t = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4346 else
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 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4349 t = parseBasicType2(t); // function return type
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4350 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4351 arguments = parseParameters(&varargs);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4352 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4353 t = new TypeFunction(arguments, t, varargs, linkage);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4354 fd = new FuncLiteralDeclaration(loc, 0, t, save, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4355 parseContracts(fd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4356 e = new FuncExp(loc, fd);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4357 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4358 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4359
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4360 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4361 error("expression expected, not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4362 Lerr:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4363 // Anything for e, as long as it's not NULL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4364 e = new IntegerExp(loc, 0, Type::tint32);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4365 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4366 break;
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 return parsePostExp(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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4371 Expression *Parser::parsePostExp(Expression *e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4372 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4373 Loc loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4374
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4375 while (1)
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 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4378 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4379 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4380 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4381 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4382 if (token.value == TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4383 { Identifier *id = token.ident;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4384
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4385 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4386 if (token.value == TOKnot && peek(&token)->value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4387 { // identifier!(template-argument-list)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4388 TemplateInstance *tempinst;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4389
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4390 tempinst = new TemplateInstance(loc, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4391 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4392 tempinst->tiargs = parseTemplateArgumentList();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4393 e = new DotTemplateInstanceExp(loc, e, tempinst);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4394 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4395 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4396 e = new DotIdExp(loc, e, id);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4397 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4398 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4399 else if (token.value == TOKnew)
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 e = parseNewExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4402 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4403 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4404 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4405 error("identifier expected following '.', not '%s'", token.toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4406 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4407
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4408 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4409 e = new PostExp(TOKplusplus, loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4410 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4411
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4412 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4413 e = new PostExp(TOKminusminus, loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4414 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4415
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4416 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4417 e = new CallExp(loc, e, parseArguments());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4418 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4419
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4420 case TOKlbracket:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4421 { // array dereferences:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4422 // array[index]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4423 // array[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4424 // array[lwr .. upr]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4425 Expression *index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4426 Expression *upr;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4427
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4428 inBrackets++;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4429 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4430 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4431 { // array[]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4432 e = new SliceExp(loc, e, NULL, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4433 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4434 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4435 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4436 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4437 index = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4438 if (token.value == TOKslice)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4439 { // array[lwr .. upr]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4440 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4441 upr = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4442 e = new SliceExp(loc, e, index, upr);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4443 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4444 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4445 { // array[index, i2, i3, i4, ...]
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4446 Expressions *arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4447 arguments->push(index);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4448 if (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4449 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4450 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4451 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4452 { Expression *arg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4453
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4454 arg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4455 arguments->push(arg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4456 if (token.value == TOKrbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4457 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4458 check(TOKcomma);
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4461 e = new ArrayExp(loc, e, arguments);
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 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4464 inBrackets--;
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 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4467 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4468
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4469 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4470 return e;
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4473 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4474 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4475
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4476 Expression *Parser::parseUnaryExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4477 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4478 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4479
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4480 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4481 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4482 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4483 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4484 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4485 e = new AddrExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4486 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4487
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4488 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4489 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4490 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4491 e = new AddAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4492 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4493
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4494 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4495 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4496 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4497 e = new MinAssignExp(loc, e, new IntegerExp(loc, 1, Type::tint32));
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4498 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4499
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4500 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4501 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4502 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4503 e = new PtrExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4504 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4505
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4506 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4507 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4508 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4509 e = new NegExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4510 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4511
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4512 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4513 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4514 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4515 e = new UAddExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4516 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4517
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4518 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4519 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4520 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4521 e = new NotExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4522 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4523
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4524 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4525 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4526 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4527 e = new ComExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4528 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4529
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4530 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4531 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4532 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4533 e = new DeleteExp(loc, e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4534 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4535
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4536 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4537 e = parseNewExp(NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4538 break;
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 case TOKcast: // cast(type) expression
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4541 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4542
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4543 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4544 check(TOKlparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4545 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4546 t = parseDeclarator(t,NULL); // ( type )
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4547 check(TOKrparen);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4548
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4549 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4550 e = new CastExp(loc, e, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4551 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4552 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4553
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4554 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4555 { Token *tk;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4556
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4557 tk = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4558 #if CCASTSYNTAX
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4559 // If cast
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4560 if (isDeclaration(tk, 0, TOKrparen, &tk))
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4561 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4562 tk = peek(tk); // skip over right parenthesis
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4563 switch (tk->value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4564 {
658
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4565 case TOKnot:
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4566 tk = peek(tk);
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4567 if (tk->value == TOKis) // !is
50383e476c7e Upgraded frontend to DMD 1.035
Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
parents: 336
diff changeset
4568 break;
336
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4569 case TOKdot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4570 case TOKplusplus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4571 case TOKminusminus:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4572 case TOKdelete:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4573 case TOKnew:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4574 case TOKlparen:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4575 case TOKidentifier:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4576 case TOKthis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4577 case TOKsuper:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4578 case TOKint32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4579 case TOKuns32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4580 case TOKint64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4581 case TOKuns64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4582 case TOKfloat32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4583 case TOKfloat64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4584 case TOKfloat80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4585 case TOKimaginary32v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4586 case TOKimaginary64v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4587 case TOKimaginary80v:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4588 case TOKnull:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4589 case TOKtrue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4590 case TOKfalse:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4591 case TOKcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4592 case TOKwcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4593 case TOKdcharv:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4594 case TOKstring:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4595 #if 0
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4596 case TOKtilde:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4597 case TOKand:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4598 case TOKmul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4599 case TOKmin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4600 case TOKadd:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4601 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4602 case TOKfunction:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4603 case TOKdelegate:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4604 case TOKtypeof:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4605 #if DMDV2
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4606 case TOKfile:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4607 case TOKline:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4608 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4609 CASE_BASIC_TYPES: // (type)int.size
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4610 { // (type) una_exp
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4611 Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4612
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4613 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4614 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4615 t = parseDeclarator(t,NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4616 check(TOKrparen);
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 // if .identifier
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4619 if (token.value == TOKdot)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4620 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4621 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4622 if (token.value != TOKidentifier)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4623 { error("Identifier expected following (type).");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4624 return NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4625 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4626 e = new TypeDotIdExp(loc, t, token.ident);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4627 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4628 e = parsePostExp(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4629 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4630 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4631 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4632 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4633 e = new CastExp(loc, e, t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4634 error("C style cast illegal, use %s", e->toChars());
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4637 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4638 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4639 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4640 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4641 e = parsePrimaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4642 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4643 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4644 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4645 e = parsePrimaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4646 break;
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 assert(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4649 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4650 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4651
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4652 Expression *Parser::parseMulExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4653 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4654 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4655 Loc loc = this->loc;
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 e = parseUnaryExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4658 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4659 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4660 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4661 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4662 case TOKmul: nextToken(); e2 = parseUnaryExp(); e = new MulExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4663 case TOKdiv: nextToken(); e2 = parseUnaryExp(); e = new DivExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4664 case TOKmod: nextToken(); e2 = parseUnaryExp(); e = new ModExp(loc,e,e2); continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4667 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4668 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4669 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4672 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4673
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4674 Expression *Parser::parseAddExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4675 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4676 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4677 Loc loc = this->loc;
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 e = parseMulExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4680 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4681 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4682 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4683 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4684 case TOKadd: nextToken(); e2 = parseMulExp(); e = new AddExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4685 case TOKmin: nextToken(); e2 = parseMulExp(); e = new MinExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4686 case TOKtilde: nextToken(); e2 = parseMulExp(); e = new CatExp(loc,e,e2); continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4689 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4690 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4691 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4694 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4695
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4696 Expression *Parser::parseShiftExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4697 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4698 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4699 Loc loc = this->loc;
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 e = parseAddExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4702 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4703 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4704 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4705 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4706 case TOKshl: nextToken(); e2 = parseAddExp(); e = new ShlExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4707 case TOKshr: nextToken(); e2 = parseAddExp(); e = new ShrExp(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4708 case TOKushr: nextToken(); e2 = parseAddExp(); e = new UshrExp(loc,e,e2); continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4711 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4712 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4713 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4716 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4717
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4718 Expression *Parser::parseRelExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4719 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4720 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4721 enum TOK op;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4722 Loc loc = this->loc;
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 e = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4725 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4726 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4727 switch (token.value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4728 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4729 case TOKlt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4730 case TOKle:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4731 case TOKgt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4732 case TOKge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4733 case TOKunord:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4734 case TOKlg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4735 case TOKleg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4736 case TOKule:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4737 case TOKul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4738 case TOKuge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4739 case TOKug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4740 case TOKue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4741 op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4742 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4743 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4744 e = new CmpExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4745 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4746
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4747 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4748 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4749 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4750 e = new InExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4751 continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4754 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4755 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4756 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4759 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4760
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4761 Expression *Parser::parseEqualExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4762 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4763 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4764 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4765 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4766
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4767 e = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4768 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4769 { enum TOK value = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4770
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4771 switch (value)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4772 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4773 case TOKequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4774 case TOKnotequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4775 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4776 e2 = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4777 e = new EqualExp(value, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4778 continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4779
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4780 case TOKidentity:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4781 error("'===' is no longer legal, use 'is' instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4782 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4783
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4784 case TOKnotidentity:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4785 error("'!==' is no longer legal, use '!is' instead");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4786 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4787
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4788 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4789 value = TOKidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4790 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4791
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4792 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4793 // Attempt to identify '!is'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4794 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4795 if (t->value != TOKis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4796 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4797 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4798 value = TOKnotidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4799 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4800
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4801 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4802 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4803 e2 = parseRelExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4804 e = new IdentityExp(value, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4805 continue;
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4808 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4809 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4810 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4813 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4814
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4815 Expression *Parser::parseCmpExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4816 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4817 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4818 Token *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4819 Loc loc = this->loc;
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 e = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4822 enum TOK op = token.value;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4823
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4824 switch (op)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4825 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4826 case TOKequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4827 case TOKnotequal:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4828 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4829 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4830 e = new EqualExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4831 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4832
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4833 case TOKis:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4834 op = TOKidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4835 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4836
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4837 case TOKnot:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4838 // Attempt to identify '!is'
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4839 t = peek(&token);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4840 if (t->value != TOKis)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4841 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4842 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4843 op = TOKnotidentity;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4844 goto L1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4845
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4846 L1:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4847 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4848 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4849 e = new IdentityExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4850 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4851
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4852 case TOKlt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4853 case TOKle:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4854 case TOKgt:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4855 case TOKge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4856 case TOKunord:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4857 case TOKlg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4858 case TOKleg:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4859 case TOKule:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4860 case TOKul:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4861 case TOKuge:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4862 case TOKug:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4863 case TOKue:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4864 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4865 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4866 e = new CmpExp(op, loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4867 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4868
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4869 case TOKin:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4870 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4871 e2 = parseShiftExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4872 e = new InExp(loc, e, e2);
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 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4876 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4879 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4880
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4881 Expression *Parser::parseAndExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4882 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4883 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4884 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4885
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4886 if (global.params.Dversion == 1)
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 e = parseEqualExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4889 while (token.value == TOKand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4890 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4891 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4892 e2 = parseEqualExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4893 e = new AndExp(loc,e,e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4894 loc = this->loc;
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4897 else
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 e = parseCmpExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4900 while (token.value == TOKand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4901 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4902 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4903 e2 = parseCmpExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4904 e = new AndExp(loc,e,e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4905 loc = this->loc;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4909 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4910
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4911 Expression *Parser::parseXorExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4912 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4913 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4914 Loc loc = this->loc;
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 e = parseAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4917 while (token.value == TOKxor)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4918 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4919 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4920 e2 = parseAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4921 e = new XorExp(loc, e, e2);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4924 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4925
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4926 Expression *Parser::parseOrExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4927 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4928 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4929 Loc loc = this->loc;
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 e = parseXorExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4932 while (token.value == TOKor)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4933 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4934 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4935 e2 = parseXorExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4936 e = new OrExp(loc, e, e2);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4939 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4940
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4941 Expression *Parser::parseAndAndExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4942 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4943 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4944 Loc loc = this->loc;
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 e = parseOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4947 while (token.value == TOKandand)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4948 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4949 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4950 e2 = parseOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4951 e = new AndAndExp(loc, e, e2);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4954 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4955
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4956 Expression *Parser::parseOrOrExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4957 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4958 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4959 Loc loc = this->loc;
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 e = parseAndAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4962 while (token.value == TOKoror)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4963 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4964 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4965 e2 = parseAndAndExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4966 e = new OrOrExp(loc, e, e2);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4969 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4970
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4971 Expression *Parser::parseCondExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4972 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4973 Expression *e1;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4974 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4975 Loc loc = this->loc;
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 e = parseOrOrExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4978 if (token.value == TOKquestion)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4979 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4980 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4981 e1 = parseExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4982 check(TOKcolon);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4983 e2 = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4984 e = new CondExp(loc, e, e1, e2);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4987 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4988
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4989 Expression *Parser::parseAssignExp()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4990 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4991 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4992 Loc loc;
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 e = parseCondExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4995 while (1)
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 loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
4998 switch (token.value)
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 #define X(tok,ector) \
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5001 case tok: nextToken(); e2 = parseAssignExp(); e = new ector(loc,e,e2); continue;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5002
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5003 X(TOKassign, AssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5004 X(TOKaddass, AddAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5005 X(TOKminass, MinAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5006 X(TOKmulass, MulAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5007 X(TOKdivass, DivAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5008 X(TOKmodass, ModAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5009 X(TOKandass, AndAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5010 X(TOKorass, OrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5011 X(TOKxorass, XorAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5012 X(TOKshlass, ShlAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5013 X(TOKshrass, ShrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5014 X(TOKushrass, UshrAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5015 X(TOKcatass, CatAssignExp);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5016
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5017 #undef X
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5018 default:
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5019 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5020 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5021 break;
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5024 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5025
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5026 Expression *Parser::parseExpression()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5027 { Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5028 Expression *e2;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5029 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5030
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5031 //printf("Parser::parseExpression() loc = %d\n", loc.linnum);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5032 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5033 while (token.value == TOKcomma)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5034 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5035 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5036 e2 = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5037 e = new CommaExp(loc, e, e2);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5038 loc = this->loc;
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 return e;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5043
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5044 /*************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5045 * Collect argument list.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5046 * Assume current token is '(' or '['.
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5047 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5048
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5049 Expressions *Parser::parseArguments()
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5050 { // function call
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5051 Expressions *arguments;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5052 Expression *arg;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5053 enum TOK endtok;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5054
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5055 arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5056 if (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5057 endtok = TOKrbracket;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5058 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5059 endtok = TOKrparen;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5060
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 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5063 if (token.value != endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5064 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5065 while (1)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5066 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5067 arg = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5068 arguments->push(arg);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5069 if (token.value == endtok)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5070 break;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5071 check(TOKcomma);
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5074 check(endtok);
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 return arguments;
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 /*******************************************
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5080 */
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5081
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5082 Expression *Parser::parseNewExp(Expression *thisexp)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5083 { Type *t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5084 Expressions *newargs;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5085 Expressions *arguments = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5086 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5087 Loc loc = this->loc;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5088
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5089 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5090 newargs = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5091 if (token.value == TOKlparen)
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 newargs = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5094 }
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 // An anonymous nested class starts with "class"
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5097 if (token.value == TOKclass)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5098 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5099 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5100 if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5101 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5102
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5103 BaseClasses *baseclasses = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5104 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5105 baseclasses = parseBaseClasses();
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 Identifier *id = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5108 ClassDeclaration *cd = new ClassDeclaration(loc, id, baseclasses);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5109
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5110 if (token.value != TOKlcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5111 { error("{ members } expected for anonymous class");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5112 cd->members = NULL;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5113 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5114 else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5115 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5116 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5117 Array *decl = parseDeclDefs(0);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5118 if (token.value != TOKrcurly)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5119 error("class member expected");
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5120 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5121 cd->members = decl;
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5124 e = new NewAnonClassExp(loc, thisexp, newargs, cd, arguments);
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 return e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5127 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5128
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5129 #if LTORARRAYDECL
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5130 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5131 t = parseBasicType2(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5132 if (t->ty == Taarray)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5133 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5134 Type *index = ((TypeAArray *)t)->index;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5135
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5136 Expression *e = index->toExpression();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5137 if (e)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5138 { arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5139 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5140 t = new TypeDArray(t->next);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5141 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5142 else
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 error("need size of rightmost array, not type %s", index->toChars());
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5145 return new NullExp(loc);
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 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5148 else if (t->ty == Tsarray)
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 TypeSArray *tsa = (TypeSArray *)t;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5151 Expression *e = tsa->dim;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5152
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5153 arguments = new Expressions();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5154 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5155 t = new TypeDArray(t->next);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5156 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5157 else if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5158 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5159 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5160 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5161 #else
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5162 t = parseBasicType();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5163 while (token.value == TOKmul)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5164 { t = new TypePointer(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5165 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5166 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5167 if (token.value == TOKlbracket)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5168 {
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5169 Expression *e;
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5170
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5171 nextToken();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5172 e = parseAssignExp();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5173 arguments = new Array();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5174 arguments->push(e);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5175 check(TOKrbracket);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5176 t = parseDeclarator(t, NULL);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5177 t = new TypeDArray(t);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5178 }
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5179 else if (token.value == TOKlparen)
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5180 arguments = parseArguments();
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5181 #endif
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5182 e = new NewExp(loc, thisexp, newargs, t, arguments);
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5183 return e;
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 /**********************************************
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5189 void Parser::addComment(Dsymbol *s, unsigned char *blockComment)
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 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
5192 token.lineComment = NULL;
336
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
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5195
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5196 /********************************* ***************************/
aaade6ded589 [svn r357] Merged DMD 1.033
lindquist
parents: 232
diff changeset
5197