Mercurial > projects > dil

annotate trunk/src/dil/Parser.d @ 508:943ecc9c133a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added isIntegralType() to Token and refactored code.
author Aziz K?ksal <aziz.koeksal@gmail.com>
date Wed, 12 Dec 2007 03:25:07 +0100
parents 996041463028
children baa7c4c0be78
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
8ba2570de175 Initial import.
aziz
parents:
diff changeset
1 /++
8ba2570de175 Initial import.
aziz
parents:
diff changeset
2 Author: Aziz Köksal
249
32d354584b28 - Upgraded license notices to GPL3.
aziz
parents: 248
diff changeset
3 License: GPL3
0
8ba2570de175 Initial import.
aziz
parents:
diff changeset
4 +/
326
4a7359b88c11 - Added package 'dil' to module declarations.
aziz
parents: 325
diff changeset
5 module dil.Parser;
327
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
6 import dil.Lexer;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
7 import dil.SyntaxTree;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
8 import dil.Token;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
9 import dil.Messages;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
10 import dil.Information;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
11 import dil.Declarations;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
12 import dil.Statements;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
13 import dil.Expressions;
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
14 import dil.Types;
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
15 import dil.Enums;
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
16 import dil.CompilerInfo;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
17 import dil.IdTable;
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
18 import common;
65
6c21ae79fbb3 - Renamed function Token.span to Token.srcText.
aziz
parents: 0
diff changeset
19
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
20 /++
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
21 The Parser produces an abstract syntax tree (AST) by analyzing
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
22 the tokens of the provided source code.
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
23 +/
65
6c21ae79fbb3 - Renamed function Token.span to Token.srcText.
aziz
parents: 0
diff changeset
24 class Parser
6c21ae79fbb3 - Renamed function Token.span to Token.srcText.
aziz
parents: 0
diff changeset
25 {
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
26 Lexer lx;
318
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
27 Token* token; /// Current non-whitespace token.
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
28 Token* prevToken; /// Previous non-whitespace token.
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
29
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
30 Information[] errors;
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
31
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
32 ImportDeclaration[] imports; /// ImportDeclarations in the source text.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
33
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
34 LinkageType linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
35 Protection protection;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
36 StorageClass storageClass;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
37 uint alignSize = DEFAULT_ALIGN_SIZE;
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 359
diff changeset
38
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
39 private alias TOK T;
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
40
491
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
41 this(char[] srcText, string filePath, InformationManager infoMan = null)
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
42 {
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
43 lx = new Lexer(srcText, filePath);
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
44 }
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
45
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
46 protected void init()
206
f9f5c0949a06 - Added method start().
aziz
parents: 205
diff changeset
47 {
f9f5c0949a06 - Added method start().
aziz
parents: 205
diff changeset
48 nT();
318
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
49 prevToken = token;
206
f9f5c0949a06 - Added method start().
aziz
parents: 205
diff changeset
50 }
f9f5c0949a06 - Added method start().
aziz
parents: 205
diff changeset
51
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
52 void nT()
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
53 {
318
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
54 prevToken = token;
132
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
55 do
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
56 {
c97a3f683d13 - Skipping comments in nT().
aziz
parents: 131
diff changeset
57 lx.nextToken();
239
7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK.
aziz
parents: 238
diff changeset
58 token = lx.token;
314
ebd21bbf296e - Added Whitespace, Sheband and Hashline to enum TOK. TOK.Whitespace is a flag and tokens that are considered whitespace are flagged as such.
aziz
parents: 313
diff changeset
59 } while (token.isWhitespace) // Skip whitespace
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
60 }
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
61
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
62 /++
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
63 Start the parser and return the parsed Declarations.
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
64 +/
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
65 Declarations start()
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
66 {
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
67 init();
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
68 auto begin = token;
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
69 auto decls = new Declarations;
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
70 if (token.type == T.Module)
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
71 decls ~= parseModuleDeclaration();
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
72 decls.addOptChildren(parseDeclarationDefinitions());
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
73 set(decls, begin);
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
74 return decls;
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
75 }
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
76
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
77 /++
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
78 Start the parser and return the parsed Expression.
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
79 +/
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
80 Expression start2()
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
81 {
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
82 init();
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
83 return parseExpression();
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
84 }
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
85
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
86 uint trying;
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
87 uint errorCount;
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
88
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
89 /++
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
90 This method executes the delegate parseMethod and when an error occurred
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
91 the state of the lexer and parser are restored.
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
92 +/
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
93 ReturnType try_(ReturnType)(ReturnType delegate() parseMethod, out bool success)
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
94 {
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
95 auto oldToken = this.token;
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
96 auto oldPrevToken = this.prevToken;
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
97 auto oldCount = this.errorCount;
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
98
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
99 ++trying;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
100 auto result = parseMethod();
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
101 --trying;
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
102 // Check if an error occurred.
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
103 if (errorCount != oldCount)
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
104 {
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
105 // Restore members.
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
106 token = oldToken;
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
107 prevToken = oldPrevToken;
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
108 lx.token = oldToken;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
109 errorCount = oldCount;
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
110 success = false;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
111 }
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
112 else
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
113 success = true;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
114 return result;
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
115 }
105
df34ec47fb81 - Added getState() method and State struct to Lexer.
aziz
parents: 104
diff changeset
116
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
117 /++
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
118 Sets the begin and end tokens of an AST node.
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
119 +/
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
120 Class set(Class)(Class node, Token* begin)
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
121 {
318
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
122 node.setTokens(begin, this.prevToken);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
123 return node;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
124 }
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
125
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
126 /++
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
127 Returns true if set() has been called on a node.
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
128 +/
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
129 bool isNodeSet(Node node)
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
130 {
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
131 return node.begin !is null && node.end !is null;
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
132 }
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
133
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
134 TOK peekNext()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
135 {
239
7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK.
aziz
parents: 238
diff changeset
136 Token* next = token;
296
3a2afc425ceb - Fix in peekNext(): need to skip comments.
aziz
parents: 295
diff changeset
137 do
3a2afc425ceb - Fix in peekNext(): need to skip comments.
aziz
parents: 295
diff changeset
138 lx.peek(next);
314
ebd21bbf296e - Added Whitespace, Sheband and Hashline to enum TOK. TOK.Whitespace is a flag and tokens that are considered whitespace are flagged as such.
aziz
parents: 313
diff changeset
139 while (next.isWhitespace) // Skip whitespace
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
140 return next.type;
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
141 }
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
142
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
143 TOK peekAfter(ref Token* next)
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
144 {
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
145 assert(next !is null);
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
146 do
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
147 lx.peek(next);
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
148 while (next.isWhitespace) // Skip whitespace
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
149 return next.type;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
150 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
151
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
152 /++++++++++++++++++++++++++++++
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
153 + Declaration parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
154 ++++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
155
368
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
156 Declaration parseModuleDeclaration()
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
157 {
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
158 auto begin = token;
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
159 ModuleFQN moduleFQN;
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
160 do
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
161 {
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
162 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
163 moduleFQN ~= requireIdentifier(MSG.ExpectedModuleIdentifier);
368
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
164 } while (token.type == T.Dot)
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
165 require(T.Semicolon);
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
166 return set(new ModuleDeclaration(moduleFQN), begin);
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
167 }
2adf808343d6 - Renamed method start() to init() in Parser.
aziz
parents: 367
diff changeset
168
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
169 /++
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
170 Parse DeclarationDefinitions until the end of file is hit.
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
171 DeclDefs:
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
172 DeclDef
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
173 DeclDefs
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
174 +/
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
175 Declaration[] parseDeclarationDefinitions()
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
176 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
177 Declaration[] decls;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
178 while (token.type != T.EOF)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
179 decls ~= parseDeclarationDefinition();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
180 return decls;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
181 }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
182
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
183 /++
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
184 Parse the body of a template, class, interface, struct or union.
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
185 DeclDefsBlock:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
186 { }
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
187 { DeclDefs }
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
188 +/
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
189 Declarations parseDeclarationDefinitionsBody()
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
190 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
191 // Save attributes.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
192 auto linkageType = this.linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
193 auto protection = this.protection;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
194 auto storageClass = this.storageClass;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
195 // Clear attributes.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
196 this.linkageType = LinkageType.None;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
197 this.protection = Protection.None;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
198 this.storageClass = StorageClass.None;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
199
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
200 // Parse body.
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
201 auto begin = token;
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
202 auto decls = new Declarations;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
203 require(T.LBrace);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
204 while (token.type != T.RBrace && token.type != T.EOF)
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
205 decls ~= parseDeclarationDefinition();
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
206 require(T.RBrace);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
207 set(decls, begin);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
208
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
209 // Restore original values.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
210 this.linkageType = linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
211 this.protection = protection;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
212 this.storageClass = storageClass;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
213
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
214 return decls;
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
215 }
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
216
110
2fb631daaaae - Renamed methods.
aziz
parents: 109
diff changeset
217 Declaration parseDeclarationDefinition()
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
218 out(decl)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
219 { assert(isNodeSet(decl)); }
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
220 body
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
221 {
262
0f22269e76ff - Changed some string types to Token*.
aziz
parents: 261
diff changeset
222 auto begin = token;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
223 Declaration decl;
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
224 switch (token.type)
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
225 {
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
226 case T.Align,
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
227 T.Pragma,
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
228 // Protection attributes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
229 T.Export,
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
230 T.Private,
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
231 T.Package,
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
232 T.Protected,
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
233 T.Public:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
234 decl = parseAttributeSpecifier();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
235 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
236 // Storage classes
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
237 case T.Extern,
203
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now.
aziz
parents: 202
diff changeset
238 T.Deprecated,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now.
aziz
parents: 202
diff changeset
239 T.Override,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now.
aziz
parents: 202
diff changeset
240 T.Abstract,
4f949a3a394b - synchronized is parsed as an Attribute in parseDeclarationDefinition() now.
aziz
parents: 202
diff changeset
241 T.Synchronized,
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
242 //T.Static,
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
243 T.Final,
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
244 T.Const,
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
245 //T.Invariant, // D 2.0
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
246 T.Auto,
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
247 T.Scope:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
248 case_StaticAttribute:
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
249 case_InvariantAttribute: // D 2.0
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
250 return parseStorageAttribute();
191
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
251 case T.Alias:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
252 nT();
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
253 // TODO: parse StorageClasses?
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
254 decl = new AliasDeclaration(parseVariableOrFunction());
191
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
255 break;
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
256 case T.Typedef:
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
257 nT();
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
258 // TODO: parse StorageClasses?
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
259 decl = new TypedefDeclaration(parseVariableOrFunction());
191
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
260 break;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
261 case T.Static:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
262 switch (peekNext())
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
263 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
264 case T.Import:
429
052cbacb1642 Fix: removed infinite loop when parsing static imports.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 424
diff changeset
265 goto case_Import;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
266 case T.This:
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
267 decl = parseStaticConstructorDeclaration();
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
268 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
269 case T.Tilde:
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
270 decl = parseStaticDestructorDeclaration();
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
271 break;
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
272 case T.If:
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
273 decl = parseStaticIfDeclaration();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
274 break;
127
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
275 case T.Assert:
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
276 decl = parseStaticAssertDeclaration();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
277 break;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
278 default:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
279 goto case_StaticAttribute;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
280 }
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
281 break;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
282 case T.Import:
429
052cbacb1642 Fix: removed infinite loop when parsing static imports.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 424
diff changeset
283 case_Import:
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
284 decl = parseImportDeclaration();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
285 imports ~= CastTo!(ImportDeclaration)(decl);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
286 // Handle specially. StorageClass mustn't be set.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
287 decl.setProtection(this.protection);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
288 return set(decl, begin);
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
289 case T.Enum:
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
290 decl = parseEnumDeclaration();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
291 break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
292 case T.Class:
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
293 decl = parseClassDeclaration();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
294 break;
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
295 case T.Interface:
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
296 decl = parseInterfaceDeclaration();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
297 break;
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
298 case T.Struct, T.Union:
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
299 decl = parseAggregateDeclaration();
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
300 break;
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
301 case T.This:
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
302 decl = parseConstructorDeclaration();
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
303 break;
118
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
304 case T.Tilde:
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
305 decl = parseDestructorDeclaration();
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
306 break;
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
307 case T.Invariant:
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
308 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
309 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
310 auto next = token;
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
311 if (peekAfter(next) == T.LParen)
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
312 {
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
313 if (peekAfter(next) != T.RParen)
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
314 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
315 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
316 else
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
317 goto case_InvariantAttribute;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
318 }
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
319 decl = parseInvariantDeclaration();
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
320 break;
121
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
321 case T.Unittest:
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
322 decl = parseUnittestDeclaration();
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
323 break;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
324 case T.Debug:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
325 decl = parseDebugDeclaration();
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
326 break;
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
327 case T.Version:
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
328 decl = parseVersionDeclaration();
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
329 break;
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
330 case T.Template:
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
331 decl = parseTemplateDeclaration();
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
332 break;
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
333 case T.New:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
334 decl = parseNewDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
335 break;
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
336 case T.Delete:
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
337 decl = parseDeleteDeclaration();
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
338 break;
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
339 case T.Mixin:
256
8f27920ae17a - Made parseMixinDeclaration() a template.
aziz
parents: 255
diff changeset
340 decl = parseMixin!(MixinDeclaration)();
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
341 break;
129
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
342 case T.Semicolon:
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
343 nT();
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
344 decl = new EmptyDeclaration();
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
345 break;
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
346 // Declaration
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
347 case T.Identifier, T.Dot, T.Typeof:
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
348 case_Declaration:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
349 return parseVariableOrFunction(this.storageClass, this.protection, this.linkageType);
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
350 /+case T.Module:
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
351 // TODO: Error: module is optional and can appear only once at the top of the source file.
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
352 break;+/
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
353 default:
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
354 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
355 goto case_Declaration;
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
356
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
357 decl = new IllegalDeclaration();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
358 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
359 do
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
360 nT();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
361 while (!token.isDeclDefStart &&
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
362 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
363 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
364 auto text = Token.textSpan(begin, this.prevToken);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
365 error(begin, MSG.IllegalDeclaration ~ text);
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
366 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
367 decl.setProtection(this.protection);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
368 decl.setStorageClass(this.storageClass);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
369 assert(!isNodeSet(decl));
262
0f22269e76ff - Changed some string types to Token*.
aziz
parents: 261
diff changeset
370 set(decl, begin);
129
a9244d409652 - Added class EmptyDeclaration.
aziz
parents: 128
diff changeset
371 return decl;
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
372 }
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
373
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
374 /++
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
375 DeclarationsBlock:
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
376 : DeclDefs
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
377 { }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
378 { DeclDefs }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
379 DeclDef
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
380 +/
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
381 Declaration parseDeclarationsBlock(bool noColon = false)
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
382 {
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
383 Declaration d;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
384 switch (token.type)
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
385 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
386 case T.LBrace:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
387 nT();
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
388 auto begin = token;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
389 auto decls = new Declarations;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
390 while (token.type != T.RBrace && token.type != T.EOF)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
391 decls ~= parseDeclarationDefinition();
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
392 require(T.RBrace);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
393 d = set(decls, begin);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
394 break;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
395 case T.Colon:
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
396 if (noColon == true)
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
397 goto default;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
398 nT();
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
399 auto begin = token;
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
400 auto decls = new Declarations;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
401 while (token.type != T.RBrace && token.type != T.EOF)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
402 decls ~= parseDeclarationDefinition();
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
403 d = set(decls, begin);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
404 break;
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
405 default:
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
406 d = parseDeclarationDefinition();
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
407 }
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
408 assert(isNodeSet(d));
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
409 return d;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
410 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
411
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
412 Declaration parseDeclarationsBlockNoColon()
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
413 {
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
414 return parseDeclarationsBlock(true);
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
415 }
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
416
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
417 /++
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
418 Parses either a VariableDeclaration or a FunctionDeclaration.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
419 Params:
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
420 stc = the previously parsed storage classes
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
421 optionalParameterList = a hint for how to parse C-style function pointers
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
422 +/
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
423 Declaration parseVariableOrFunction(StorageClass stc = StorageClass.None,
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
424 Protection protection = Protection.None,
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
425 LinkageType linkType = LinkageType.None,
501
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
426 bool testAutoDeclaration = false,
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
427 bool optionalParameterList = true)
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
428 {
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
429 auto begin = token;
202
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
430 Type type;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
431 Identifier* ident;
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
432
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
433 // Check for AutoDeclaration: StorageClasses Identifier =
501
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
434 if (testAutoDeclaration &&
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
435 token.type == T.Identifier &&
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
436 peekNext() == T.Assign)
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
437 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
438 ident = token.ident;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
439 nT();
202
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
440 }
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
441 else
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
442 {
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
443 type = parseType();
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
444 if (token.type == T.LParen)
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
445 {
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
446 // C-style function pointers make the grammar ambiguous.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
447 // We have to treat them specially at function scope.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
448 // Example:
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
449 // void foo() {
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
450 // // A pointer to a function taking an integer and returning 'some_type'.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
451 // some_type (*p_func)(int);
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
452 // // In the following case precedence is given to a CallExpression.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
453 // something(*p); // 'something' may be a function/method or an object having opCall overloaded.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
454 // }
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
455 // // A pointer to a function taking no parameters and returning 'something'.
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
456 // something(*p);
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
457 type = parseCFunctionPointerType(type, ident, optionalParameterList);
415
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
458 }
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
459 else
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
460 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
461 ident = requireIdentifier(MSG.ExpectedFunctionName);
415
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
462 // Type FunctionName ( ParameterList ) FunctionBody
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
463 if (token.type == T.LParen)
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
464 {
415
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
465 // It's a function declaration
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
466 TemplateParameters tparams;
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
467 if (tokenAfterParenIs(T.LParen))
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
468 {
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
469 // ( TemplateParameterList ) ( ParameterList )
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
470 tparams = parseTemplateParameterList();
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
471 }
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
472
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
473 auto params = parseParameterList();
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
474 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
475 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
476 switch (token.type)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
477 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
478 case T.Const:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
479 stc |= StorageClass.Const;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
480 nT();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
481 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
482 case T.Invariant:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
483 stc |= StorageClass.Invariant;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
484 nT();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
485 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
486 default:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
487 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
488 }
415
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
489 // ReturnType FunctionName ( ParameterList )
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
490 auto funcBody = parseFunctionBody();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
491 auto d = new FunctionDeclaration(type, ident, tparams, params, funcBody);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
492 d.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
493 d.setLinkageType(linkType);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
494 d.setProtection(protection);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
495 return set(d, begin);
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
496 }
415
b18b0cd8f8cd Fixed parsing C function pointers in declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 414
diff changeset
497 type = parseDeclaratorSuffix(type);
202
8aecf8925c5f - Added code for parsing AutoDeclaration in parseDeclaration().
aziz
parents: 201
diff changeset
498 }
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
499 }
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
500
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
501 // It's a variable declaration.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
502 Identifier*[] idents = [ident];
194
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
503 Expression[] values;
199
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present.
aziz
parents: 198
diff changeset
504 goto LenterLoop; // We've already parsed an identifier. Jump to if statement and check for initializer.
194
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
505 while (token.type == T.Comma)
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
506 {
222
4f31e4671e06 - Fix: nT() wasn't called in while loop to skip T.Comma.
aziz
parents: 220
diff changeset
507 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
508 idents ~= requireIdentifier(MSG.ExpectedVariableName);
194
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
509 LenterLoop:
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
510 if (token.type == T.Assign)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
511 nT(), (values ~= parseInitializer());
199
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present.
aziz
parents: 198
diff changeset
512 else
a95fee6e4b7e - Fix: parseDeclaration(): appending null to values when no initializer present.
aziz
parents: 198
diff changeset
513 values ~= null;
194
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
514 }
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
515 require(T.Semicolon);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
516 auto d = new VariableDeclaration(type, idents, values);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
517 d.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
518 d.setLinkageType(linkType);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
519 d.setProtection(protection);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
520 return set(d, begin);
194
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
521 }
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
522
194
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
523 Expression parseInitializer()
b3604b237292 - Implemented parsing variable declarations.
aziz
parents: 193
diff changeset
524 {
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
525 if (token.type == T.Void)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
526 {
266
fea4e8b6cea5 - Added begin variables and calls to set().
aziz
parents: 265
diff changeset
527 auto begin = token;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
528 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
529 if (next == T.Comma || next == T.Semicolon)
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
530 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
531 nT();
266
fea4e8b6cea5 - Added begin variables and calls to set().
aziz
parents: 265
diff changeset
532 return set(new VoidInitializer(), begin);
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
533 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
534 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
535 return parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
536 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
537
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
538 Expression parseNonVoidInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
539 {
266
fea4e8b6cea5 - Added begin variables and calls to set().
aziz
parents: 265
diff changeset
540 auto begin = token;
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
541 Expression init;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
542 switch (token.type)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
543 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
544 case T.LBracket:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
545 // ArrayInitializer:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
546 // [ ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
547 // [ ArrayMemberInitializations ]
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
548 Expression[] keys;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
549 Expression[] values;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
550
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
551 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
552 while (token.type != T.RBracket)
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
553 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
554 auto e = parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
555 if (token.type == T.Colon)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
556 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
557 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
558 keys ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
559 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
560 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
561 else
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
562 {
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
563 keys ~= null;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
564 values ~= e;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
565 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
566
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
567 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
568 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
569 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
570 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
571 require(T.RBracket);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
572 init = new ArrayInitializer(keys, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
573 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
574 case T.LBrace:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
575 // StructInitializer:
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
576 // { }
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
577 // { StructMemberInitializers }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
578 Expression parseStructInitializer()
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
579 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
580 Identifier*[] idents;
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
581 Expression[] values;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
582
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
583 nT();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
584 while (token.type != T.RBrace)
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
585 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
586 if (token.type == T.Identifier &&
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
587 // Peek for colon to see if this is a member identifier.
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
588 peekNext() == T.Colon)
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
589 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
590 idents ~= token.ident;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
591 nT(), nT(); // Skip Identifier :
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
592 }
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
593 else
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
594 idents ~= null;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
595
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
596 // NonVoidInitializer
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
597 values ~= parseNonVoidInitializer();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
598
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
599 if (token.type != T.Comma)
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
600 break;
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
601 nT();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
602 }
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
603 require(T.RBrace);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
604 return new StructInitializer(idents, values);
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
605 }
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
606
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
607 bool success;
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
608 auto si = try_(&parseStructInitializer, success);
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
609 if (success)
200
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed.
aziz
parents: 199
diff changeset
610 {
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
611 init = si;
200
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed.
aziz
parents: 199
diff changeset
612 break;
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed.
aziz
parents: 199
diff changeset
613 }
216
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
614 assert(token.type == T.LBrace);
200
61f60112ac63 - Fix: parsing AssignExpression when parsing StructInitializer failed.
aziz
parents: 199
diff changeset
615 //goto default;
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
616 default:
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
617 init = parseAssignExpression();
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
618 }
266
fea4e8b6cea5 - Added begin variables and calls to set().
aziz
parents: 265
diff changeset
619 set(init, begin);
198
88c1777a9e51 - Implemented parseInitializer() and parseNonVoidInitializer().
aziz
parents: 197
diff changeset
620 return init;
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
621 }
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
622
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
623 FunctionBody parseFunctionBody()
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
624 {
268
c19b68a4e3db - FunctionBody inherits from Node now.
aziz
parents: 267
diff changeset
625 auto begin = token;
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
626 auto func = new FunctionBody;
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
627 while (1)
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
628 {
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
629 switch (token.type)
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
630 {
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
631 case T.LBrace:
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
632 func.funcBody = parseStatements();
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
633 break;
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
634 case T.Semicolon:
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
635 nT();
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
636 break;
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
637 case T.In:
342
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract.
aziz
parents: 341
diff changeset
638 if (func.inBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract.
aziz
parents: 341
diff changeset
639 error(MID.InContract);
226
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called.
aziz
parents: 225
diff changeset
640 nT();
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
641 func.inBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
642 continue;
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
643 case T.Out:
342
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract.
aziz
parents: 341
diff changeset
644 if (func.outBody)
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract.
aziz
parents: 341
diff changeset
645 error(MID.OutContract);
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
646 nT();
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
647 if (token.type == T.LParen)
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
648 {
226
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called.
aziz
parents: 225
diff changeset
649 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
650 func.outIdent = requireIdentifier(MSG.ExpectedAnIdentifier);
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
651 require(T.RParen);
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
652 }
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
653 func.outBody = parseStatements();
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
654 continue;
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
655 case T.Body:
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
656 nT();
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
657 goto case T.LBrace;
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
658 default:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
659 error(token, MSG.ExpectedFunctionBody, token.srcText);
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
660 }
342
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract.
aziz
parents: 341
diff changeset
661 break; // Exit loop.
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
662 }
268
c19b68a4e3db - FunctionBody inherits from Node now.
aziz
parents: 267
diff changeset
663 set(func, begin);
299
559d5d62e0c1 - Added checks for null before adding member to Node.children.
aziz
parents: 298
diff changeset
664 func.finishConstruction();
193
2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression.
aziz
parents: 192
diff changeset
665 return func;
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
666 }
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
667
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
668 LinkageType parseLinkageType()
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
669 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
670 LinkageType linkageType;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
671 if (token.type != T.LParen)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
672 return linkageType;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
673
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
674 nT(); // Skip (
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
675 if (token.type == T.RParen)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
676 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
677 nT();
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
678 error(MID.MissingLinkageType);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
679 return linkageType;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
680 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
681
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
682 auto identTok = requireId();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
683
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
684 ID identID = identTok ? identTok.ident.identID : ID.Null;
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
685
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
686 switch (identID)
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
687 {
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
688 case ID.C:
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
689 if (token.type == T.PlusPlus)
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
690 {
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
691 nT();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
692 linkageType = LinkageType.Cpp;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
693 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
694 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
695 linkageType = LinkageType.C;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
696 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
697 case ID.D:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
698 linkageType = LinkageType.D;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
699 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
700 case ID.Windows:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
701 linkageType = LinkageType.Windows;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
702 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
703 case ID.Pascal:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
704 linkageType = LinkageType.Pascal;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
705 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
706 case ID.System:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
707 linkageType = LinkageType.System;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
708 break;
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
709 default:
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
710 error(MID.UnrecognizedLinkageType, token.srcText);
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
711 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
712 require(T.RParen);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
713 return linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
714 }
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
715
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
716 void checkLinkageType(ref LinkageType prev_lt, LinkageType lt, Token* begin)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
717 {
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
718 if (prev_lt == LinkageType.None)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
719 prev_lt = lt;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
720 else
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
721 // TODO: create new msg RedundantLinkageType.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
722 error(begin, MSG.RedundantLinkageType ~ Token.textSpan(begin, this.prevToken));
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
723 }
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
724
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
725 Declaration parseStorageAttribute()
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
726 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
727 StorageClass stc, stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
728 LinkageType prev_linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
729
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
730 auto saved_storageClass = this.storageClass; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
731 // Nested function.
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
732 Declaration parse()
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
733 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
734 Declaration decl;
359
511c14950cac - Added messages MissingLinkageType and UnrecognizedLinkageType.
aziz
parents: 358
diff changeset
735 auto begin = token;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
736 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
737 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
738 case T.Extern:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
739 if (peekNext() != T.LParen)
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
740 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
741 stc_tmp = StorageClass.Extern;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
742 goto Lcommon;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
743 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
744
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
745 nT();
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
746 auto linkageType = parseLinkageType();
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
747 checkLinkageType(prev_linkageType, linkageType, begin);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
748
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
749 auto saved = this.linkageType; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
750 this.linkageType = linkageType; // Set.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
751 decl = new LinkageDeclaration(linkageType, parse());
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
752 set(decl, begin);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
753 this.linkageType = saved; // Restore.
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
754 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
755 case T.Override:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
756 stc_tmp = StorageClass.Override;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
757 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
758 case T.Deprecated:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
759 stc_tmp = StorageClass.Deprecated;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
760 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
761 case T.Abstract:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
762 stc_tmp = StorageClass.Abstract;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
763 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
764 case T.Synchronized:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
765 stc_tmp = StorageClass.Synchronized;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
766 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
767 case T.Static:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
768 stc_tmp = StorageClass.Static;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
769 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
770 case T.Final:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
771 stc_tmp = StorageClass.Final;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
772 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
773 case T.Const:
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
774 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
775 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
776 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
777 goto case_Declaration;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
778 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
779 stc_tmp = StorageClass.Const;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
780 goto Lcommon;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
781 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
782 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
783 case T.Invariant: // D 2.0
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
784 auto next = token;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
785 if (peekAfter(next) == T.LParen)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
786 {
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
787 if (peekAfter(next) != T.RParen)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
788 goto case_Declaration; // invariant ( Type )
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
789 decl = parseDeclarationDefinition(); // invariant ( )
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
790 decl.setStorageClass(stc);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
791 break;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
792 }
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
793 // invariant as StorageClass.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
794 stc_tmp = StorageClass.Invariant;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
795 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
796 }
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
797 case T.Auto:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
798 stc_tmp = StorageClass.Auto;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
799 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
800 case T.Scope:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
801 stc_tmp = StorageClass.Scope;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
802 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
803 Lcommon:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
804 // Issue error if redundant.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
805 if (stc & stc_tmp)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
806 error(MID.RedundantStorageClass, token.srcText);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
807 else
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
808 stc |= stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
809
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
810 auto tok = token.type;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
811 nT();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
812 decl = new StorageClassDeclaration(stc_tmp, tok, parse());
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
813 set(decl, begin);
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
814 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
815 case T.Identifier:
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
816 case_Declaration:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
817 // This could be a normal Declaration or an AutoDeclaration
501
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
818 decl = parseVariableOrFunction(stc, this.protection, prev_linkageType, true);
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
819 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
820 default:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
821 this.storageClass = stc; // Set.
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
822 decl = parseDeclarationsBlock();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
823 this.storageClass = saved_storageClass; // Reset.
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
824 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
825 assert(isNodeSet(decl));
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
826 return decl;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
827 }
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
828 return parse();
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
829 }
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
830
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
831 uint parseAlignAttribute()
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
832 {
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
833 assert(token.type == T.Align);
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
834 nT(); // Skip align keyword.
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
835 uint size = DEFAULT_ALIGN_SIZE; // Global default.
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
836 if (token.type == T.LParen)
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
837 {
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
838 nT();
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
839 if (token.type == T.Int32)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
840 (size = token.int_), nT();
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
841 else
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
842 expected(T.Int32);
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
843 require(T.RParen);
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
844 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
845 return size;
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
846 }
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
847
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
848 Declaration parseAttributeSpecifier()
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
849 {
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
850 Declaration decl;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
851
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
852 switch (token.type)
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
853 {
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
854 case T.Align:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
855 uint alignSize = parseAlignAttribute();
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
856 auto saved = this.alignSize; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
857 this.alignSize = alignSize; // Set.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
858 decl = new AlignDeclaration(alignSize, parseDeclarationsBlock());
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
859 this.alignSize = saved; // Restore.
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
860 break;
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
861 case T.Pragma:
147
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
862 // Pragma:
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
863 // pragma ( Identifier )
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
864 // pragma ( Identifier , ExpressionList )
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
865 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
866 Identifier* ident;
147
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
867 Expression[] args;
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
868
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
869 require(T.LParen);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
870 ident = requireIdentifier(MSG.ExpectedPragmaIdentifier);
147
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
871
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
872 if (token.type == T.Comma)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
873 nT(), (args = parseExpressionList());
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
874 require(T.RParen);
147
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
875
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
876 decl = new PragmaDeclaration(ident, args, parseDeclarationsBlock());
147
e46b3415ec16 - Implemented parsing pragma declarations.
aziz
parents: 146
diff changeset
877 break;
491
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
878 default:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
879 // Protection attributes
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
880 Protection prot;
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
881 switch (token.type)
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
882 {
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
883 case T.Private:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
884 prot = Protection.Private; break;
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
885 case T.Package:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
886 prot = Protection.Package; break;
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
887 case T.Protected:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
888 prot = Protection.Protected; break;
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
889 case T.Public:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
890 prot = Protection.Public; break;
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
891 case T.Export:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
892 prot = Protection.Export; break;
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
893 default:
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
894 assert(0);
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
895 }
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
896 nT();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
897 auto saved = this.protection; // Save.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
898 this.protection = prot; // Set.
491
b991f49628a8 Forgot committing Parser.d as well.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 489
diff changeset
899 decl = new ProtectionDeclaration(prot, parseDeclarationsBlock());
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
900 this.protection = saved; // Restore.
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
901 }
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
902 return decl;
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
903 }
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
904
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
905 Declaration parseImportDeclaration()
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
906 {
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
907 assert(token.type == T.Import || token.type == T.Static);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
908
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
909 bool isStatic;
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
910
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
911 if (token.type == T.Static)
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
912 {
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
913 isStatic = true;
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
914 nT();
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
915 }
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
916
429
052cbacb1642 Fix: removed infinite loop when parsing static imports.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 424
diff changeset
917 assert(token.type == T.Import);
052cbacb1642 Fix: removed infinite loop when parsing static imports.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 424
diff changeset
918
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 359
diff changeset
919 ModuleFQN[] moduleFQNs;
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
920 Identifier*[] moduleAliases;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
921 Identifier*[] bindNames;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
922 Identifier*[] bindAliases;
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
923
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
924 nT(); // Skip import keyword.
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
925 while (1)
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
926 {
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 359
diff changeset
927 ModuleFQN moduleFQN;
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
928 Identifier* moduleAlias;
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
929
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
930 // AliasName = ModuleName
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
931 if (peekNext() == T.Assign)
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
932 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
933 moduleAlias = requireIdentifier(MSG.ExpectedAliasModuleName);
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
934 nT(); // Skip =
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
935 }
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
936
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
937 // Identifier(.Identifier)*
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
938 while (1)
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
939 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
940 moduleFQN ~= requireIdentifier(MSG.ExpectedModuleIdentifier);
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
941 if (token.type != T.Dot)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
942 break;
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
943 nT();
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
944 }
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
945
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
946 // Push identifiers.
364
1059295c2727 - Every command module has an execute method now.
aziz
parents: 359
diff changeset
947 moduleFQNs ~= moduleFQN;
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
948 moduleAliases ~= moduleAlias;
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
949
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
950 if (token.type != T.Comma)
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
951 break;
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
952 nT();
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
953 }
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
954
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
955 if (token.type == T.Colon)
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
956 {
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
957 // BindAlias = BindName(, BindAlias = BindName)*;
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
958 // BindName(, BindName)*;
320
0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT().
aziz
parents: 319
diff changeset
959 do
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
960 {
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
961 nT();
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
962 Identifier* bindAlias;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
963 // BindAlias = BindName
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
964 if (peekNext() == T.Assign)
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
965 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
966 bindAlias = requireIdentifier(MSG.ExpectedAliasImportName);
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
967 nT(); // Skip =
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
968 }
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
969 // Push identifiers.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
970 bindNames ~= requireIdentifier(MSG.ExpectedImportName);
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
971 bindAliases ~= bindAlias;
320
0ce14640eb04 - Fix in parseImportDeclaration(): rewrote while loop and removed a call to nT().
aziz
parents: 319
diff changeset
972 } while (token.type == T.Comma)
298
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
973 }
dc8bed242db5 - Fixed parsing ImportDeclaration.
aziz
parents: 297
diff changeset
974
114
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
975 require(T.Semicolon);
83bb5190c0fc - Completed implementation of parseImportDeclaration().
aziz
parents: 113
diff changeset
976
366
dcbd3bf9bf74 - Added command importgraph/igraph to main.d.
aziz
parents: 364
diff changeset
977 return new ImportDeclaration(moduleFQNs, moduleAliases, bindNames, bindAliases, isStatic);
103
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
978 }
511a1aa25896 - Added reportErrors member to Lexer. Moved peek() down and rewrote it a bit making use of reportErrors. error() uses reportErrors too.
aziz
parents: 102
diff changeset
979
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
980 Declaration parseEnumDeclaration()
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
981 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
982 assert(token.type == T.Enum);
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
983
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
984 Identifier* enumName;
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
985 Type baseType;
406
e242f0ee2d27 Added class EnumMember.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 405
diff changeset
986 EnumMember[] members;
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
987 bool hasBody;
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
988
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
989 nT(); // Skip enum keyword.
231
6846138a0e24 - Fixed parseEnumDeclaration().
aziz
parents: 230
diff changeset
990
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
991 enumName = optionalIdentifier();
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
992
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
993 if (token.type == T.Colon)
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
994 {
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
995 nT();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
996 baseType = parseBasicType();
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
997 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
998
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
999 if (token.type == T.Semicolon)
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1000 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1001 if (enumName is null)
231
6846138a0e24 - Fixed parseEnumDeclaration().
aziz
parents: 230
diff changeset
1002 expected(T.Identifier);
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1003 nT();
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1004 }
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1005 else if (token.type == T.LBrace)
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1006 {
126
0f0e7352e91d - Renamed member hasDefinition of class Declaration to hasBody.
aziz
parents: 125
diff changeset
1007 hasBody = true;
398
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
1008 nT(); // Skip {
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
1009 while (token.type != T.RBrace)
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1010 {
406
e242f0ee2d27 Added class EnumMember.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 405
diff changeset
1011 auto begin = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1012 auto name = requireIdentifier(MSG.ExpectedEnumMember);
406
e242f0ee2d27 Added class EnumMember.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 405
diff changeset
1013 Expression value;
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1014
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1015 if (token.type == T.Assign)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1016 nT(), (value = parseAssignExpression());
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1017 else
406
e242f0ee2d27 Added class EnumMember.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 405
diff changeset
1018 value = null;
e242f0ee2d27 Added class EnumMember.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 405
diff changeset
1019
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1020 members ~= set(new EnumMember(name, value), begin);
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1021
398
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
1022 if (token.type != T.Comma)
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1023 break;
398
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
1024 nT(); // Skip ,
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
1025 }
f7bb892d64c2 Fixed Parser.parseEnumDeclaration(): empty enums are allowed now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 396
diff changeset
1026 require(T.RBrace);
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1027 }
231
6846138a0e24 - Fixed parseEnumDeclaration().
aziz
parents: 230
diff changeset
1028 else
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1029 error(token, MSG.ExpectedEnumBody, token.srcText);
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1030
406
e242f0ee2d27 Added class EnumMember.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 405
diff changeset
1031 return new EnumDeclaration(enumName, baseType, members, hasBody);
107
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1032 }
722c05bbd5eb - Implemented parseEnumDeclaration() and added class EnumDeclaration.
aziz
parents: 106
diff changeset
1033
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1034 Declaration parseClassDeclaration()
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1035 {
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1036 assert(token.type == T.Class);
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1037
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1038 Identifier* className;
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
1039 TemplateParameters tparams;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1040 BaseClass[] bases;
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
1041 Declarations decls;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1042
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1043 nT(); // Skip class keyword.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1044 className = requireIdentifier(MSG.ExpectedClassName);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1045
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1046 if (token.type == T.LParen)
195
37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations.
aziz
parents: 194
diff changeset
1047 tparams = parseTemplateParameterList();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1048
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1049 if (token.type == T.Colon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1050 bases = parseBaseClasses();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1051
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1052 if (token.type == T.Semicolon)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1053 {
405
e2529923a0cb Added two error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 404
diff changeset
1054 if (bases.length != 0)
e2529923a0cb Added two error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 404
diff changeset
1055 error(MID.BaseClassInForwardDeclaration);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1056 nT();
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1057 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1058 else if (token.type == T.LBrace)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1059 decls = parseDeclarationDefinitionsBody();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1060 else
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1061 error(token, MSG.ExpectedClassBody, token.srcText);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1062
494
9a7ca8c56e59 Refactored a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 493
diff changeset
1063 return new ClassDeclaration(className, tparams, bases, decls);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1064 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1065
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1066 BaseClass[] parseBaseClasses(bool colonLeadsOff = true)
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1067 {
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1068 if (colonLeadsOff)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1069 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1070 assert(token.type == T.Colon);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1071 nT(); // Skip colon
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
1072 }
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1073
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1074 BaseClass[] bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1075
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1076 while (1)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1077 {
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1078 Protection prot = Protection.Public;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1079 switch (token.type)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1080 {
204
082f30904456 - Allowing 'typeof' in BaseClassList.
aziz
parents: 203
diff changeset
1081 case T.Identifier, T.Dot, T.Typeof: goto LparseBasicType;
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1082 case T.Private: prot = Protection.Private; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1083 case T.Protected: prot = Protection.Protected; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1084 case T.Package: prot = Protection.Package; break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1085 case T.Public: /*prot = Protection.Public;*/ break;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1086 default:
405
e2529923a0cb Added two error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 404
diff changeset
1087 error(MID.ExpectedBaseClasses, token.srcText);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1088 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1089 }
158
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
1090 nT(); // Skip protection attribute.
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
1091 LparseBasicType:
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1092 auto begin = token;
158
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
1093 auto type = parseBasicType();
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
1094 //if (type.tid != TID.DotList)
759f437313f9 - Moved enum Protection and class BaseClass to module Types.
aziz
parents: 157
diff changeset
1095 // TODO: issue error msg. base classes can only be one or more identifiers or template instances separated by dots.
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1096 bases ~= set(new BaseClass(prot, type), begin);
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1097 if (token.type != T.Comma)
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1098 break;
396
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
1099 nT();
109
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1100 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1101 return bases;
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1102 }
d0cc281cacbd - Added methods parseClassDeclaration() and parseBaseClasses().
aziz
parents: 108
diff changeset
1103
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1104 Declaration parseInterfaceDeclaration()
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1105 {
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1106 assert(token.type == T.Interface);
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1107
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1108 Identifier* name;
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
1109 TemplateParameters tparams;
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1110 BaseClass[] bases;
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
1111 Declarations decls;
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1112
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1113 nT(); // Skip interface keyword.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1114 name = requireIdentifier(MSG.ExpectedInterfaceName);
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1115
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1116 if (token.type == T.LParen)
195
37c2ffd649c4 - Parsing template parameter list for class, interface, struct and union declarations.
aziz
parents: 194
diff changeset
1117 tparams = parseTemplateParameterList();
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1118
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1119 if (token.type == T.Colon)
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1120 bases = parseBaseClasses();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1121
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1122 if (token.type == T.Semicolon)
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1123 {
405
e2529923a0cb Added two error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 404
diff changeset
1124 if (bases.length != 0)
e2529923a0cb Added two error messages.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 404
diff changeset
1125 error(MID.BaseClassInForwardDeclaration);
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1126 nT();
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1127 }
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1128 else if (token.type == T.LBrace)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1129 decls = parseDeclarationDefinitionsBody();
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1130 else
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1131 error(token, MSG.ExpectedInterfaceBody, token.srcText);
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1132
494
9a7ca8c56e59 Refactored a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 493
diff changeset
1133 return new InterfaceDeclaration(name, tparams, bases, decls);
112
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1134 }
004d98df65af - Implemented parseInterfaceDeclaration().
aziz
parents: 111
diff changeset
1135
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1136 Declaration parseAggregateDeclaration()
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1137 {
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1138 assert(token.type == T.Struct || token.type == T.Union);
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1139
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1140 TOK tok = token.type;
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1141
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1142 Identifier* name;
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
1143 TemplateParameters tparams;
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
1144 Declarations decls;
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1145
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1146 nT(); // Skip struct or union keyword.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1147
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1148 name = optionalIdentifier();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1149
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1150 if (name && token.type == T.LParen)
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1151 tparams = parseTemplateParameterList();
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1152
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1153 if (token.type == T.Semicolon)
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1154 {
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1155 //if (name.length == 0)
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1156 // TODO: error: forward declarations must have a name.
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1157 nT();
115
cea36caeec42 - Added method requireIdentifier(). Removed if-else-statements which checked for T.Identifier and replaced with requireIdentifier().
aziz
parents: 114
diff changeset
1158 }
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1159 else if (token.type == T.LBrace)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1160 decls = parseDeclarationDefinitionsBody();
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1161 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
1162 expected(T.LBrace); // TODO: better error msg
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1163
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1164 if (tok == T.Struct)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1165 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1166 auto sd = new StructDeclaration(name, tparams, decls);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1167 sd.setAlignSize(this.alignSize);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1168 return sd;
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1169 }
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1170 else
494
9a7ca8c56e59 Refactored a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 493
diff changeset
1171 return new UnionDeclaration(name, tparams, decls);
113
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1172 }
20d8ae8a3fd9 - Implemented parseAggregateDeclaration for Struct- and UnionDeclarations.
aziz
parents: 112
diff changeset
1173
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1174 Declaration parseConstructorDeclaration()
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1175 {
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1176 assert(token.type == T.This);
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1177 nT(); // Skip 'this' keyword.
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1178 auto parameters = parseParameterList();
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1179 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1180 return new ConstructorDeclaration(parameters, funcBody);
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1181 }
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
1182
118
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1183 Declaration parseDestructorDeclaration()
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1184 {
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1185 assert(token.type == T.Tilde);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1186 nT(); // Skip ~
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1187 require(T.This);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1188 require(T.LParen);
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1189 require(T.RParen);
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1190 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1191 return new DestructorDeclaration(funcBody);
118
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1192 }
379f33cbd521 - Added parseDestructorDeclaration() and DestructorDeclaration class.
aziz
parents: 117
diff changeset
1193
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1194 Declaration parseStaticConstructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1195 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1196 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1197 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1198 nT(); // Skip 'this' keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1199 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1200 require(T.RParen);
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1201 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1202 return new StaticConstructorDeclaration(funcBody);
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1203 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1204
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1205 Declaration parseStaticDestructorDeclaration()
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1206 {
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1207 assert(token.type == T.Static);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1208 nT(); // Skip static keyword.
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1209 nT(); // Skip ~
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1210 require(T.This);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1211 require(T.LParen);
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1212 require(T.RParen);
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1213 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1214 return new StaticDestructorDeclaration(funcBody);
119
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1215 }
363cd39022f9 - Added parseStaticConstructor- and DestructorDeclaration().
aziz
parents: 118
diff changeset
1216
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1217 Declaration parseInvariantDeclaration()
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1218 {
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1219 assert(token.type == T.Invariant);
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1220 nT(); // Skip invariant keyword.
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1221 // Optional () for getting ready porting to D 2.0
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1222 if (token.type == T.LParen)
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1223 requireNext(T.RParen);
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1224 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1225 return new InvariantDeclaration(funcBody);
120
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1226 }
e5329dac0405 - Added parseInvariantDeclaration().
aziz
parents: 119
diff changeset
1227
121
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
1228 Declaration parseUnittestDeclaration()
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
1229 {
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
1230 assert(token.type == T.Unittest);
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
1231
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1232 nT(); // Skip unittest keyword.
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1233 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1234 return new UnittestDeclaration(funcBody);
121
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
1235 }
030933c6b5f0 - Added parseUnittestDeclaration().
aziz
parents: 120
diff changeset
1236
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1237 Declaration parseDebugDeclaration()
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1238 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1239 assert(token.type == T.Debug);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1240
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1241 nT(); // Skip debug keyword.
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1242
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1243 Token* spec; // debug = Integer ;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1244 // debug = Identifier ;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1245 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1246 // debug ( Identifier )
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
1247 Declaration decls, elseDecls;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1248
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1249 void parseIdentOrInt(ref Token* tok)
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1250 {
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1251 nT();
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1252 if (token.type == T.Int32 ||
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1253 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1254 {
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1255 tok = token;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1256 nT();
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1257 }
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1258 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
1259 expected(T.Identifier); // TODO: better error msg
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1260 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1261
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1262 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1263 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1264 parseIdentOrInt(spec);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1265 require(T.Semicolon);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1266 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1267 else
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1268 {
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1269 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1270 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1271 // Identifier
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1272 // ( Condition )
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1273 if (token.type == T.LParen)
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1274 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1275 parseIdentOrInt(cond);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1276 require(T.RParen);
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1277 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1278
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1279 // debug DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1280 // debug ( Condition ) DeclarationsBlock
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
1281 decls = parseDeclarationsBlockNoColon();
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1282
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1283 // else DeclarationsBlock
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1284 if (token.type == T.Else)
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1285 {
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1286 nT();
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
1287 elseDecls = parseDeclarationsBlockNoColon();
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1288 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1289 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1290
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1291 return new DebugDeclaration(spec, cond, decls, elseDecls);
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1292 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1293
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1294 Declaration parseVersionDeclaration()
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1295 {
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
1296 assert(token.type == T.Version);
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1297
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
1298 nT(); // Skip version keyword.
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1299
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1300 Token* spec; // version = Integer ;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1301 // version = Identifier ;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1302 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1303 // version ( Identifier )
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
1304 Declaration decls, elseDecls;
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1305
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1306 void parseIdentOrInt(ref Token* tok)
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1307 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1308 if (token.type == T.Int32 ||
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1309 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1310 {
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1311 tok = token;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1312 nT();
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1313 }
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1314 else
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
1315 expected(T.Identifier); // TODO: better error msg
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1316 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1317
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1318 if (token.type == T.Assign)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1319 {
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
1320 nT();
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1321 parseIdentOrInt(spec);
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1322 require(T.Semicolon);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1323 }
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1324 else
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1325 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1326 // Condition:
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1327 // Integer
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1328 // Identifier
146
8180eb84e69c - Started implementation of parseAttributeSpecifier().
aziz
parents: 145
diff changeset
1329
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1330 // ( Condition )
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1331 require(T.LParen);
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1332 parseIdentOrInt(cond);
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1333 require(T.RParen);
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1334
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1335 // version ( Condition ) DeclarationsBlock
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
1336 decls = parseDeclarationsBlockNoColon();
123
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1337
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1338 // else DeclarationsBlock
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1339 if (token.type == T.Else)
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1340 {
0f55c0ac6589 - Added method parseVersionDeclaration().
aziz
parents: 122
diff changeset
1341 nT();
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
1342 elseDecls = parseDeclarationsBlockNoColon();
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1343 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1344 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1345
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
1346 return new VersionDeclaration(spec, cond, decls, elseDecls);
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1347 }
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
1348
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1349 Declaration parseStaticIfDeclaration()
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1350 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1351 assert(token.type == T.Static);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1352
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1353 nT(); // Skip static keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1354 nT(); // Skip if keyword.
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1355
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1356 Expression condition;
305
df237b3b5f09 - Added class Declarations.
aziz
parents: 304
diff changeset
1357 Declaration ifDecls, elseDecls;
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1358
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1359 require(T.LParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1360 condition = parseAssignExpression();
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1361 require(T.RParen);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1362
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
1363 ifDecls = parseDeclarationsBlockNoColon();
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1364
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1365 if (token.type == T.Else)
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1366 {
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1367 nT();
404
fe46b5ea7a18 Added method parseDeclarationsBlockNoColon().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 400
diff changeset
1368 elseDecls = parseDeclarationsBlockNoColon();
125
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1369 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1370
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1371 return new StaticIfDeclaration(condition, ifDecls, elseDecls);
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1372 }
240a8b053803 - Added method parseStaticIfDeclaration and added class StaticIfDeclaration.
aziz
parents: 124
diff changeset
1373
127
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1374 Declaration parseStaticAssertDeclaration()
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1375 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1376 assert(token.type == T.Static);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1377
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1378 nT(); // Skip static keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1379 nT(); // Skip assert keyword.
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1380
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1381 Expression condition, message;
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1382
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1383 require(T.LParen);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1384
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1385 condition = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1386
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1387 if (token.type == T.Comma)
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1388 {
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1389 nT();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1390 message = parseAssignExpression();
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1391 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1392
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1393 require(T.RParen);
128
e02b87281b4e - Static asserts have to end with a semicolon.
aziz
parents: 127
diff changeset
1394 require(T.Semicolon);
127
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1395
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1396 return new StaticAssertDeclaration(condition, message);
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1397 }
cb9a97ebb570 - Added method parseStaticAssertDeclaration and added class StaticAssertDeclaration.
aziz
parents: 126
diff changeset
1398
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1399 Declaration parseTemplateDeclaration()
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1400 {
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1401 assert(token.type == T.Template);
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1402 nT(); // Skip template keyword.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1403 auto templateName = requireIdentifier(MSG.ExpectedTemplateName);
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1404 auto templateParams = parseTemplateParameterList();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1405 auto decls = parseDeclarationDefinitionsBody();
140
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1406 return new TemplateDeclaration(templateName, templateParams, decls);
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1407 }
64d7186b087c - Implemented parseTemplateParameters().
aziz
parents: 139
diff changeset
1408
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1409 Declaration parseNewDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1410 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1411 assert(token.type == T.New);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1412 nT(); // Skip new keyword.
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1413 auto parameters = parseParameterList();
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1414 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1415 return new NewDeclaration(parameters, funcBody);
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1416 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1417
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1418 Declaration parseDeleteDeclaration()
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1419 {
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1420 assert(token.type == T.Delete);
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1421 nT(); // Skip delete keyword.
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
1422 auto parameters = parseParameterList();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1423 // TODO: only one parameter of type void* allowed. Check in parsing or semantic phase?
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
1424 auto funcBody = parseFunctionBody();
197
ff32eb87300e - Using parseFunctionBody() for Constructor-,Destructor-,StaticConstructor-,StaticDestructor-,Invariant-,Unittest-,New- and DeleteDeclaration.
aziz
parents: 196
diff changeset
1425 return new DeleteDeclaration(parameters, funcBody);
141
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1426 }
7ab33ee1a641 - Implemented parseNew- and DeleteDeclaration().
aziz
parents: 140
diff changeset
1427
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1428 Type parseTypeofType()
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1429 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1430 assert(token.type == T.Typeof);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1431 Type type;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1432 requireNext(T.LParen);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1433 switch (token.type)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1434 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1435 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1436 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1437 case T.Return:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1438 nT();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1439 type = new TypeofType();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1440 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1441 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1442 default:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1443 type = new TypeofType(parseExpression());
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1444 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1445 require(T.RParen);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1446 return type;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1447 }
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1448
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1449 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1450 DotListExpression:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1451 . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1452 DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1453 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1454 Typeof . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1455 DotListItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1456 DotListItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1457 DotListItem . DotListItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1458 DotListItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1459 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1460 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1461 NewExpression
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1462 TemplateInstance:
233
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
1463 Identifier !( TemplateArguments )
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1464 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1465 DotListExpression parseDotListExpression()
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1466 {
233
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
1467 assert(token.type == T.Identifier || token.type == T.Dot || token.type == T.Typeof);
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1468 auto begin = token;
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1469 Expression[] identList;
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1470 if (token.type == T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1471 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1472 nT();
488
cfb3805768b6 Added DotExpression and DotType.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 486
diff changeset
1473 identList ~= set(new DotExpression(), begin);
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1474 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1475 else if (token.type == T.Typeof)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1476 {
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1477 auto type = parseTypeofType();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1478 set(type, begin);
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1479 identList ~= set(new TypeofExpression(type), begin);
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1480 if (token.type != T.Dot)
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1481 goto Lreturn;
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1482 nT();
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1483 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1484
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1485 while (1)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1486 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1487 begin = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1488 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
252
788398655d24 - Changed some string types to Token*. Adapted parser accordingly.
aziz
parents: 251
diff changeset
1489 Expression e;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1490 if (token.type == T.Not && peekNext() == T.LParen) // Identifier !( TemplateArguments )
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1491 {
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1492 nT(); // Skip !.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1493 auto tparams = parseTemplateArguments();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1494 e = new TemplateInstanceExpression(ident, tparams);
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1495 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1496 else // Identifier
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1497 e = new IdentifierExpression(ident);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1498
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1499 identList ~= set(e, begin);
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1500
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1501 LnewExpressionLoop:
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1502 if (token.type != T.Dot)
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1503 break;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1504 nT(); // Skip dot.
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1505
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1506 if (token.type == T.New)
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1507 {
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1508 identList ~= parseNewExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1509 goto LnewExpressionLoop;
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1510 }
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1511 }
233
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
1512
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1513 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1514 return new DotListExpression(identList);
152
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1515 }
fe2e36eb4b45 - Added method parseIdentifierListExpression() and class IdentifierListExpression.
aziz
parents: 151
diff changeset
1516
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1517 /+
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1518 DotListType:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1519 . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1520 TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1521 Typeof
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1522 Typeof . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1523 TypeItems:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1524 TypeItem
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1525 TypeItem . TypeItems
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1526 TypeItem:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1527 Identifier
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1528 TemplateInstance
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1529 TemplateInstance:
233
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
1530 Identifier !( TemplateArguments )
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1531 +/
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1532 DotListType parseDotListType()
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1533 {
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
1534 auto begin = token;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1535 Type[] identList;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1536 if (token.type == T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1537 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1538 nT();
488
cfb3805768b6 Added DotExpression and DotType.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 486
diff changeset
1539 identList ~= set(new DotType(), begin);
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1540 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1541 else if (token.type == T.Typeof)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1542 {
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
1543 identList ~= set(parseTypeofType(), begin);
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1544 if (token.type != T.Dot)
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1545 goto Lreturn;
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1546 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1547 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1548
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1549 while (1)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1550 {
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
1551 begin = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1552 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1553 Type t;
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1554 // NB.: Currently Types can't be followed by "!=" so we don't need to peek for "(" when parsing TemplateInstances.
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1555 if (token.type == T.Not/+ && peekNext() == T.LParen+/) // Identifier !( TemplateArguments )
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1556 {
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1557 nT(); // Skip !.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1558 t = new TemplateInstanceType(ident, parseTemplateArguments());
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1559 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1560 else // Identifier
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1561 t = new IdentifierType(ident);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1562
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1563 identList ~= set(t, begin);
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1564
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1565 if (token.type != T.Dot)
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1566 break;
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1567 nT();
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1568 }
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1569 Lreturn:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
1570 return new DotListType(identList);
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1571 }
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
1572
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1573 /*
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1574 TemplateMixin:
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1575 mixin ( AssignExpression ) ;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1576 mixin TemplateIdentifier ;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1577 mixin TemplateIdentifier MixinIdentifier ;
233
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
1578 mixin TemplateIdentifier !( TemplateArguments ) ;
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
1579 mixin TemplateIdentifier !( TemplateArguments ) MixinIdentifier ;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1580 */
256
8f27920ae17a - Made parseMixinDeclaration() a template.
aziz
parents: 255
diff changeset
1581 Class parseMixin(Class)()
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1582 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1583 assert(token.type == T.Mixin);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1584 nT(); // Skip mixin keyword.
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1585
256
8f27920ae17a - Made parseMixinDeclaration() a template.
aziz
parents: 255
diff changeset
1586 static if (is(Class == MixinDeclaration))
301
caef255a2801 - Fix in some ctors: adding only non-null members to this.children.
aziz
parents: 299
diff changeset
1587 {
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1588 if (token.type == T.LParen)
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1589 {
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1590 // TODO: What about mixin(...).ident;?
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1591 nT();
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1592 auto e = parseAssignExpression();
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1593 require(T.RParen);
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1594 require(T.Semicolon);
262
0f22269e76ff - Changed some string types to Token*.
aziz
parents: 261
diff changeset
1595 return new MixinDeclaration(e);
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1596 }
301
caef255a2801 - Fix in some ctors: adding only non-null members to this.children.
aziz
parents: 299
diff changeset
1597 }
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1598
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1599 auto begin = token;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1600 Expression[] templateIdent;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1601 Identifier* mixinIdent;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1602
159
5aa877506db0 - Added enum Linkage.
aziz
parents: 158
diff changeset
1603 // This code is similar to parseDotListType().
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1604 if (token.type == T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1605 {
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1606 nT();
488
cfb3805768b6 Added DotExpression and DotType.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 486
diff changeset
1607 templateIdent ~= set(new DotExpression(), begin);
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1608 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1609
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1610 while (1)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1611 {
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
1612 begin = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1613 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
252
788398655d24 - Changed some string types to Token*. Adapted parser accordingly.
aziz
parents: 251
diff changeset
1614 Expression e;
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1615 if (token.type == T.Not) // Identifier !( TemplateArguments )
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1616 {
151
2e959f67000b - Added code for parsing mixin expression declarations.
aziz
parents: 150
diff changeset
1617 // No need to peek for T.LParen. This must be a template instance.
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1618 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1619 auto tparams = parseTemplateArguments();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1620 e = new TemplateInstanceExpression(ident, tparams);
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1621 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1622 else // Identifier
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1623 e = new IdentifierExpression(ident);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1624
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1625 templateIdent ~= set(e, begin);
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1626
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1627 if (token.type != T.Dot)
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1628 break;
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1629 nT();
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1630 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1631
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1632 mixinIdent = optionalIdentifier();
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1633 require(T.Semicolon);
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1634
262
0f22269e76ff - Changed some string types to Token*.
aziz
parents: 261
diff changeset
1635 return new Class(templateIdent, mixinIdent);
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1636 }
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
1637
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
1638 /+++++++++++++++++++++++++++++
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1639 + Statement parsing methods +
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1640 +++++++++++++++++++++++++++++/
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1641
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1642 Statements parseStatements()
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1643 {
262
0f22269e76ff - Changed some string types to Token*.
aziz
parents: 261
diff changeset
1644 auto begin = token;
318
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
1645 require(T.LBrace);
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1646 auto statements = new Statements();
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1647 while (token.type != T.RBrace && token.type != T.EOF)
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1648 statements ~= parseStatement();
318
a1c9d93a66e3 - Added member prevToken to Parser.
aziz
parents: 314
diff changeset
1649 require(T.RBrace);
262
0f22269e76ff - Changed some string types to Token*.
aziz
parents: 261
diff changeset
1650 return set(statements, begin);
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1651 }
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1652
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1653 Statement parseStatement()
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1654 {
261
966756c5d5d3 - Added begin variables and calls to set().
aziz
parents: 260
diff changeset
1655 auto begin = token;
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1656 Statement s;
188
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1657 Declaration d;
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1658
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1659 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1660 {
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1661 d = parseVariableOrFunction();
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1662 goto LreturnDeclarationStatement;
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1663 }
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1664
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1665 switch (token.type)
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1666 {
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1667 case T.Align:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1668 uint size = parseAlignAttribute();
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
1669 // Restrict align attribute to structs in parsing phase.
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1670 StructDeclaration structDecl;
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
1671 if (token.type == T.Struct)
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1672 {
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1673 auto begin2 = token;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1674 structDecl = CastTo!(StructDeclaration)(parseAggregateDeclaration());
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1675 structDecl.setAlignSize(size);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1676 set(structDecl, begin2);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1677 }
260
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
1678 else
b83180748ae6 - Added method parseAlignAttribute().
aziz
parents: 259
diff changeset
1679 expected(T.Struct);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1680
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1681 d = new AlignDeclaration(size, structDecl ? cast(Declaration)structDecl : new Declarations);
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1682 goto LreturnDeclarationStatement;
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1683 /+ Not applicable for statements.
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1684 T.Private, T.Package, T.Protected, T.Public, T.Export,
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1685 T.Deprecated, T.Override, T.Abstract,+/
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1686 case T.Extern,
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1687 T.Final,
191
3ce110cefbc5 - Added code for parsing AliasDeclaration and TypedefDeclaration.
aziz
parents: 190
diff changeset
1688 T.Const,
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1689 T.Auto:
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1690 //T.Scope
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1691 //T.Static
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1692 case_parseAttribute:
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1693 s = parseAttributeStatement();
261
966756c5d5d3 - Added begin variables and calls to set().
aziz
parents: 260
diff changeset
1694 return s;
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1695 case T.Identifier:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1696 if (peekNext() == T.Colon)
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1697 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1698 auto ident = token.ident;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1699 nT(), nT(); // Skip Identifier :
234
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1700 s = new LabeledStatement(ident, parseNoScopeOrEmptyStatement());
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1701 break;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1702 }
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
1703 goto case T.Dot;
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1704 case T.Dot, T.Typeof:
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
1705 bool success;
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1706 d = try_(delegate {
501
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
1707 return parseVariableOrFunction(StorageClass.None,
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
1708 Protection.None,
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
1709 LinkageType.None, false, false);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1710 }, success
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1711 );
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
1712 if (success)
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1713 goto LreturnDeclarationStatement; // Declaration
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1714 else
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1715 goto case_parseExpressionStatement; // Expression
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1716
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1717 case T.If:
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1718 s = parseIfStatement();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1719 break;
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1720 case T.While:
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1721 s = parseWhileStatement();
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1722 break;
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1723 case T.Do:
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1724 s = parseDoWhileStatement();
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
1725 break;
216
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
1726 case T.For:
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
1727 s = parseForStatement();
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
1728 break;
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1729 case T.Foreach, T.Foreach_reverse:
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1730 s = parseForeachStatement();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
1731 break;
170
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
1732 case T.Switch:
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
1733 s = parseSwitchStatement();
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
1734 break;
171
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
1735 case T.Case:
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
1736 s = parseCaseStatement();
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
1737 break;
172
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
1738 case T.Default:
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
1739 s = parseDefaultStatement();
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
1740 break;
173
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
1741 case T.Continue:
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
1742 s = parseContinueStatement();
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
1743 break;
174
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
1744 case T.Break:
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
1745 s = parseBreakStatement();
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
1746 break;
175
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
1747 case T.Return:
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
1748 s = parseReturnStatement();
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
1749 break;
176
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
1750 case T.Goto:
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
1751 s = parseGotoStatement();
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
1752 break;
177
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
1753 case T.With:
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
1754 s = parseWithStatement();
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
1755 break;
178
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
1756 case T.Synchronized:
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
1757 s = parseSynchronizedStatement();
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
1758 break;
179
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
1759 case T.Try:
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
1760 s = parseTryStatement();
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
1761 break;
180
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
1762 case T.Throw:
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
1763 s = parseThrowStatement();
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
1764 break;
181
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
1765 case T.Scope:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1766 if (peekNext() != T.LParen)
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1767 goto case_parseAttribute;
181
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
1768 s = parseScopeGuardStatement();
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
1769 break;
182
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
1770 case T.Volatile:
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
1771 s = parseVolatileStatement();
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
1772 break;
183
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
1773 case T.Asm:
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
1774 s = parseAsmStatement();
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
1775 break;
184
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
1776 case T.Pragma:
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
1777 s = parsePragmaStatement();
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
1778 break;
185
35c93b776be0 - Added code for parsing MixinStatements.
aziz
parents: 184
diff changeset
1779 case T.Mixin:
246
52f4aa097865 - Fix: parse mixin as expression instead of statement when next token is T.LParen.
aziz
parents: 245
diff changeset
1780 if (peekNext() == T.LParen)
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1781 goto case_parseExpressionStatement; // Parse as expression.
256
8f27920ae17a - Made parseMixinDeclaration() a template.
aziz
parents: 255
diff changeset
1782 s = parseMixin!(MixinStatement)();
185
35c93b776be0 - Added code for parsing MixinStatements.
aziz
parents: 184
diff changeset
1783 break;
186
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1784 case T.Static:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1785 switch (peekNext())
186
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1786 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1787 case T.If:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1788 s = parseStaticIfStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1789 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1790 case T.Assert:
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1791 s = parseStaticAssertStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1792 break;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1793 default:
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1794 goto case_parseAttribute;
186
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
1795 }
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1796 break;
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
1797 case T.Debug:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
1798 s = parseDebugStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
1799 break;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
1800 case T.Version:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
1801 s = parseVersionStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
1802 break;
226
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called.
aziz
parents: 225
diff changeset
1803 // DeclDef
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called.
aziz
parents: 225
diff changeset
1804 case T.Alias, T.Typedef:
aa38e1401217 - Fixed cases T.Alias and T.Typedef. Wrong function called.
aziz
parents: 225
diff changeset
1805 d = parseDeclarationDefinition();
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1806 goto LreturnDeclarationStatement;
188
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1807 case T.Enum:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1808 d = parseEnumDeclaration();
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1809 goto LreturnDeclarationStatement;
188
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1810 case T.Class:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1811 d = parseClassDeclaration();
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1812 goto LreturnDeclarationStatement;
188
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1813 case T.Interface:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1814 d = parseInterfaceDeclaration();
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1815 goto LreturnDeclarationStatement;
188
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1816 case T.Struct, T.Union:
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1817 d = parseAggregateDeclaration();
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1818 // goto LreturnDeclarationStatement;
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1819 LreturnDeclarationStatement:
261
966756c5d5d3 - Added begin variables and calls to set().
aziz
parents: 260
diff changeset
1820 set(d, begin);
188
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1821 s = new DeclarationStatement(d);
5c6ebf9f60a9 - Added code for parsing DeclarationStatement.
aziz
parents: 187
diff changeset
1822 break;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
1823 case T.LBrace:
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
1824 s = parseScopeStatement();
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
1825 break;
216
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
1826 case T.Semicolon:
231
6846138a0e24 - Fixed parseEnumDeclaration().
aziz
parents: 230
diff changeset
1827 nT();
216
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
1828 s = new EmptyStatement();
984d48932bce - Added class EmptyStatement.
aziz
parents: 214
diff changeset
1829 break;
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1830 /+
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1831 Parse ExpressionStatement:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1832 +/
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1833 // Tokens that start a PrimaryExpression.
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1834 // case T.Identifier, T.Dot, T.Typeof:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1835 case T.This:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1836 case T.Super:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1837 case T.Null:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1838 case T.True, T.False:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1839 // case T.Dollar:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1840 case T.Int32, T.Int64, T.Uint32, T.Uint64:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1841 case T.Float32, T.Float64, T.Float80,
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1842 T.Imaginary32, T.Imaginary64, T.Imaginary80:
507
996041463028 Removed TOK.WCharLiteral and TOK.DCharLiteral.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 505
diff changeset
1843 case T.CharLiteral:
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1844 case T.String:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1845 case T.LBracket:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1846 // case T.LBrace:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1847 case T.Function, T.Delegate:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1848 case T.Assert:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1849 // case T.Mixin:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1850 case T.Import:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1851 case T.Typeid:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1852 case T.Is:
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1853 case T.LParen:
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1854 case T.Traits: // D2.0
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1855 // Tokens that can start a UnaryExpression:
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1856 case T.AndBinary, T.PlusPlus, T.MinusMinus, T.Mul, T.Minus,
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
1857 T.Plus, T.Not, T.Tilde, T.New, T.Delete, T.Cast:
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1858 case_parseExpressionStatement:
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1859 s = new ExpressionStatement(parseExpression());
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1860 require(T.Semicolon);
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1861 break;
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1862 default:
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1863 if (token.isSpecialToken)
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
1864 goto case_parseExpressionStatement;
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1865
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1866 if (token.type != T.Dollar)
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1867 // Assert that this isn't a valid expression.
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1868 assert(delegate bool(){
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1869 bool success;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1870 auto expression = try_(&parseExpression, success);
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1871 return success;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1872 }() == false, "Didn't expect valid expression."
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1873 );
400
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1874
a0fa0dcfa50a Added case statements to switch in Parser.parseStatement().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 399
diff changeset
1875 // Report error: it's an illegal statement.
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1876 s = new IllegalStatement();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1877 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1878 do
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1879 nT();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1880 while (!token.isStatementStart &&
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1881 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1882 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1883 auto text = Token.textSpan(begin, this.prevToken);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1884 error(begin, MSG.IllegalStatement ~ text);
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1885 }
205
e5a4f88982d1 - Added assert at the end of parseStatement().
aziz
parents: 204
diff changeset
1886 assert(s !is null);
261
966756c5d5d3 - Added begin variables and calls to set().
aziz
parents: 260
diff changeset
1887 set(s, begin);
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1888 return s;
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1889 }
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
1890
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1891 /++
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1892 ScopeStatement:
219
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
1893 NoScopeStatement
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1894 +/
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
1895 Statement parseScopeStatement()
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1896 {
219
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
1897 return new ScopeStatement(parseNoScopeStatement());
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1898 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
1899
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1900 /++
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1901 NoScopeStatement:
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1902 NonEmptyStatement
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1903 BlockStatement
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1904 BlockStatement:
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1905 { }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1906 { StatementList }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1907 +/
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1908 Statement parseNoScopeStatement()
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1909 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1910 auto begin = token;
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1911 Statement s;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1912 if (token.type == T.LBrace)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1913 {
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1914 nT();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1915 auto ss = new Statements();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1916 while (token.type != T.RBrace && token.type != T.EOF)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1917 ss ~= parseStatement();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1918 require(T.RBrace);
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1919 s = set(ss, begin);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1920 }
219
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
1921 else if (token.type == T.Semicolon)
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
1922 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
1923 error(token, MSG.ExpectedNonEmptyStatement);
219
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
1924 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1925 s = set(new EmptyStatement(), begin);
219
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
1926 }
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1927 else
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1928 s = parseStatement();
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1929 return s;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1930 }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
1931
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1932 /++
234
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1933 NoScopeOrEmptyStatement:
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1934 ;
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1935 NoScopeStatement
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1936 +/
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1937 Statement parseNoScopeOrEmptyStatement()
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1938 {
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1939 if (token.type == T.Semicolon)
312
fa0b6f32c1ae - Added Special to enum TOK.
aziz
parents: 305
diff changeset
1940 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1941 auto begin = token;
234
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1942 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
1943 return set(new EmptyStatement(), begin);
312
fa0b6f32c1ae - Added Special to enum TOK.
aziz
parents: 305
diff changeset
1944 }
234
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1945 else
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1946 return parseNoScopeStatement();
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1947 }
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
1948
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1949 Statement parseAttributeStatement()
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1950 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1951 StorageClass stc, stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1952 LinkageType prev_linkageType;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1953
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1954 // Nested function.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1955 Declaration parse()
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
1956 {
261
966756c5d5d3 - Added begin variables and calls to set().
aziz
parents: 260
diff changeset
1957 auto begin = token;
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1958 Declaration d;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1959 switch (token.type)
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1960 {
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1961 case T.Extern:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1962 if (peekNext() != T.LParen)
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1963 {
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1964 stc_tmp = StorageClass.Extern;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1965 goto Lcommon;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1966 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1967
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1968 nT();
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1969 auto linkageType = parseLinkageType();
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
1970 checkLinkageType(prev_linkageType, linkageType, begin);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1971
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1972 d = new LinkageDeclaration(linkageType, parse());
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1973 break;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1974 case T.Static:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1975 stc_tmp = StorageClass.Static;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1976 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1977 case T.Final:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1978 stc_tmp = StorageClass.Final;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1979 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1980 case T.Const:
270
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1981 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1982 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1983 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1984 goto case_Declaration;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1985 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1986 stc_tmp = StorageClass.Const;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1987 goto Lcommon;
270
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1988 version(D2)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1989 {
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1990 case T.Invariant: // D 2.0
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1991 if (peekNext() == T.LParen)
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1992 goto case_Declaration;
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1993 stc_tmp = StorageClass.Invariant;
270
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1994 goto Lcommon;
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
1995 }
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1996 case T.Auto:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
1997 stc_tmp = StorageClass.Auto;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1998 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
1999 case T.Scope:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2000 stc_tmp = StorageClass.Scope;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2001 goto Lcommon;
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2002 Lcommon:
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2003 // Issue error if redundant.
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2004 if (stc & stc_tmp)
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2005 error(MID.RedundantStorageClass, token.srcText);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2006 else
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2007 stc |= stc_tmp;
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2008
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2009 auto tok = token.type;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2010 nT();
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2011 d = new StorageClassDeclaration(stc_tmp, tok, parse());
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2012 break;
239
7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK.
aziz
parents: 238
diff changeset
2013 // TODO: allow "scope class", "abstract scope class" in function bodies?
7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK.
aziz
parents: 238
diff changeset
2014 //case T.Class:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2015 default:
270
764eccdf619d - Fix in parseAttributeStatement(): added checks for T.LParen after const/invariant.
aziz
parents: 269
diff changeset
2016 case_Declaration:
501
949a53332c66 Fixed parsing of AutoDeclarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 496
diff changeset
2017 return parseVariableOrFunction(stc, Protection.None, prev_linkageType, true);
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2018 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2019 return set(d, begin);
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
2020 }
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2021 return new DeclarationStatement(parse());
201
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
2022 }
70715b9e2109 - Implemented parseAttributeStatement().
aziz
parents: 200
diff changeset
2023
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2024 Statement parseIfStatement()
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2025 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2026 assert(token.type == T.If);
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2027 nT();
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2028
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2029 Statement variable;
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2030 Expression condition;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2031 Statement ifBody, elseBody;
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2032
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2033 require(T.LParen);
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2034
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2035 Identifier* ident;
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2036 auto begin = token; // For start of AutoDeclaration or normal Declaration.
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2037 // auto Identifier = Expression
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2038 if (token.type == T.Auto)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2039 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2040 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2041 ident = requireIdentifier(MSG.ExpectedVariableName);
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2042 require(T.Assign);
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2043 auto init = parseExpression();
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2044 auto v = new VariableDeclaration(null, [ident], [init]);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2045 set(v, begin.nextNWS);
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2046 auto d = new StorageClassDeclaration(StorageClass.Auto, T.Auto, v);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2047 set(d, begin);
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
2048 variable = new DeclarationStatement(d);
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2049 set(variable, begin);
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2050 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2051 else
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2052 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2053 // Declarator = Expression
237
805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call.
aziz
parents: 236
diff changeset
2054 Type parseDeclaratorAssign()
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2055 {
237
805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call.
aziz
parents: 236
diff changeset
2056 auto type = parseDeclarator(ident);
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2057 require(T.Assign);
237
805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call.
aziz
parents: 236
diff changeset
2058 return type;
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2059 }
237
805796880adb - Fix in parseIfStatement(): require(T.Assign) must be encompassed by a try_() call.
aziz
parents: 236
diff changeset
2060 bool success;
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
2061 auto type = try_(&parseDeclaratorAssign, success);
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2062 if (success)
163
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
2063 {
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2064 auto init = parseExpression();
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2065 auto v = new VariableDeclaration(type, [ident], [init]);
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2066 set(v, begin);
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2067 variable = new DeclarationStatement(v);
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
2068 set(variable, begin);
163
f27a98bb17c7 - Fix: when parsing Declarator fails, type and ident is set to null.
aziz
parents: 162
diff changeset
2069 }
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2070 else
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2071 condition = parseExpression();
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2072 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2073 require(T.RParen);
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2074 ifBody = parseScopeStatement();
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2075 if (token.type == T.Else)
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2076 {
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2077 nT();
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2078 elseBody = parseScopeStatement();
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2079 }
283
df657dd98ffa - Fix: added member type to VariableDeclaration.
aziz
parents: 282
diff changeset
2080 return new IfStatement(variable, condition, ifBody, elseBody);
162
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2081 }
c7b250662c74 - Added class ScopeStatement.
aziz
parents: 161
diff changeset
2082
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2083 Statement parseWhileStatement()
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2084 {
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2085 assert(token.type == T.While);
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2086 nT();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2087 require(T.LParen);
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2088 auto condition = parseExpression();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2089 require(T.RParen);
164
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2090 return new WhileStatement(condition, parseScopeStatement());
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2091 }
8ec99326752b - Implemented parseWhileStatement().
aziz
parents: 163
diff changeset
2092
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2093 Statement parseDoWhileStatement()
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2094 {
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2095 assert(token.type == T.Do);
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2096 nT();
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2097 auto doBody = parseScopeStatement();
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2098 require(T.While);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2099 require(T.LParen);
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2100 auto condition = parseExpression();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2101 require(T.RParen);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2102 return new DoWhileStatement(condition, doBody);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2103 }
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2104
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2105 Statement parseForStatement()
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2106 {
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2107 assert(token.type == T.For);
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2108 nT();
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2109 require(T.LParen);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2110
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2111 Statement init, forBody;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2112 Expression condition, increment;
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2113
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2114 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2115 init = parseNoScopeStatement();
230
8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration.
aziz
parents: 229
diff changeset
2116 else
8f1790d16753 - Fix: added missing call to parseDeclaratorSuffx() in parseDeclaration.
aziz
parents: 229
diff changeset
2117 nT(); // Skip ;
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2118 if (token.type != T.Semicolon)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2119 condition = parseExpression();
168
fbbb2434bf6b - Simplified parseForStatement().
aziz
parents: 167
diff changeset
2120 require(T.Semicolon);
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2121 if (token.type != T.RParen)
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2122 increment = parseExpression();
168
fbbb2434bf6b - Simplified parseForStatement().
aziz
parents: 167
diff changeset
2123 require(T.RParen);
167
141b908e32b6 - Fix: forgot parsing forBody.
aziz
parents: 166
diff changeset
2124 forBody = parseScopeStatement();
166
56334292a29e - Implemented parseForStatement().
aziz
parents: 165
diff changeset
2125 return new ForStatement(init, condition, increment, forBody);
165
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2126 }
797074d143d7 - Implemented parseDoWhileStatement().
aziz
parents: 164
diff changeset
2127
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2128 Statement parseForeachStatement()
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2129 {
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2130 assert(token.type == T.Foreach || token.type == T.Foreach_reverse);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2131 TOK tok = token.type;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2132 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2133
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
2134 auto params = new Parameters;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2135 Expression e; // Aggregate or LwrExpression
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2136
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2137 require(T.LParen);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2138 while (1)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2139 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
2140 auto paramBegin = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2141 StorageClass stc;
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2142 Type type;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2143 Identifier* ident;
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2144
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2145 switch (token.type)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2146 {
236
e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement.
aziz
parents: 235
diff changeset
2147 case T.Ref, T.Inout:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2148 stc = StorageClass.Ref;
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2149 nT();
236
e961d1b957c3 - Fix in parseForeachStatement(): added T.Inout to case T.Ref; removed break statement.
aziz
parents: 235
diff changeset
2150 // fall through
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2151 case T.Identifier:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2152 auto next = peekNext();
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
2153 if (next == T.Comma || next == T.Semicolon || next == T.RParen)
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2154 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2155 ident = requireIdentifier(MSG.ExpectedVariableName);
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2156 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2157 break;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2158 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2159 // fall through
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2160 default:
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2161 type = parseDeclarator(ident);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2162 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2163
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2164 params ~= set(new Parameter(stc, type, ident, null), paramBegin);
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2165
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2166 if (token.type != T.Comma)
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2167 break;
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2168 nT();
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2169 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2170 require(T.Semicolon);
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2171 e = parseExpression();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2172 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2173 { //Foreach (ForeachType; LwrExpression .. UprExpression ) ScopeStatement
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2174 if (token.type == T.Slice)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2175 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2176 // if (params.length != 1)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2177 // error(MID.XYZ); // TODO: issue error msg
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2178 nT();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2179 auto upper = parseExpression();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2180 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2181 auto forBody = parseScopeStatement();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2182 return new ForeachRangeStatement(tok, params, e, upper, forBody);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2183 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2184 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2185 // Foreach (ForeachTypeList; Aggregate) ScopeStatement
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2186 require(T.RParen);
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2187 auto forBody = parseScopeStatement();
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
2188 return new ForeachStatement(tok, params, e, forBody);
169
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2189 }
4666a05dfacf - Implemented parseForeachStatement().
aziz
parents: 168
diff changeset
2190
170
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2191 Statement parseSwitchStatement()
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2192 {
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2193 assert(token.type == T.Switch);
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2194 nT();
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2195
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2196 require(T.LParen);
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2197 auto condition = parseExpression();
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2198 require(T.RParen);
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2199 auto switchBody = parseScopeStatement();
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2200 return new SwitchStatement(condition, switchBody);
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2201 }
a63696d1c474 - Implemented parseSwitchStatement().
aziz
parents: 169
diff changeset
2202
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2203 /++
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2204 Helper function for parsing the body of
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2205 a default or case statement.
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2206 +/
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2207 Statement parseCaseOrDefaultBody()
220
0c647e319b8e - Removed assert from parseStatement().
aziz
parents: 219
diff changeset
2208 {
0c647e319b8e - Removed assert from parseStatement().
aziz
parents: 219
diff changeset
2209 // This function is similar to parseNoScopeStatement()
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2210 auto begin = token;
224
f838a37a25bd - Fixed parseCaseDefaultBody().
aziz
parents: 223
diff changeset
2211 auto s = new Statements();
f838a37a25bd - Fixed parseCaseDefaultBody().
aziz
parents: 223
diff changeset
2212 while (token.type != T.Case &&
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2213 token.type != T.Default &&
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2214 token.type != T.RBrace &&
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2215 token.type != T.EOF)
224
f838a37a25bd - Fixed parseCaseDefaultBody().
aziz
parents: 223
diff changeset
2216 s ~= parseStatement();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2217 return set(new ScopeStatement(s), begin);
220
0c647e319b8e - Removed assert from parseStatement().
aziz
parents: 219
diff changeset
2218 }
0c647e319b8e - Removed assert from parseStatement().
aziz
parents: 219
diff changeset
2219
171
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2220 Statement parseCaseStatement()
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2221 {
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2222 assert(token.type == T.Case);
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
2223 nT();
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
2224 auto values = parseExpressionList();
171
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2225 require(T.Colon);
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2226 auto caseBody = parseCaseOrDefaultBody();
171
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2227 return new CaseStatement(values, caseBody);
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2228 }
f1fa9bbdb4cb - Implemented parseCaseStatement().
aziz
parents: 170
diff changeset
2229
172
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2230 Statement parseDefaultStatement()
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2231 {
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2232 assert(token.type == T.Default);
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2233 nT();
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2234 require(T.Colon);
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2235 auto defaultBody = parseCaseOrDefaultBody();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2236 return new DefaultStatement(defaultBody);
172
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2237 }
89d4519bd8a1 - Implemented parseDefaultStatement().
aziz
parents: 171
diff changeset
2238
173
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2239 Statement parseContinueStatement()
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2240 {
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2241 assert(token.type == T.Continue);
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2242 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2243 auto ident = optionalIdentifier();
173
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2244 require(T.Semicolon);
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2245 return new ContinueStatement(ident);
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2246 }
c2714ba44350 - Implemented parseContinueStatement().
aziz
parents: 172
diff changeset
2247
174
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2248 Statement parseBreakStatement()
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2249 {
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2250 assert(token.type == T.Break);
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2251 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2252 auto ident = optionalIdentifier();
174
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2253 return new BreakStatement(ident);
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2254 }
e51c9ee66ea0 - Implemented parseBreakStatement().
aziz
parents: 173
diff changeset
2255
175
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2256 Statement parseReturnStatement()
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2257 {
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2258 assert(token.type == T.Return);
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2259 nT();
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
2260 Expression expr;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
2261 if (token.type != T.Semicolon)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
2262 expr = parseExpression();
175
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2263 require(T.Semicolon);
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2264 return new ReturnStatement(expr);
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2265 }
522df6f0f230 - Implemented parseReturnStatement().
aziz
parents: 174
diff changeset
2266
176
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2267 Statement parseGotoStatement()
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2268 {
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2269 assert(token.type == T.Goto);
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2270 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2271 Identifier* ident;
176
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2272 Expression caseExpr;
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2273 switch (token.type)
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2274 {
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2275 case T.Case:
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2276 nT();
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2277 if (token.type == T.Semicolon)
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2278 break;
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2279 caseExpr = parseExpression();
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2280 break;
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2281 case T.Default:
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2282 nT();
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2283 break;
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2284 default:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2285 ident = requireIdentifier(MSG.ExpectedAnIdentifier);
176
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2286 }
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2287 require(T.Semicolon);
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2288 return new GotoStatement(ident, caseExpr);
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2289 }
3071522c0cf0 - Implemented parseGotoStatement().
aziz
parents: 175
diff changeset
2290
177
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2291 Statement parseWithStatement()
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2292 {
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2293 assert(token.type == T.With);
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2294 nT();
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2295 require(T.LParen);
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2296 auto expr = parseExpression();
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2297 require(T.RParen);
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2298 return new WithStatement(expr, parseScopeStatement());
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2299 }
504b1b2f7c93 - Implemented parseWithStatement().
aziz
parents: 176
diff changeset
2300
178
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2301 Statement parseSynchronizedStatement()
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2302 {
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2303 assert(token.type == T.Synchronized);
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2304 nT();
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2305 Expression expr;
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2306
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2307 if (token.type == T.LParen)
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2308 {
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2309 nT();
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2310 expr = parseExpression();
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2311 require(T.RParen);
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2312 }
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2313 return new SynchronizedStatement(expr, parseScopeStatement());
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2314 }
62718b29679e - Implemented parseSynchronizedStatement().
aziz
parents: 177
diff changeset
2315
179
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2316 Statement parseTryStatement()
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2317 {
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2318 assert(token.type == T.Try);
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2319 nT();
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2320
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2321 auto tryBody = parseScopeStatement();
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2322 CatchBody[] catchBodies;
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2323 FinallyBody finBody;
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2324
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2325 while (token.type == T.Catch)
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2326 {
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2327 nT();
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2328 Parameter param;
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2329 if (token.type == T.LParen)
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2330 {
229
a88967db063b - Fix: skip T.LParen in parseTryStatement().
aziz
parents: 228
diff changeset
2331 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2332 auto begin = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2333 Identifier* ident;
369
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
2334 auto type = parseDeclarator(ident, true);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2335 param = new Parameter(StorageClass.None, type, ident, null);
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2336 set(param, begin);
179
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2337 require(T.RParen);
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2338 }
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2339 catchBodies ~= new CatchBody(param, parseNoScopeStatement());
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2340 if (param is null)
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2341 break; // This is a LastCatch
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2342 }
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2343
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2344 if (token.type == T.Finally)
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2345 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2346 auto begin = token;
179
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2347 nT();
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2348 finBody = new FinallyBody(parseNoScopeStatement());
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2349 set(finBody, begin);
179
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2350 }
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2351
396
0a4619735ce9 Applied fixes to Lexer, Parser and other classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 391
diff changeset
2352 if (catchBodies.length == 0 && finBody is null)
179
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2353 {
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2354 // TODO: issue error msg.
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2355 }
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2356
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2357 return new TryStatement(tryBody, catchBodies, finBody);
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2358 }
507998c5c1ce - Implemented parseTryStatement().
aziz
parents: 178
diff changeset
2359
180
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2360 Statement parseThrowStatement()
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2361 {
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2362 assert(token.type == T.Throw);
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2363 nT();
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2364 auto expr = parseExpression();
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2365 require(T.Semicolon);
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2366 return new ThrowStatement(expr);
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2367 }
d5a67aa578a8 - Implemented parseThrowStatement().
aziz
parents: 179
diff changeset
2368
181
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2369 Statement parseScopeGuardStatement()
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2370 {
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2371 assert(token.type == T.Scope);
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2372 nT();
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2373 assert(token.type == T.LParen);
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2374 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2375 auto condition = requireIdentifier(MSG.ExpectedScopeIdentifier);
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2376 if (condition)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2377 switch (condition.identID)
181
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2378 {
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2379 case ID.exit, ID.success, ID.failure:
181
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2380 break;
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2381 default:
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2382 // TODO: create MID.InvalidScopeIdentifier
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2383 error(this.prevToken, MSG.InvalidScopeIdentifier, this.prevToken.srcText);
181
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2384 }
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2385 require(T.RParen);
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2386 Statement scopeBody;
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2387 if (token.type == T.LBrace)
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2388 scopeBody = parseScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2389 else
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2390 scopeBody = parseNoScopeStatement();
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2391 return new ScopeGuardStatement(condition, scopeBody);
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2392 }
abfd51142477 - Implemented parseScopeGuardStatement().
aziz
parents: 180
diff changeset
2393
182
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2394 Statement parseVolatileStatement()
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2395 {
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2396 assert(token.type == T.Volatile);
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2397 nT();
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2398 Statement volatileBody;
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2399 if (token.type == T.Semicolon)
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2400 nT();
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2401 else if (token.type == T.LBrace)
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2402 volatileBody = parseScopeStatement();
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2403 else
219
0d14a09227a4 - Simplified parseScopeStatement().
aziz
parents: 218
diff changeset
2404 volatileBody = parseStatement();
182
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2405 return new VolatileStatement(volatileBody);
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2406 }
673b355ba0e9 - Implemented parseVolatileStatement().
aziz
parents: 181
diff changeset
2407
184
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2408 Statement parsePragmaStatement()
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2409 {
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2410 assert(token.type == T.Pragma);
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2411 nT();
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2412
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2413 Identifier* ident;
184
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2414 Expression[] args;
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2415 Statement pragmaBody;
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2416
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2417 require(T.LParen);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2418 ident = requireIdentifier(MSG.ExpectedPragmaIdentifier);
184
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2419
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2420 if (token.type == T.Comma)
244
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements.
aziz
parents: 243
diff changeset
2421 {
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements.
aziz
parents: 243
diff changeset
2422 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2423 args = parseExpressionList();
244
829fdb2e2915 - Fix: parsing at least one argument in pragma declarations/statements.
aziz
parents: 243
diff changeset
2424 }
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
2425 require(T.RParen);
184
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2426
234
5c1111dc8670 - Added method parseNoScopeOrEmptyStatement().
aziz
parents: 233
diff changeset
2427 pragmaBody = parseNoScopeOrEmptyStatement();
184
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2428
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2429 return new PragmaStatement(ident, args, pragmaBody);
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2430 }
30a4c8522b09 - Implemented parsePragmaStatement().
aziz
parents: 183
diff changeset
2431
186
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2432 Statement parseStaticIfStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2433 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2434 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2435 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2436 assert(token.type == T.If);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2437 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2438 Expression condition;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2439 Statement ifBody, elseBody;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2440
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2441 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2442 condition = parseExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2443 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2444 ifBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2445 if (token.type == T.Else)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2446 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2447 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2448 elseBody = parseNoScopeStatement();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2449 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2450 return new StaticIfStatement(condition, ifBody, elseBody);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2451 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2452
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2453 Statement parseStaticAssertStatement()
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2454 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2455 assert(token.type == T.Static);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2456 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2457 assert(token.type == T.Assert);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2458 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2459 Expression condition, message;
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2460 require(T.LParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2461 condition = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2462 if (token.type == T.Comma)
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2463 {
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2464 nT();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2465 message = parseAssignExpression();
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2466 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2467 require(T.RParen);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2468 require(T.Semicolon);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2469 return new StaticAssertStatement(condition, message);
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2470 }
d4292a5a7b8b - Implemented parseStaticIfStatement() and parseStaticAssertStatement().
aziz
parents: 185
diff changeset
2471
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2472 Statement parseDebugStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2473 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2474 assert(token.type == T.Debug);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2475 nT(); // Skip debug keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2476
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2477 Token* cond; // debug ( Integer )
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2478 // debug ( Identifier )
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2479 Statement debugBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2480
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2481 void parseIdentOrInt(ref Token* tok)
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2482 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2483 nT();
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2484 if (token.type == T.Int32 ||
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2485 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2486 {
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2487 tok = token;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2488 nT();
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2489 }
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2490 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2491 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2492 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2493
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2494 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2495 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2496 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2497 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2498 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2499 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2500 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2501 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2502 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2503 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2504
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2505 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2506 if (token.type == T.LParen)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2507 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2508 parseIdentOrInt(cond);
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2509 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2510 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2511
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2512 // debug Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2513 // debug ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2514 debugBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2515
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2516 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2517 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2518 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2519 // debug without condition and else body makes no sense
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2520 //if (levelCond == -1 && identCond.length == 0)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2521 // TODO: issue error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2522 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2523 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2524 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2525 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2526
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2527 return new DebugStatement(cond, debugBody, elseBody);
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2528 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2529
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2530 Statement parseVersionStatement()
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2531 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2532 assert(token.type == T.Version);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2533
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2534 nT(); // Skip version keyword.
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2535
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2536 Token* cond; // version ( Integer )
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2537 // version ( Identifier )
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2538 Statement versionBody, elseBody;
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2539
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2540 void parseIdentOrInt(ref Token* tok)
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2541 {
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2542 if (token.type == T.Int32 ||
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2543 token.type == T.Identifier)
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2544 {
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2545 tok = token;
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2546 nT();
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2547 }
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2548 else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2549 expected(T.Identifier); // TODO: better error msg
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2550 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2551
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2552 // if (token.type == T.Assign)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2553 // {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2554 // parseIdentOrInt(identSpec, levelSpec);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2555 // require(T.Semicolon);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2556 // }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2557 // else
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2558 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2559 // Condition:
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2560 // Integer
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2561 // Identifier
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2562
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2563 // ( Condition )
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2564 require(T.LParen);
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2565 parseIdentOrInt(cond);
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2566 require(T.RParen);
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2567
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2568 // version ( Condition ) Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2569 versionBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2570
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2571 // else Statement
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2572 if (token.type == T.Else)
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2573 {
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2574 nT();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2575 elseBody = parseNoScopeStatement();
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2576 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2577 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2578
264
50cc74026ea8 - Changed some string types to Token*.
aziz
parents: 263
diff changeset
2579 return new VersionStatement(cond, versionBody, elseBody);
190
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2580 }
d0712601fa47 - Implemented parseDebugStatement() and parseVersionStatement().
aziz
parents: 188
diff changeset
2581
161
82c5cfc7d6d3 - Started implementation of parsing statements.
aziz
parents: 160
diff changeset
2582 /+++++++++++++++++++++++++++++
183
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2583 + Assembler parsing methods +
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2584 +++++++++++++++++++++++++++++/
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2585
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2586 Statement parseAsmStatement()
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2587 {
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2588 assert(token.type == T.Asm);
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2589 nT(); // Skip asm keyword.
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2590 require(T.LBrace);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2591 auto ss = new Statements;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2592 while (token.type != T.RBrace && token.type != T.EOF)
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2593 ss ~= parseAsmInstruction();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2594 require(T.RBrace);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2595 return new AsmStatement(ss);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2596 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2597
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2598 Statement parseAsmInstruction()
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2599 {
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2600 auto begin = token;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2601 Statement s;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2602 Identifier* ident;
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2603 switch (token.type)
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2604 {
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2605 // Keywords that are valid opcodes.
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2606 case T.In, T.Int, T.Out:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2607 ident = token.ident;
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2608 nT();
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2609 goto LOpcode;
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2610 case T.Identifier:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2611 ident = token.ident;
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2612 nT(); // Skip Identifier
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2613 if (token.type == T.Colon)
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2614 {
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2615 // Identifier : AsmInstruction
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2616 nT(); // Skip :
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2617 s = new LabeledStatement(ident, parseAsmInstruction());
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2618 break;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2619 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2620
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2621 LOpcode:
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2622 // Opcode ;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2623 // Opcode Operands ;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2624 // Opcode
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2625 // Identifier
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2626 Expression[] es;
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2627 if (token.type != T.Semicolon)
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2628 {
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2629 while (1)
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2630 {
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2631 es ~= parseAsmExpression();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2632 if (token.type != T.Comma)
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2633 break;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2634 nT();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2635 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2636 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2637 require(T.Semicolon);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2638 s = new AsmInstruction(ident, es);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2639 break;
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2640 case T.Align:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2641 // align Integer;
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2642 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2643 int number = -1;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2644 if (token.type == T.Int32)
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2645 (number = token.int_), nT();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2646 else
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2647 error(token, MSG.ExpectedIntegerAfterAlign, token.srcText);
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2648 require(T.Semicolon);
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2649 s = new AsmAlignStatement(number);
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2650 break;
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2651 case T.Semicolon:
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2652 s = new EmptyStatement();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2653 nT();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2654 break;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2655 default:
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2656 s = new IllegalAsmInstruction();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2657 // Skip to next valid token.
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2658 do
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2659 nT();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2660 while (!token.isAsmInstructionStart &&
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2661 token.type != T.RBrace &&
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2662 token.type != T.EOF)
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
2663 auto text = Token.textSpan(begin, this.prevToken);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
2664 error(begin, MSG.IllegalAsmInstructino ~ text);
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2665 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2666 set(s, begin);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2667 return s;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2668 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2669
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2670 Expression parseAsmExpression()
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2671 {
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2672 auto begin = token;
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2673 auto e = parseAsmOrOrExpression();
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2674 if (token.type == T.Question)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2675 {
293
418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node.
aziz
parents: 292
diff changeset
2676 auto tok = token;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2677 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2678 auto iftrue = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2679 require(T.Colon);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2680 auto iffalse = parseAsmExpression();
293
418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node.
aziz
parents: 292
diff changeset
2681 e = new CondExpression(e, iftrue, iffalse, tok);
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2682 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2683 }
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2684 // TODO: create AsmExpression that contains e?
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2685 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2686 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2687
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2688 Expression parseAsmOrOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2689 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 374
diff changeset
2690 alias parseAsmAndAndExpression parseNext;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2691 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2692 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2693 while (token.type == T.OrLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2694 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2695 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2696 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2697 e = new OrOrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2698 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2699 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2700 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2701 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2702
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2703 Expression parseAsmAndAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2704 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 374
diff changeset
2705 alias parseAsmOrExpression parseNext;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2706 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2707 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2708 while (token.type == T.AndLogical)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2709 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2710 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2711 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2712 e = new AndAndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2713 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2714 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2715 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2716 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2717
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2718 Expression parseAsmOrExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2719 {
375
0bd21b746a04 - Added code to main() for recognizing options to the importgraph command.
aziz
parents: 374
diff changeset
2720 alias parseAsmXorExpression parseNext;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2721 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2722 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2723 while (token.type == T.OrBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2724 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2725 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2726 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2727 e = new OrExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2728 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2729 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2730 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2731 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2732
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2733 Expression parseAsmXorExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2734 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2735 alias parseAsmAndExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2736 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2737 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2738 while (token.type == T.Xor)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2739 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2740 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2741 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2742 e = new XorExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2743 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2744 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2745 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2746 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2747
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2748 Expression parseAsmAndExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2749 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2750 alias parseAsmCmpExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2751 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2752 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2753 while (token.type == T.AndBinary)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2754 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2755 auto tok = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2756 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2757 e = new AndExpression(e, parseNext(), tok);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2758 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2759 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2760 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2761 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2762
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2763 Expression parseAsmCmpExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2764 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2765 alias parseAsmShiftExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2766 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2767 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2768
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2769 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2770 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2771 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2772 case T.Equal, T.NotEqual:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2773 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2774 e = new EqualExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2775 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2776 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2777 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2778 e = new RelExpression(e, parseNext(), operator);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2779 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2780 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2781 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2782 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2783 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2784 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2785 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2786
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2787 Expression parseAsmShiftExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2788 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2789 alias parseAsmAddExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2790 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2791 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2792 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2793 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2794 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2795 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2796 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2797 case T.LShift: nT(); e = new LShiftExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2798 case T.RShift: nT(); e = new RShiftExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2799 case T.URShift: nT(); e = new URShiftExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2800 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2801 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2802 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2803 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2804 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2805 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2806 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2807
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2808 Expression parseAsmAddExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2809 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2810 alias parseAsmMulExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2811 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2812 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2813 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2814 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2815 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2816 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2817 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2818 case T.Plus: nT(); e = new PlusExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2819 case T.Minus: nT(); e = new MinusExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2820 // Not allowed in asm
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2821 //case T.Tilde: nT(); e = new CatExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2822 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2823 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2824 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2825 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2826 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2827 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2828 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2829
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2830 Expression parseAsmMulExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2831 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2832 alias parseAsmPostExpression parseNext;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2833 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2834 auto e = parseNext();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2835 while (1)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2836 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2837 auto operator = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2838 switch (operator.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2839 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2840 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2841 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2842 case T.Mod: nT(); e = new ModExpression(e, parseNext(), operator); break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2843 default:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2844 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2845 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2846 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2847 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2848 assert(0);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2849 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2850
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2851 Expression parseAsmPostExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2852 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2853 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2854 auto e = parseAsmUnaryExpression();
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2855 while (token.type == T.LBracket)
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2856 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2857 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2858 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2859 e = new AsmPostBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2860 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2861 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2862 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2863 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2864 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2865
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2866 Expression parseAsmUnaryExpression()
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2867 {
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2868 auto begin = token;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2869 Expression e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2870 switch (token.type)
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2871 {
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2872 case T.Byte, T.Short, T.Int,
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2873 T.Float, T.Double, T.Real:
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2874 goto LAsmTypePrefix;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2875 case T.Identifier:
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2876 switch (token.ident.identID)
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2877 {
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2878 case ID.near, ID.far,/* "byte", "short", "int",*/
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2879 ID.word, ID.dword, ID.qword/*, "float", "double", "real"*/:
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2880 LAsmTypePrefix:
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2881 nT();
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2882 if (token.type == T.Identifier && token.ident is Ident.ptr)
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2883 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2884 else
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2885 error(MID.ExpectedButFound, "ptr", token.srcText);
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2886 e = new AsmTypeExpression(parseAsmExpression());
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2887 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2888 case ID.offset:
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2889 nT();
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2890 e = new AsmOffsetExpression(parseAsmExpression());
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2891 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2892 case ID.seg:
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2893 nT();
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2894 e = new AsmSegExpression(parseAsmExpression());
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2895 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2896 default:
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2897 goto LparseAsmPrimaryExpression;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2898 }
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2899 break;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2900 case T.Minus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2901 case T.Plus:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2902 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2903 e = new SignExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2904 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2905 case T.Not:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2906 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2907 e = new NotExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2908 break;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2909 case T.Tilde:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2910 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2911 e = new CompExpression(parseAsmUnaryExpression());
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2912 default:
374
6d22f0b6a674 - Added class AsmAlignStatement.
aziz
parents: 369
diff changeset
2913 LparseAsmPrimaryExpression:
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2914 e = parseAsmPrimaryExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2915 return e;
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2916 }
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2917 set(e, begin);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2918 return e;
183
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2919 }
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
2920
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2921 Expression parseAsmPrimaryExpression()
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2922 {
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2923 auto begin = token;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2924 Expression e;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2925 switch (token.type)
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2926 {
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2927 case T.Int32, T.Int64, T.Uint32, T.Uint64:
399
ff1d11c27061 Renamed some Expression classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 398
diff changeset
2928 e = new IntExpression(token.type, token.ulong_);
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2929 nT();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2930 break;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2931 case T.Float32, T.Float64, T.Float80,
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2932 T.Imaginary32, T.Imaginary64, T.Imaginary80:
399
ff1d11c27061 Renamed some Expression classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 398
diff changeset
2933 e = new RealExpression(token.type, token.real_);
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2934 nT();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2935 break;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2936 case T.Dollar:
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2937 e = new DollarExpression();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2938 nT();
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
2939 break;
287
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2940 case T.LBracket:
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2941 // [ AsmExpression ]
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2942 nT();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2943 e = parseAsmExpression();
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2944 require(T.RBracket);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2945 e = new AsmBracketExpression(e);
211bdd69397d - Added classes AsmTypeExpression, AsmOffsetExpression, AsmSegExpression, AsmPostBracketExpression and AsmBracketExpression.
aziz
parents: 285
diff changeset
2946 break;
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2947 case T.Identifier:
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2948 auto register = token.ident;
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2949 switch (register.identID)
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2950 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2951 // __LOCAL_SIZE
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2952 case ID.__LOCAL_SIZE:
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2953 nT();
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2954 e = new AsmLocalSizeExpression();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2955 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2956 // Register
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2957 case ID.ST:
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2958 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2959 // (1) - (7)
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2960 int number = -1;
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2961 if (token.type == T.LParen)
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2962 {
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2963 nT();
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2964 if (token.type == T.Int32)
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2965 (number = token.int_), nT();
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2966 else
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2967 expected(T.Int32);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2968 require(T.RParen);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2969 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2970 e = new AsmRegisterExpression(register, number);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
2971 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2972 case ID.FS:
417
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2973 nT();
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2974 // TODO: is the colon-number part optional?
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2975 int number = -1;
417
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2976 if (token.type == T.Colon)
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2977 {
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2978 // :0, :4, :8
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2979 nT();
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2980 if (token.type == T.Int32)
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2981 (number = token.int_), nT();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2982 if (number != 0 && number != 4 && number != 8)
417
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2983 error(MID.ExpectedButFound, "0, 4 or 8", token.srcText);
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2984 }
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2985 e = new AsmRegisterExpression(register, number);
8af5c7e2f722 Fixed parsing asm FS register.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 415
diff changeset
2986 break;
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2987 case ID.AL, ID.AH, ID.AX, ID.EAX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2988 ID.BL, ID.BH, ID.BX, ID.EBX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2989 ID.CL, ID.CH, ID.CX, ID.ECX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2990 ID.DL, ID.DH, ID.DX, ID.EDX,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2991 ID.BP, ID.EBP, ID.SP, ID.ESP,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2992 ID.DI, ID.EDI, ID.SI, ID.ESI,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2993 ID.ES, ID.CS, ID.SS, ID.DS, ID.GS,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2994 ID.CR0, ID.CR2, ID.CR3, ID.CR4,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2995 ID.DR0, ID.DR1, ID.DR2, ID.DR3, ID.DR6, ID.DR7,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2996 ID.TR3, ID.TR4, ID.TR5, ID.TR6, ID.TR7,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2997 ID.MM0, ID.MM1, ID.MM2, ID.MM3,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2998 ID.MM4, ID.MM5, ID.MM6, ID.MM7,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
2999 ID.XMM0, ID.XMM1, ID.XMM2, ID.XMM3,
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
3000 ID.XMM4, ID.XMM5, ID.XMM6, ID.XMM7:
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
3001 nT();
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
3002 e = new AsmRegisterExpression(register);
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3003 break;
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3004 default:
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3005 // DotIdentifier
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3006 Expression[] identList;
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3007 while (1)
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3008 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3009 auto begin2 = token;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3010 auto ident = requireIdentifier(MSG.ExpectedAnIdentifier);
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3011 e = new IdentifierExpression(ident);
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3012 set(e, begin2);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3013 identList ~= e;
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3014 if (token.type != T.Dot)
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3015 break;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3016 nT(); // Skip dot.
288
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3017 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3018 e = new DotListExpression(identList);
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3019 }
833b301497f4 - Added classes AsmLocalSizeExpression and AsmRegisterExpression.
aziz
parents: 287
diff changeset
3020 break;
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3021 default:
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3022 error(MID.ExpectedButFound, "Expression", token.srcText);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3023 e = new EmptyExpression();
414
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3024 if (!trying)
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3025 {
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3026 // Insert a dummy token and don't consume current one.
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3027 begin = lx.insertEmptyTokenBefore(token);
502
4e14cd1b24da Refactored code and added modules related to tabulated Identifiers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 501
diff changeset
3028 this.prevToken = begin;
414
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3029 }
285
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3030 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3031 set(e, begin);
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3032 return e;
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3033 }
104343e0f097 - Started implementation of asm statements parser.
aziz
parents: 284
diff changeset
3034
183
c9df82f6f6be - Added parseAsmStatement() stub.
aziz
parents: 182
diff changeset
3035 /+++++++++++++++++++++++++++++
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
3036 + Expression parsing methods +
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
3037 +++++++++++++++++++++++++++++/
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
3038
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3039 Expression parseExpression()
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3040 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3041 auto begin = token;
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3042 auto e = parseAssignExpression();
122
9849a263f148 - Added method parseDeclarationsBlock().
aziz
parents: 121
diff changeset
3043 while (token.type == T.Comma)
235
3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma.
aziz
parents: 234
diff changeset
3044 {
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3045 auto comma = token;
235
3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma.
aziz
parents: 234
diff changeset
3046 nT();
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3047 e = new CommaExpression(e, parseAssignExpression(), comma);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3048 set(e, begin);
235
3384ac8878f7 - Fixed parseExpression(). Forgot to skip T.Comma.
aziz
parents: 234
diff changeset
3049 }
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3050 return e;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3051 }
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3052
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3053 Expression parseAssignExpression()
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3054 {
319
83f1f9a4f248 - Removed assigment to 'begin' from loop. Initializing 'begin' at decl point.
aziz
parents: 318
diff changeset
3055 auto begin = token;
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3056 auto e = parseCondExpression();
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3057 while (1)
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3058 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3059 switch (token.type)
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3060 {
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3061 case T.Assign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3062 nT(); e = new AssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3063 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3064 case T.LShiftAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3065 nT(); e = new LShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3066 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3067 case T.RShiftAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3068 nT(); e = new RShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3069 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3070 case T.URShiftAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3071 nT(); e = new URShiftAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3072 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3073 case T.OrAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3074 nT(); e = new OrAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3075 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3076 case T.AndAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3077 nT(); e = new AndAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3078 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3079 case T.PlusAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3080 nT(); e = new PlusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3081 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3082 case T.MinusAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3083 nT(); e = new MinusAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3084 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3085 case T.DivAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3086 nT(); e = new DivAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3087 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3088 case T.MulAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3089 nT(); e = new MulAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3090 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3091 case T.ModAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3092 nT(); e = new ModAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3093 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3094 case T.XorAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3095 nT(); e = new XorAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3096 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3097 case T.CatAssign:
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3098 nT(); e = new CatAssignExpression(e, parseAssignExpression());
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3099 break;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3100 default:
218
6c0d274e0f3f - Removed goto from parseAssignExpression().
aziz
parents: 217
diff changeset
3101 return e;
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3102 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3103 set(e, begin);
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3104 }
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3105 return e;
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3106 }
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3107
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3108 Expression parseCondExpression()
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3109 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3110 auto begin = token;
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3111 auto e = parseOrOrExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3112 if (token.type == T.Question)
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3113 {
293
418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node.
aziz
parents: 292
diff changeset
3114 auto tok = token;
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3115 nT();
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3116 auto iftrue = parseExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3117 require(T.Colon);
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3118 auto iffalse = parseCondExpression();
293
418c6548ce17 - Assigning to Node.children in several constructors that inherit from Node.
aziz
parents: 292
diff changeset
3119 e = new CondExpression(e, iftrue, iffalse, tok);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3120 set(e, begin);
72
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3121 }
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3122 return e;
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3123 }
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3124
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3125 Expression parseOrOrExpression()
f75e359f939f - Added parseExpression() method.
aziz
parents: 71
diff changeset
3126 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3127 alias parseAndAndExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3128 auto begin = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3129 auto e = parseNext();
223
043722eed46e - Fix: if-statements should be while-statements.
aziz
parents: 222
diff changeset
3130 while (token.type == T.OrLogical)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3131 {
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3132 auto tok = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3133 nT();
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3134 e = new OrOrExpression(e, parseNext(), tok);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3135 set(e, begin);
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3136 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3137 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3138 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3139
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3140 Expression parseAndAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3141 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3142 alias parseOrExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3143 auto begin = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3144 auto e = parseNext();
223
043722eed46e - Fix: if-statements should be while-statements.
aziz
parents: 222
diff changeset
3145 while (token.type == T.AndLogical)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3146 {
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3147 auto tok = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3148 nT();
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3149 e = new AndAndExpression(e, parseNext(), tok);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3150 set(e, begin);
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3151 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3152 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3153 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3154
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3155 Expression parseOrExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3156 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3157 alias parseXorExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3158 auto begin = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3159 auto e = parseNext();
223
043722eed46e - Fix: if-statements should be while-statements.
aziz
parents: 222
diff changeset
3160 while (token.type == T.OrBinary)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3161 {
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3162 auto tok = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3163 nT();
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3164 e = new OrExpression(e, parseNext(), tok);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3165 set(e, begin);
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3166 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3167 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3168 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3169
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3170 Expression parseXorExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3171 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3172 alias parseAndExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3173 auto begin = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3174 auto e = parseNext();
223
043722eed46e - Fix: if-statements should be while-statements.
aziz
parents: 222
diff changeset
3175 while (token.type == T.Xor)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3176 {
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3177 auto tok = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3178 nT();
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3179 e = new XorExpression(e, parseNext(), tok);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3180 set(e, begin);
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3181 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3182 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3183 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3184
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3185 Expression parseAndExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3186 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3187 alias parseCmpExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3188 auto begin = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3189 auto e = parseNext();
223
043722eed46e - Fix: if-statements should be while-statements.
aziz
parents: 222
diff changeset
3190 while (token.type == T.AndBinary)
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3191 {
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3192 auto tok = token;
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3193 nT();
251
67a798459532 - Added parameter Token* tok to some Expression constructors. Adapted parser accordingly.
aziz
parents: 250
diff changeset
3194 e = new AndExpression(e, parseNext(), tok);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3195 set(e, begin);
73
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3196 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3197 return e;
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3198 }
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3199
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3200 Expression parseCmpExpression()
11572f4a138c - Added methods for parsing OrOrExpressions, AndAndExpressions, OrExpressions, XorExpressions and AndExpressions.
aziz
parents: 72
diff changeset
3201 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3202 alias parseShiftExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3203 auto begin = token;
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3204 auto e = parseShiftExpression();
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3205
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3206 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3207 switch (operator.type)
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3208 {
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3209 case T.Equal, T.NotEqual:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3210 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3211 e = new EqualExpression(e, parseNext(), operator);
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3212 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3213 case T.Not:
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
3214 if (peekNext() != T.Is)
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3215 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3216 nT();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3217 // fall through
225
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3218 case T.Is:
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3219 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3220 e = new IdentityExpression(e, parseNext(), operator);
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3221 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3222 case T.LessEqual, T.Less, T.GreaterEqual, T.Greater,
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3223 T.Unordered, T.UorE, T.UorG, T.UorGorE,
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3224 T.UorL, T.UorLorE, T.LorEorG, T.LorG:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3225 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3226 e = new RelExpression(e, parseNext(), operator);
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3227 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3228 case T.In:
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3229 nT();
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3230 e = new InExpression(e, parseNext(), operator);
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3231 break;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3232 default:
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3233 return e;
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3234 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3235 set(e, begin);
74
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3236 return e;
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3237 }
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3238
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3239 Expression parseShiftExpression()
30b0fb85dda9 - Implemented parseCmpExpression().
aziz
parents: 73
diff changeset
3240 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3241 alias parseAddExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3242 auto begin = token;
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3243 auto e = parseNext();
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3244 while (1)
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3245 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3246 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3247 switch (operator.type)
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3248 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3249 case T.LShift: nT(); e = new LShiftExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3250 case T.RShift: nT(); e = new RShiftExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3251 case T.URShift: nT(); e = new URShiftExpression(e, parseNext(), operator); break;
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3252 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3253 return e;
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3254 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3255 set(e, begin);
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3256 }
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3257 assert(0);
75
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3258 }
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3259
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3260 Expression parseAddExpression()
3f976d9e0833 - Implemented parseShiftExpression().
aziz
parents: 74
diff changeset
3261 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3262 alias parseMulExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3263 auto begin = token;
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3264 auto e = parseNext();
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3265 while (1)
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3266 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3267 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3268 switch (operator.type)
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3269 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3270 case T.Plus: nT(); e = new PlusExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3271 case T.Minus: nT(); e = new MinusExpression(e, parseNext(), operator); break;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3272 case T.Tilde: nT(); e = new CatExpression(e, parseNext(), operator); break;
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3273 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3274 return e;
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3275 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3276 set(e, begin);
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3277 }
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3278 assert(0);
76
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3279 }
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3280
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3281 Expression parseMulExpression()
a85f9edf6ce7 - Implemented parseAddExpression().
aziz
parents: 75
diff changeset
3282 {
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3283 alias parsePostExpression parseNext;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3284 auto begin = token;
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3285 auto e = parseNext();
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3286 while (1)
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3287 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3288 auto operator = token;
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3289 switch (operator.type)
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3290 {
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3291 case T.Mul: nT(); e = new MulExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3292 case T.Div: nT(); e = new DivExpression(e, parseNext(), operator); break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3293 case T.Mod: nT(); e = new ModExpression(e, parseNext(), operator); break;
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3294 default:
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3295 return e;
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3296 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3297 set(e, begin);
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3298 }
228
a4c5ee9527b7 - Replaced assert(0); with break; in case T.Static. Renamed local t to next.
aziz
parents: 227
diff changeset
3299 assert(0);
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3300 }
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
3301
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3302 Expression parsePostExpression()
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3303 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3304 auto begin = token;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3305 auto e = parseUnaryExpression();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3306 while (1)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3307 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3308 switch (token.type)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3309 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3310 case T.Dot:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3311 e = new PostDotListExpression(e, parseDotListExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3312 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3313 case T.PlusPlus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3314 e = new PostIncrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3315 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3316 case T.MinusMinus:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3317 e = new PostDecrExpression(e);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3318 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3319 case T.LParen:
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3320 e = new CallExpression(e, parseArguments());
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3321 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3322 case T.LBracket:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3323 // parse Slice- and IndexExpression
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3324 nT();
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
3325 // [] is a SliceExpression
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3326 if (token.type == T.RBracket)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3327 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3328 e = new SliceExpression(e, null, null);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3329 break;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3330 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3331
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3332 Expression[] es = [parseAssignExpression()];
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3333
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
3334 // [ AssignExpression .. AssignExpression ]
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3335 if (token.type == T.Slice)
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3336 {
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3337 nT();
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3338 e = new SliceExpression(e, es[0], parseAssignExpression());
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3339 require(T.RBracket);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3340 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3341 }
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3342
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
3343 // [ ExpressionList ]
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3344 if (token.type == T.Comma)
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3345 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3346 nT();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3347 es ~= parseExpressionList();
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3348 }
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3349 require(T.RBracket);
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3350
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3351 e = new IndexExpression(e, es);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3352 goto Lset;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3353 default:
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3354 return e;
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3355 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3356 nT();
489
a7291d3ee9d7 Refactored classes that inherit from Node.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 488
diff changeset
3357 Lset: // Jumped here to skip nT().
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3358 set(e, begin);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3359 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3360 assert(0);
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3361 }
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3362
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3363 Expression parseUnaryExpression()
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3364 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3365 auto begin = token;
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3366 Expression e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3367 switch (token.type)
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3368 {
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3369 case T.AndBinary:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3370 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3371 e = new AddressExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3372 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3373 case T.PlusPlus:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3374 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3375 e = new PreIncrExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3376 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3377 case T.MinusMinus:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3378 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3379 e = new PreDecrExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3380 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3381 case T.Mul:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3382 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3383 e = new DerefExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3384 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3385 case T.Minus:
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3386 case T.Plus:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3387 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3388 e = new SignExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3389 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3390 case T.Not:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3391 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3392 e = new NotExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3393 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3394 case T.Tilde:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3395 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3396 e = new CompExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3397 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3398 case T.New:
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
3399 e = parseNewExpression();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3400 return e;
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3401 case T.Delete:
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3402 nT();
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
3403 e = new DeleteExpression(parseUnaryExpression());
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3404 break;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3405 case T.Cast:
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
3406 requireNext(T.LParen);
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3407 Type type;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3408 switch (token.type)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3409 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3410 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3411 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3412 auto begin2 = token;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3413 case T.Const:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3414 type = new ConstType(null);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3415 goto case_break;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3416 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3417 type = new InvariantType(null);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3418 case_break:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3419 nT();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3420 set(type, begin2);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3421 break;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3422 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3423 default:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3424 type = parseType();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3425 }
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
3426 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
3427 e = new CastExpression(parseUnaryExpression(), type);
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3428 break;
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3429 case T.LParen:
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
3430 // ( Type ) . Identifier
225
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3431 Type parseType_()
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3432 {
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3433 nT();
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3434 auto type = parseType();
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3435 require(T.RParen);
233
c2b601dcd57d - Added assert to parseDotListExpression().
aziz
parents: 232
diff changeset
3436 require(T.Dot);
225
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3437 return type;
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3438 }
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3439 bool success;
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
3440 auto type = try_(&parseType_, success);
225
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3441 if (success)
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3442 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3443 auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
225
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3444 e = new TypeDotIdExpression(type, ident);
257
6c58366ba1eb - Fix: need to allocate Parameters.
aziz
parents: 256
diff changeset
3445 break;
225
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3446 }
8883c113c2f1 - Fix: case T.Identity should be T.Is.
aziz
parents: 224
diff changeset
3447 goto default;
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3448 default:
335
b245b234fdd9 - Moved parsePostExpression() above parseUnaryExpression().
aziz
parents: 327
diff changeset
3449 e = parsePrimaryExpression();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3450 return e;
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3451 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3452 assert(e !is null);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3453 set(e, begin);
91
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3454 return e;
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3455 }
ac8610aaf622 - Moved parseUnaryExpression() one place up in the method list.
aziz
parents: 90
diff changeset
3456
79
df4e5c7ad58a - Implemented most of parsePostExpression() and parsePreExpression().
aziz
parents: 78
diff changeset
3457 Expression parsePrimaryExpression()
78
f043759fb59a - Added code to parseUnaryExpression(); not fully implemented.
aziz
parents: 77
diff changeset
3458 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3459 auto begin = token;
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
3460 Expression e;
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3461 switch (token.type)
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
3462 {
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
3463 case T.Identifier, T.Dot, T.Typeof:
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
3464 e = parseDotListExpression();
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
3465 break;
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3466 case T.This:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3467 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3468 e = new ThisExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3469 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3470 case T.Super:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3471 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3472 e = new SuperExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3473 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3474 case T.Null:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3475 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3476 e = new NullExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3477 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3478 case T.True, T.False:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3479 nT();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3480 e = new BoolExpression();
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3481 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3482 case T.Dollar:
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3483 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3484 e = new DollarExpression();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3485 break;
97
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
3486 case T.Int32, T.Int64, T.Uint32, T.Uint64:
399
ff1d11c27061 Renamed some Expression classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 398
diff changeset
3487 e = new IntExpression(token.type, token.ulong_);
97
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
3488 nT();
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
3489 break;
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
3490 case T.Float32, T.Float64, T.Float80,
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
3491 T.Imaginary32, T.Imaginary64, T.Imaginary80:
399
ff1d11c27061 Renamed some Expression classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 398
diff changeset
3492 e = new RealExpression(token.type, token.real_);
97
1a83e5070a84 - Added code for parsing IntNumber- and RealNumberExpressions.
aziz
parents: 96
diff changeset
3493 nT();
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3494 break;
507
996041463028 Removed TOK.WCharLiteral and TOK.DCharLiteral.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 505
diff changeset
3495 case T.CharLiteral:
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3496 e = new CharExpression(token);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3497 nT();
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3498 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3499 case T.String:
157
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
3500 Token*[] stringLiterals;
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
3501 do
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3502 {
157
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
3503 stringLiterals ~= token;
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3504 nT();
157
fdbd47d72614 - Renamed class StringLiteralExpression to StringLiteralsExpression.
aziz
parents: 156
diff changeset
3505 } while (token.type == T.String)
399
ff1d11c27061 Renamed some Expression classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 398
diff changeset
3506 e = new StringExpression(stringLiterals);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3507 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3508 case T.LBracket:
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3509 Expression[] values;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3510
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3511 nT();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3512 if (token.type != T.RBracket)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3513 {
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3514 e = parseAssignExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3515 if (token.type == T.Colon)
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3516 goto LparseAssocArray;
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3517 if (token.type == T.Comma)
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3518 {
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3519 nT();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3520 values = [e] ~ parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3521 }
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3522 require(T.RBracket);
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3523 }
271
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3524 else
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3525 nT();
85
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3526
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3527 e = new ArrayLiteralExpression(values);
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3528 break;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3529
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3530 LparseAssocArray:
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3531 Expression[] keys;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3532
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3533 keys ~= e;
d8dc3171440d - Fixed parsing CallExpression and IndexExpression.
aziz
parents: 84
diff changeset
3534 nT(); // Skip colon.
271
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3535 goto LenterLoop;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3536
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3537 while (1)
88
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression.
aziz
parents: 87
diff changeset
3538 {
271
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3539 keys ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3540 require(T.Colon);
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3541 LenterLoop:
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3542 values ~= parseAssignExpression();
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3543 if (token.type != T.Comma)
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3544 break;
68987c1c59b6 - Fixed parsing empty ArrayLiteralExpression. Needed to skip T.RBracket.
aziz
parents: 270
diff changeset
3545 nT();
88
81cb24669ed3 - Fixed parser of AssocArrayLiteralExpression.
aziz
parents: 87
diff changeset
3546 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3547 require(T.RBracket);
399
ff1d11c27061 Renamed some Expression classes.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 398
diff changeset
3548 e = new AArrayLiteralExpression(keys, values);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3549 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3550 case T.LBrace:
193
2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression.
aziz
parents: 192
diff changeset
3551 // DelegateLiteral := { Statements }
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
3552 auto funcBody = parseFunctionBody();
289
a99357783c6f - Fix: assign targs to member targs of TraitsExpression.
aziz
parents: 288
diff changeset
3553 e = new FunctionLiteralExpression(funcBody);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3554 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3555 case T.Function, T.Delegate:
193
2a2975b6d539 - Using parseFunctionBody() when parsing FunctionLiteralExpression.
aziz
parents: 192
diff changeset
3556 // FunctionLiteral := (function|delegate) Type? '(' ArgumentList ')' '{' Statements '}'
133
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3557 nT(); // Skip function|delegate token.
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3558 Type returnType;
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3559 Parameters parameters;
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3560 if (token.type != T.LBrace)
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3561 {
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3562 if (token.type != T.LParen) // Optional return type
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3563 returnType = parseType();
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
3564 parameters = parseParameterList();
133
3924b1ee1302 - Added code for parsing function and delegate literal expressions.
aziz
parents: 132
diff changeset
3565 }
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
3566 auto funcBody = parseFunctionBody();
289
a99357783c6f - Fix: assign targs to member targs of TraitsExpression.
aziz
parents: 288
diff changeset
3567 e = new FunctionLiteralExpression(returnType, parameters, funcBody);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3568 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3569 case T.Assert:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3570 Expression msg;
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3571 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3572 e = parseAssignExpression();
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
3573 if (token.type == T.Comma)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3574 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3575 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3576 msg = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3577 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3578 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3579 e = new AssertExpression(e, msg);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3580 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3581 case T.Mixin:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3582 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3583 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3584 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3585 e = new MixinExpression(e);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3586 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3587 case T.Import:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3588 requireNext(T.LParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3589 e = parseAssignExpression();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3590 require(T.RParen);
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3591 e = new ImportExpression(e);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3592 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3593 case T.Typeid:
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
3594 requireNext(T.LParen);
99
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
3595 auto type = parseType();
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
3596 require(T.RParen);
6b8c248f5911 - Added member type to classes CastExpression and TypeidExpression.
aziz
parents: 98
diff changeset
3597 e = new TypeidExpression(type);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3598 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3599 case T.Is:
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3600 requireNext(T.LParen);
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3601
248
63a15b082c0c - Removed class SpecializationType.
aziz
parents: 247
diff changeset
3602 Type type, specType;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3603 Identifier* ident; // optional Identifier
248
63a15b082c0c - Removed class SpecializationType.
aziz
parents: 247
diff changeset
3604 Token* opTok, specTok;
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3605
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3606 type = parseDeclarator(ident, true);
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3607
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3608 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3609 {
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3610 case T.Colon, T.Equal:
248
63a15b082c0c - Removed class SpecializationType.
aziz
parents: 247
diff changeset
3611 opTok = token;
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3612 nT();
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3613 switch (token.type)
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3614 {
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3615 case T.Typedef,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3616 T.Struct,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3617 T.Union,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3618 T.Class,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3619 T.Interface,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3620 T.Enum,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3621 T.Function,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3622 T.Delegate,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3623 T.Super,
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3624 T.Return:
493
d13502b6fa5f Added code to the Parser and edited main.wiki.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 492
diff changeset
3625 case_Const_Invariant:
248
63a15b082c0c - Removed class SpecializationType.
aziz
parents: 247
diff changeset
3626 specTok = token;
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
3627 nT();
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3628 break;
493
d13502b6fa5f Added code to the Parser and edited main.wiki.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 492
diff changeset
3629 case T.Const, T.Invariant:
d13502b6fa5f Added code to the Parser and edited main.wiki.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 492
diff changeset
3630 if (peekNext() != T.LParen)
d13502b6fa5f Added code to the Parser and edited main.wiki.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 492
diff changeset
3631 goto case_Const_Invariant;
d13502b6fa5f Added code to the Parser and edited main.wiki.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 492
diff changeset
3632 // Fall through. It's a type.
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3633 default:
248
63a15b082c0c - Removed class SpecializationType.
aziz
parents: 247
diff changeset
3634 specType = parseType();
100
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3635 }
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3636 default:
538e8b546669 - Added code for parsing IsExpressions.
aziz
parents: 99
diff changeset
3637 }
377
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3638
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3639 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3640 version(D2)
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3641 {
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3642 // is ( Type Identifier : TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3643 // is ( Type Identifier == TypeSpecialization , TemplateParameterList )
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3644 if (ident && specType && token.type == T.Comma)
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3645 tparams = parseTemplateParameterList2();
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3646 }
102
6e8b67ae15b7 - Added modules Declarations and Statements.
aziz
parents: 101
diff changeset
3647 require(T.RParen);
377
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
3648 e = new IsExpression(type, ident, opTok, specTok, specType, tparams);
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3649 break;
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3650 case T.LParen:
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3651 if (tokenAfterParenIs(T.LBrace))
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3652 {
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3653 auto parameters = parseParameterList();
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
3654 // ( ParameterList ) FunctionBody
267
f3dfa6208ed3 - Removed parameter func from parseFunctionBody(). Creating new FunctionBody inside the method.
aziz
parents: 266
diff changeset
3655 auto funcBody = parseFunctionBody();
289
a99357783c6f - Fix: assign targs to member targs of TraitsExpression.
aziz
parents: 288
diff changeset
3656 e = new FunctionLiteralExpression(null, parameters, funcBody);
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3657 }
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3658 else
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3659 {
131
ce636f3981cc - Removed TOK.Number.
aziz
parents: 130
diff changeset
3660 // ( Expression )
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3661 nT();
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3662 e = parseExpression();
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3663 require(T.RParen);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3664 // TODO: create ParenExpression?
130
0467f01ed524 - Fix: parameters can have optional identifier.
aziz
parents: 129
diff changeset
3665 }
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3666 break;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3667 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3668 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3669 case T.Traits:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3670 nT();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3671 require(T.LParen);
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3672 auto id = requireIdentifier(MSG.ExpectedAnIdentifier);
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3673 TemplateArguments args;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3674 if (token.type == T.Comma)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3675 args = parseTemplateArguments2();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3676 else
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3677 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3678 e = new TraitsExpression(id, args);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3679 break;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3680 }
84
ac8d961d10d1 - Added code for parsing This-,Super-,Null-,Bool-,Dollar-,CharLiteral- and StringLiteralExpression.
aziz
parents: 83
diff changeset
3681 default:
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3682 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3683 { // IntegralType . Identifier
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3684 auto type = new IntegralType(token.type);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3685 nT();
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3686 set(type, begin);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3687 require(T.Dot);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3688 auto ident = requireIdentifier(MSG.ExpectedIdAfterTypeDot);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3689 e = new TypeDotIdExpression(type, ident);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3690 }
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3691 else if (token.isSpecialToken)
343
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token.
aziz
parents: 342
diff changeset
3692 {
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token.
aziz
parents: 342
diff changeset
3693 e = new SpecialTokenExpression(token);
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token.
aziz
parents: 342
diff changeset
3694 nT();
95f1b6e43214 - Removed TOK.Special and added an own entry for each special token.
aziz
parents: 342
diff changeset
3695 }
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3696 else
414
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3697 {
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3698 error(MID.ExpectedButFound, "Expression", token.srcText);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3699 e = new EmptyExpression();
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3700 if (!trying)
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3701 {
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3702 // Insert a dummy token and don't consume current one.
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3703 begin = lx.insertEmptyTokenBefore(token);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3704 this.prevToken = begin;
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3705 }
414
9c69615a4876 Added method insertEmptyTokenBefore() to Lexer. Made some fixes, too.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 409
diff changeset
3706 }
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
3707 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3708 set(e, begin);
83
9e6d66f647c9 - Fix: IsExpression was created instead of IdentityExpression.
aziz
parents: 81
diff changeset
3709 return e;
77
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3710 }
7e21c4df1c02 - Implemented parseMulExpression().
aziz
parents: 76
diff changeset
3711
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
3712 Expression parseNewExpression(/*Expression e*/)
81
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
3713 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3714 auto begin = token;
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3715 assert(token.type == T.New);
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3716 nT(); // Skip new keyword.
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3717
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3718 Expression[] newArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3719 Expression[] ctorArguments;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3720
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3721 if (token.type == T.LParen)
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3722 newArguments = parseArguments();
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3723
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3724 // NewAnonClassExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3725 // new (ArgumentList)opt class (ArgumentList)opt SuperClassopt InterfaceClassesopt ClassBody
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3726 if (token.type == T.Class)
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3727 {
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3728 nT();
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3729 if (token.type == T.LParen)
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3730 ctorArguments = parseArguments();
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3731
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3732 BaseClass[] bases = token.type != T.LBrace ? parseBaseClasses(false) : null ;
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3733
495
b60450804b6e Attributes are evaluated during the parsing phase now.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 494
diff changeset
3734 auto decls = parseDeclarationDefinitionsBody();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3735 return set(new NewAnonClassExpression(/*e, */newArguments, bases, ctorArguments, decls), begin);
144
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3736 }
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3737
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3738 // NewExpression:
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3739 // NewArguments Type [ AssignExpression ]
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3740 // NewArguments Type ( ArgumentList )
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3741 // NewArguments Type
cfd890b250e6 - Added bool parameter to parseBaseClasses. BaseClasses in anonymous classes don't start with a colon.
aziz
parents: 143
diff changeset
3742 auto type = parseType();
302
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id.
aziz
parents: 301
diff changeset
3743
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id.
aziz
parents: 301
diff changeset
3744 if (token.type == T.LParen)
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3745 ctorArguments = parseArguments();
302
d04a79e795a2 - Fix in parseNewExpression(): removed check for type id.
aziz
parents: 301
diff changeset
3746
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3747 return set(new NewExpression(/*e, */newArguments, type, ctorArguments), begin);
81
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
3748 }
aa1ea2548dd9 - Fixed parseExpression() method.
aziz
parents: 80
diff changeset
3749
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3750 Type parseType()
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3751 {
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
3752 return parseBasicType2(parseBasicType());
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3753 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3754
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3755 Type parseBasicType()
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3756 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3757 auto begin = token;
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3758 Type t;
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3759
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3760 if (token.isIntegralType)
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3761 {
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3762 t = new IntegralType(token.type);
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3763 nT();
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3764 }
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3765 else
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3766 switch (token.type)
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3767 {
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
3768 case T.Identifier, T.Typeof, T.Dot:
154
0e7cefb15e43 - Renamed IdentifierListExpression to DotListExpression, and parseIdentifierListExpression() to parseDotListExpression().
aziz
parents: 153
diff changeset
3769 t = parseDotListType();
484
265c0b655f18 Added more calls to set().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 483
diff changeset
3770 assert(!isNodeSet(t));
153
66790fc2c0a2 - Added method parseIdentifierListType().
aziz
parents: 152
diff changeset
3771 break;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3772 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3773 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3774 case T.Const:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3775 // const ( Type )
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3776 nT();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3777 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3778 t = parseType();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3779 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3780 t = new ConstType(t);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3781 break;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3782 case T.Invariant:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3783 // invariant ( Type )
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3784 nT();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3785 require(T.LParen);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3786 t = parseType();
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3787 require(T.RParen);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3788 t = new InvariantType(t);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
3789 break;
369
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3790 } // version(D2)
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3791 default:
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
3792 error(MID.ExpectedButFound, "BasicType", token.srcText);
134
a31aa0d6dd5e - Added class UndefinedType. Returning it in parseBasicType() when no token matched the basic type list.
aziz
parents: 133
diff changeset
3793 t = new UndefinedType();
259
8118da6fee44 - Moved nT() below statement where an attribute class is constructed.
aziz
parents: 258
diff changeset
3794 nT();
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3795 }
508
943ecc9c133a Added isIntegralType() to Token and refactored code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 507
diff changeset
3796 return set(t, begin);
94
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3797 }
0fe650a7a8d1 - Renamed Type enum to InfoType in module Information.
aziz
parents: 93
diff changeset
3798
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3799 Type parseBasicType2(Type t)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3800 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3801 typeof(token) begin;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3802 while (1)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3803 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3804 begin = token;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3805 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3806 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3807 case T.Mul:
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3808 t = new PointerType(t);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3809 nT();
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3810 break;
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3811 case T.LBracket:
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3812 t = parseArrayType(t);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3813 continue;
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3814 case T.Function, T.Delegate:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3815 TOK tok = token.type;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3816 nT();
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
3817 auto parameters = parseParameterList();
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
3818 if (tok == T.Function)
291
c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters.
aziz
parents: 290
diff changeset
3819 t = new FunctionType(t, parameters);
135
145e0d68ec95 - Added enum TID to module Type.
aziz
parents: 134
diff changeset
3820 else
291
c0e857931ff6 - Changed FunctionType and DelegateType. Both receive return type and parameters.
aziz
parents: 290
diff changeset
3821 t = new DelegateType(t, parameters);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3822 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3823 default:
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3824 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3825 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3826 set(t, begin);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3827 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3828 assert(0);
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3829 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3830
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3831 bool tokenAfterParenIs(TOK tok)
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3832 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3833 // We count nested parentheses tokens because template types may appear inside parameter lists; e.g. (int x, Foo!(int) y).
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3834 assert(token.type == T.LParen);
239
7911f6a92e6e - Added 'new' and 'delete' declarations to Token and uncommented next and prev members. Added HEAD to TOK.
aziz
parents: 238
diff changeset
3835 Token* next = token;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3836 uint level = 1;
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3837 Loop:
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3838 while (1)
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3839 {
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3840 lx.peek(next);
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3841 switch (next.type)
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3842 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3843 case T.RParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3844 if (--level == 0)
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3845 { // Last, closing parentheses found.
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3846 do
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3847 lx.peek(next);
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3848 while (next.isWhitespace)
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3849 break Loop;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3850 }
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3851 break;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3852 case T.LParen:
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3853 ++level;
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3854 break;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3855 case T.EOF:
434
cac9c8d637ad Fix: members related to error info weren't updated correctly.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 429
diff changeset
3856 break Loop;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3857 default:
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3858 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3859 }
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3860 return next.type == tok;
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3861 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3862
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3863 Type parseDeclaratorSuffix(Type t)
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3864 {
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3865 switch (token.type)
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3866 {
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3867 case T.LBracket:
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3868 // Type Identifier ArrayType
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3869 // ArrayType := [] or [Type] or [Expression..Expression]
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3870 do
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3871 t = parseArrayType(t);
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3872 while (token.type == T.LBracket)
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3873 break;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
3874 /+ // parsed in parseDeclaration()
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3875 case T.LParen:
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
3876 TemplateParameters tparams;
232
2a4e2c8ca094 - Renamed method isTemplateParameterList() to tokenAfterParenIs().
aziz
parents: 231
diff changeset
3877 if (tokenAfterParenIs(T.LParen))
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3878 {
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3879 // ( TemplateParameterList ) ( ParameterList )
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3880 tparams = parseTemplateParameterList();
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3881 }
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3882
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3883 auto params = parseParameterList();
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3884 // ReturnType FunctionName ( ParameterList )
196
ea3f66901fa4 - Added code for parsing template parameter lists for functions.
aziz
parents: 195
diff changeset
3885 t = new FunctionType(t, params, tparams);
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3886 break;
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
3887 +/
192
5c898f80b436 - Started implementation of parseDeclaration().
aziz
parents: 191
diff changeset
3888 default:
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3889 break;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3890 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3891 return t;
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3892 }
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3893
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3894 Type parseArrayType(Type t)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3895 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3896 assert(token.type == T.LBracket);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3897 auto begin = token;
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3898 nT();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3899 if (token.type == T.RBracket)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3900 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3901 t = new ArrayType(t);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3902 nT();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3903 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3904 else
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3905 {
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
3906 bool success;
369
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3907 Type parseAAType()
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3908 {
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3909 auto type = parseType();
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3910 require(T.RBracket);
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3911 return type;
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3912 }
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
3913 auto assocType = try_(&parseAAType, success);
214
45fc474c1678 - Changed 'failed' parameter of try_() to 'success'.
aziz
parents: 213
diff changeset
3914 if (success)
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3915 t = new ArrayType(t, assocType);
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3916 else
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3917 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3918 Expression e = parseExpression(), e2;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3919 if (token.type == T.Slice)
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3920 {
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3921 nT();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3922 e2 = parseExpression();
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3923 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3924 t = new ArrayType(t, e, e2);
369
27767e203d64 - Added override attribute to ImportParser.start().
aziz
parents: 368
diff changeset
3925 require(T.RBracket);
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3926 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3927 }
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
3928 set(t, begin);
106
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3929 return t;
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3930 }
441962b0f526 - Added parseArrayType() method.
aziz
parents: 105
diff changeset
3931
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3932 Type parseCFunctionPointerType(Type type, ref Identifier* ident, bool optionalParamList)
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3933 {
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3934 assert(token.type == T.LParen);
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3935 assert(type !is null);
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3936 auto begin = token;
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3937 nT(); // Skip (
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3938 type = parseBasicType2(type);
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3939 if (token.type == T.LParen)
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3940 {
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3941 // Can be nested.
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3942 type = parseCFunctionPointerType(type, ident, true);
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3943 }
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3944 else if (token.type == T.Identifier)
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3945 {
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3946 // The identifier of the function pointer and the declaration.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3947 ident = token.ident;
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3948 nT();
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3949 type = parseDeclaratorSuffix(type);
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3950 }
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3951 require(T.RParen);
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3952
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3953 Parameters params;
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3954 if (optionalParamList)
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3955 params = token.type == T.LParen ? parseParameterList() : null;
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3956 else
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3957 params = parseParameterList();
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3958
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3959 type = set(new CFuncPointerType(type, params), begin);
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3960 return type;
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3961 }
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3962
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3963 Type parseDeclarator(ref Identifier* ident, bool identOptional = false)
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3964 {
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
3965 auto t = parseType();
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3966
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3967 if (token.type == T.LParen)
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3968 {
483
180711cc4b66 Fixed parsing of C-style function pointers.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 434
diff changeset
3969 t = parseCFunctionPointerType(t, ident, true);
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3970 }
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3971 else if (token.type == T.Identifier)
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3972 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3973 ident = token.ident;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3974 nT();
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
3975 t = parseDeclaratorSuffix(t);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3976 }
409
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3977
38fccd2640eb Added code for parsing C function pointer declarations.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 406
diff changeset
3978 if (ident is null && !identOptional)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
3979 error(token, MSG.ExpectedDeclaratorIdentifier, token.srcText);
98
aec3b16144fe - Added code for parsing (Expression) in parsePrimaryExpression(). Added missing break statement.
aziz
parents: 97
diff changeset
3980
104
b535016f8c3f - DeclaratorSuffix must be parsed after an Identifier.
aziz
parents: 103
diff changeset
3981 return t;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3982 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
3983
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3984 /++
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3985 Parse a list of AssignExpressions.
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3986 ExpressionList:
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3987 AssignExpression
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3988 AssignExpression , ExpressionList
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3989 +/
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3990 Expression[] parseExpressionList()
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
3991 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3992 Expression[] expressions;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3993 while (1)
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
3994 {
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3995 expressions ~= parseAssignExpression();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3996 if (token.type != T.Comma)
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
3997 break;
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
3998 nT();
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
3999 }
486
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4000 return expressions;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4001 }
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4002
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4003 /++
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4004 Arguments:
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4005 ( )
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4006 ( ExpressionList )
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4007 +/
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4008 Expression[] parseArguments()
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4009 {
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4010 assert(token.type == T.LParen);
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4011 nT();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4012 Expression[] args;
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4013 if (token.type != TOK.RParen)
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4014 args = parseExpressionList();
bd176bc73e43 Fixed a few things in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 485
diff changeset
4015 require(TOK.RParen);
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
4016 return args;
138
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
4017 }
91b5187ed775 - Moved parseArgumentList() down a bit.
aziz
parents: 137
diff changeset
4018
143
e760d7552f66 - Renamed parseArgumentList() to parseArguments().
aziz
parents: 141
diff changeset
4019 Parameters parseParameterList()
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
4020 out(params)
96
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
4021 {
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
4022 if (params.length > 1)
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
4023 foreach (param; params.items[0..$-1])
96
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
4024 {
117
79857de26e86 - Moved class Parameter to module Types. Added struct Parameters.
aziz
parents: 116
diff changeset
4025 if (param.isVariadic())
96
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
4026 assert(0, "variadic arguments can only appear at the end of the parameter list.");
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
4027 }
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
4028 }
d12d31d5fc17 - Added out-contract to parseParameters().
aziz
parents: 95
diff changeset
4029 body
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4030 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4031 auto begin = token;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4032 require(T.LParen);
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4033
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4034 auto params = new Parameters();
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4035
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4036 if (token.type == T.RParen)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4037 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4038 nT();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4039 return set(params, begin);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4040 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4041
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4042 Loop:
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4043 while (1)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4044 {
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4045 auto paramBegin = token;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4046 StorageClass stc, tmp;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4047 Type type;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4048 Identifier* ident;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4049 Expression defValue;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4050
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4051 void pushParameter()
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4052 {
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4053 params ~= set(new Parameter(stc, type, ident, defValue), paramBegin);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4054 }
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4055
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4056 if (token.type == T.Ellipses)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4057 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4058 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4059 stc = StorageClass.Variadic;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4060 pushParameter(); // type, ident and defValue will be null.
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4061 break Loop;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4062 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4063
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4064 Lstc_loop:
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4065 switch (token.type)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4066 {
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4067 version(D2)
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4068 {
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4069 case T.Invariant: // D2.0
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4070 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4071 goto default;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4072 tmp = StorageClass.Invariant;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4073 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4074 case T.Const: // D2.0
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4075 if (peekNext() == T.LParen)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4076 goto default;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4077 tmp = StorageClass.Const;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4078 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4079 case T.Final: // D2.0
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4080 tmp = StorageClass.Final;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4081 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4082 case T.Scope: // D2.0
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4083 tmp = StorageClass.Scope;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4084 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4085 case T.Static: // D2.0
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4086 tmp = StorageClass.Static;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4087 goto Lcommon;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4088 }
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4089 case T.In:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4090 tmp = StorageClass.In;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4091 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4092 case T.Out:
282
74113a9aa77c - Fix: assigned wrong StorageClass to variable.
aziz
parents: 280
diff changeset
4093 tmp = StorageClass.Out;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4094 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4095 case T.Inout, T.Ref:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4096 tmp = StorageClass.Ref;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4097 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4098 case T.Lazy:
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4099 tmp = StorageClass.Lazy;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4100 goto Lcommon;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4101 Lcommon:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4102 // Check for redundancy.
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4103 if (stc & tmp)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4104 error(MID.RedundantStorageClass, token.srcText);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4105 else
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4106 stc |= tmp;
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4107 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4108 version(D2)
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4109 goto Lstc_loop;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4110 else
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4111 goto default; // In D1.0 only one stc per parameter is allowed.
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4112 default:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4113 type = parseDeclarator(ident, true);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4114
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4115 if (token.type == T.Assign)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4116 nT(), (defValue = parseAssignExpression());
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4117
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4118 if (token.type == T.Ellipses)
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4119 {
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4120 nT();
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4121 stc |= StorageClass.Variadic;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4122 pushParameter();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4123 break Loop;
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4124 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4125
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4126 pushParameter();
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4127
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4128 if (token.type != T.Comma)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4129 break Loop;
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4130 nT();
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4131 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4132 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4133 require(T.RParen);
242
7ec7ad8df9da - Changed type of member tok in class BinaryExpression to Token*.
aziz
parents: 240
diff changeset
4134 return set(params, begin);
95
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4135 }
0eb4c8a5b32b - Added TOK.Invalid.
aziz
parents: 94
diff changeset
4136
150
753bc07bf3a0 - Forgot to pass ident to constructor of TemplateArgument.
aziz
parents: 149
diff changeset
4137 TemplateArguments parseTemplateArguments()
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
4138 {
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4139 TemplateArguments targs;
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
4140 require(T.LParen);
255
7ba0229af908 - Fixed parseTemplateArguments. Removed a return path and put the while loop into an if-statement.
aziz
parents: 254
diff changeset
4141 if (token.type != T.RParen)
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4142 targs = parseTemplateArguments_();
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
4143 require(T.RParen);
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4144 return targs;
139
d48f345b05f8 - Implemented parseTemplateArgumentList().
aziz
parents: 138
diff changeset
4145 }
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4146
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4147 version(D2)
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4148 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4149 TemplateArguments parseTemplateArguments2()
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4150 {
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4151 assert(token.type == T.Comma);
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4152 nT();
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4153 TemplateArguments targs;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4154 if (token.type != T.RParen)
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4155 targs = parseTemplateArguments_();
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4156 else
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4157 error(token, MSG.ExpectedTypeOrExpression);
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4158 require(T.RParen);
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4159 return targs;
269
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4160 }
a416e09c08ea - Implemented D 2.0 additions.
aziz
parents: 268
diff changeset
4161 } // version(D2)
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4162
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4163 TemplateArguments parseTemplateArguments_()
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4164 {
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4165 auto begin = token;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4166 auto targs = new TemplateArguments;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4167 while (1)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4168 {
379
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4169 Type parseType_()
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4170 {
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4171 auto type = parseType();
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4172 if (token.type == T.Comma || token.type == T.RParen)
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4173 return type;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4174 ++errorCount; // Cause try_() to fail.
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4175 return null;
a92f7826a4fa - Fix in parseTemplateArguments_(): calling nested parseType_() instead of parseType() in try_().
aziz
parents: 377
diff changeset
4176 }
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4177 bool success;
423
6057113f9a44 Refactored Parser.try_().
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 422
diff changeset
4178 auto typeArgument = try_(&parseType_, success);
376
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4179 if (success)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4180 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4181 // Type
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4182 // Symbol
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4183 targs ~= typeArgument;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4184 else
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4185 // TemplateArgument:
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4186 // AssignExpression
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4187 targs ~= parseAssignExpression();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4188 if (token.type != T.Comma)
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4189 break; // Exit loop.
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4190 nT();
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4191 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4192 set(targs, begin);
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4193 return targs;
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4194 }
5ebe80ce84f2 - Separated common code to parseTemplateArguments_().
aziz
parents: 375
diff changeset
4195
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
4196 TemplateParameters parseTemplateParameterList()
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4197 {
377
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4198 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4199 require(T.LParen);
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4200 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4201 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4202 require(T.RParen);
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4203 return tparams;
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4204 }
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4205
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4206 version(D2)
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4207 {
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4208 TemplateParameters parseTemplateParameterList2()
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4209 {
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4210 assert(token.type == T.Comma);
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4211 nT();
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4212 TemplateParameters tparams;
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4213 if (token.type != T.RParen)
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4214 tparams = parseTemplateParameterList_();
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4215 else
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4216 error(token, MSG.ExpectedTemplateParameters);
377
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4217 return tparams;
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4218 }
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4219 } // version(D2)
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4220
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4221 TemplateParameters parseTemplateParameterList_()
906599374b69 - Added tparams member to IsExpression.
aziz
parents: 376
diff changeset
4222 {
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
4223 auto begin = token;
295
75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node.
aziz
parents: 293
diff changeset
4224 auto tparams = new TemplateParameters;
75b47c71a34c - Assigning to Node.children in several constructors that inherit from Node.
aziz
parents: 293
diff changeset
4225
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4226 while (1)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4227 {
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
4228 auto paramBegin = token;
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4229 TemplateParameter tp;
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4230 Identifier* ident;
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4231 Type specType, defType;
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4232
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4233 void parseSpecAndOrDefaultType()
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4234 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4235 // : SpecializationType
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4236 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4237 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4238 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4239 specType = parseType();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4240 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4241 // = DefaultType
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4242 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4243 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4244 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4245 defType = parseType();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4246 }
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4247 }
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4248
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4249 switch (token.type)
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4250 {
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4251 case T.Alias:
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4252 // TemplateAliasParameter:
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4253 // alias Identifier
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4254 nT(); // Skip alias keyword.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4255 ident = requireIdentifier(MSG.ExpectedAliasTemplateParam);
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4256 parseSpecAndOrDefaultType();
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4257 tp = new TemplateAliasParameter(ident, specType, defType);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4258 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4259 case T.Identifier:
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4260 ident = token.ident;
238
f3c6c15961bb - Added method peekNext(). Replaced code that used lx.peek() with peekNext().
aziz
parents: 237
diff changeset
4261 switch (peekNext())
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4262 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4263 case T.Ellipses:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4264 // TemplateTupleParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4265 // Identifier ...
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4266 nT(); // Skip Identifier.
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4267 nT(); // Skip Ellipses.
341
3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter.
aziz
parents: 340
diff changeset
4268 if (token.type == T.Comma)
342
f13d551d7c4f - Added error messages MID.InContract and MID.OutContract.
aziz
parents: 341
diff changeset
4269 error(MID.TemplateTupleParameter);
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4270 tp = new TemplateTupleParameter(ident);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4271 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4272 case T.Comma, T.RParen, T.Colon, T.Assign:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4273 // TemplateTypeParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4274 // Identifier
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4275 nT(); // Skip Identifier.
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4276 parseSpecAndOrDefaultType();
341
3ac651ea83fb - Fix: created TemplateAliasParameter instead of TemplateTypeParameter.
aziz
parents: 340
diff changeset
4277 tp = new TemplateTypeParameter(ident, specType, defType);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4278 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4279 default:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4280 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4281 // Declarator
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4282 ident = null;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4283 goto LTemplateValueParameter;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4284 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4285 break;
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4286 version(D2)
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4287 {
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4288 case T.This:
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4289 // TemplateThisParameter
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4290 // this TemplateTypeParameter
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4291 nT(); // Skip 'this' keyword.
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4292 ident = requireIdentifier(MSG.ExpectedNameForThisTempParam);
492
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4293 parseSpecAndOrDefaultType();
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4294 tp = new TemplateThisParameter(ident, specType, defType);
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4295 break;
9c208925a3d4 Added module ImportParser and new stuff from DMD2.008.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 491
diff changeset
4296 }
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4297 default:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4298 LTemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4299 // TemplateValueParameter:
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4300 // Declarator
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4301 Expression specValue, defValue;
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4302 auto valueType = parseDeclarator(ident);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4303 // : SpecializationValue
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4304 if (token.type == T.Colon)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4305 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4306 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4307 specValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4308 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4309 // = DefaultValue
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4310 if (token.type == T.Assign)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4311 {
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4312 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4313 defValue = parseCondExpression();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4314 }
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4315 tp = new TemplateValueParameter(valueType, ident, specValue, defValue);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4316 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4317
340
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4318 // Push template parameter.
1accb3013bd2 - Changed class TemplateParameter to an abstract class.
aziz
parents: 335
diff changeset
4319 tparams ~= set(tp, paramBegin);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4320
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4321 if (token.type != T.Comma)
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4322 break;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4323 nT();
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4324 }
258
112a57f433f2 - Created class TemplateParameters.
aziz
parents: 257
diff changeset
4325 set(tparams, begin);
137
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4326 return tparams;
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4327 }
b49903801f14 - Implemented parseTemplateParameters().
aziz
parents: 136
diff changeset
4328
124
d4c4cea6ee7f - Renamed method errorIfNot() to expected().
aziz
parents: 123
diff changeset
4329 void expected(TOK tok)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4330 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
4331 if (token.type != tok)
327
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
4332 error(MID.ExpectedButFound, Token.toString(tok), token.srcText);
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4333 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4334
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4335 void require(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4336 {
87
c9544b7d5c7d - Added member token and method nT(), which sets token to lx.token.
aziz
parents: 86
diff changeset
4337 if (token.type == tok)
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4338 nT();
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4339 else
327
a48a987f7515 - Added package dil to import declarations.
aziz
parents: 326
diff changeset
4340 error(MID.ExpectedButFound, Token.toString(tok), token.srcText);
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4341 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4342
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4343 void requireNext(TOK tok)
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4344 {
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4345 nT();
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
4346 require(tok);
86
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4347 }
0459c902a370 - Added code for parsing Assert-, Mixin-, Import-, Typeid- and TypeDotIdExpressions.
aziz
parents: 85
diff changeset
4348
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4349 Identifier* optionalIdentifier()
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4350 {
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4351 Identifier* id;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4352 if (token.type == T.Identifier)
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4353 (id = token.ident), nT();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4354 return id;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4355 }
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4356
504
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4357 Identifier* requireIdentifier()
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4358 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4359 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4360 if (token.type == T.Identifier)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4361 (id = token.ident), nT();
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4362 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4363 error(MID.ExpectedButFound, "Identifier", token.srcText);
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4364 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4365 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4366
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4367 /++
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4368 Params:
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4369 errorMsg = an error that has no message ID yet.
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4370 +/
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4371 Identifier* requireIdentifier(char[] errorMsg)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4372 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4373 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4374 if (token.type == T.Identifier)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4375 (id = token.ident), nT();
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4376 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4377 error(token, errorMsg, token.srcText);
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4378 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4379 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4380
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4381 Identifier* requireIdentifier(MID mid)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4382 {
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4383 Identifier* id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4384 if (token.type == T.Identifier)
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4385 (id = token.ident), nT();
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4386 else
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4387 error(mid, token.srcText);
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4388 return id;
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4389 }
9076c4cea2a4 Changed occur. of Token* to Identifier* and refactored Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 502
diff changeset
4390
243
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4391 Token* requireId()
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4392 {
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4393 if (token.type == T.Identifier)
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4394 {
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4395 auto id = token;
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4396 nT();
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4397 return id;
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4398 }
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4399 else
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4400 error(MID.ExpectedButFound, "Identifier", token.srcText);
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4401 return null;
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4402 }
461e544ebb53 - Added method requireId().
aziz
parents: 242
diff changeset
4403
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4404 Token* requireIdToken(char[] errorMsg)
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4405 {
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4406 Token* idtok;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4407 if (token.type == T.Identifier)
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4408 (idtok = token), nT();
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4409 else
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4410 error(token, errorMsg, token.srcText);
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4411 return idtok;
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4412 }
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4413
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4414 /// Reports an error that has no message ID yet.
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4415 void error(Token* token, char[] formatMsg, ...)
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4416 {
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4417 error_(token, MID.min, formatMsg, _arguments, _argptr);
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4418 }
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4419
391
33b566df6af4 Migrated project to Tango.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 379
diff changeset
4420 void error(MID mid, ...)
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
4421 {
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4422 error_(this.token, mid, GetMsg(mid), _arguments, _argptr);
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4423 }
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4424
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4425 void error_(Token* token, MID mid, char[] formatMsg, TypeInfo[] _arguments, void* _argptr)
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4426 {
213
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
4427 if (trying)
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
4428 {
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
4429 ++errorCount;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
4430 return;
b0ebde88d2d4 - Added members trying, errorCount and prev (for debugging) to Parser.
aziz
parents: 206
diff changeset
4431 }
496
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4432 auto location = token.getLocation();
5a607597dc22 Improved error recovery in the Parser.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 495
diff changeset
4433 auto msg = Format(_arguments, _argptr, formatMsg);
485
ea8c7459f1c4 Changed a lot of things in the Lexer.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 484
diff changeset
4434 errors ~= new Information(InfoType.Parser, mid, location, msg);
71
b3777cca323c - Added Identity and NotIdentity tokens.
aziz
parents: 70
diff changeset
4435 }
505
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4436
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4437 /// Collection of error messages with no MID yet.
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4438 private struct MSG
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4439 {
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4440 static:
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4441 auto ExpectedIdAfterTypeDot = "expected identifier after '(Type).', not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4442 auto ExpectedModuleIdentifier = "expected module identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4443 auto IllegalDeclaration = "illegal Declaration found: {}";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4444 auto ExpectedFunctionName = "expected function name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4445 auto ExpectedVariableName = "expected variable name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4446 auto ExpectedFunctionBody = "expected function body, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4447 auto RedundantLinkageType = "redundant linkage type: ";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4448 auto ExpectedPragmaIdentifier = "expected pragma identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4449 auto ExpectedAliasModuleName = "expected alias module name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4450 auto ExpectedAliasImportName = "expected alias name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4451 auto ExpectedImportName = "expected an identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4452 auto ExpectedEnumMember = "expected enum member, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4453 auto ExpectedEnumBody = "expected enum body, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4454 auto ExpectedClassName = "expected class name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4455 auto ExpectedClassBody = "expected class body, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4456 auto ExpectedInterfaceName = "expected interface name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4457 auto ExpectedInterfaceBody = "expected interface body, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4458 auto ExpectedTemplateName = "expected template name, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4459 auto ExpectedAnIdentifier = "expected an identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4460 auto IllegalStatement = "illegal Statement found: ";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4461 auto ExpectedNonEmptyStatement = "didn't expect ';', use { } instead";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4462 auto ExpectedScopeIdentifier = "expected 'exit', 'success' or 'failure', not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4463 auto InvalidScopeIdentifier = "'exit', 'success', 'failure' are valid scope identifiers, but not '{}';";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4464 auto ExpectedIntegerAfterAlign = "expected an integer after align, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4465 auto IllegalAsmInstructino = "illegal AsmInstruction found: ";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4466 auto ExpectedDeclaratorIdentifier = "expected declarator identifier, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4467 auto ExpectedTemplateParameters = "expected one or more template parameters not ')'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4468 auto ExpectedTypeOrExpression = "expected a type or and expression not ')'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4469 auto ExpectedAliasTemplateParam = "expected name for alias template parameter, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4470 auto ExpectedNameForThisTempParam = "expected name for 'this' template parameter, not '{}'";
3bb94ba21490 Refactored a great amount of code.
Aziz K?ksal <aziz.koeksal@gmail.com>
parents: 504
diff changeset
4471 }
65
6c21ae79fbb3 - Renamed function Token.span to Token.srcText.
aziz
parents: 0
diff changeset
4472 }